author | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 17:16:50 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 17:16:50 (UTC) |
commit | e633ccf714eb423c4522924c3b611dac2e176c5e (patch) (unidiff) | |
tree | 096e7acc625b790e6860fe446f56775d578b60ff /shared.c | |
parent | 59310ab102a448d90c337b3b138dd53681d8097e (diff) | |
parent | 21f67e7d82986135922aece6b4ebf410a98705bc (diff) | |
download | cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.zip cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.tar.gz cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | shared.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -307,116 +307,118 @@ void cgit_diff_tree(const unsigned char *old_sha1, | |||
307 | opt.rename_limit = ctx.cfg.renamelimit; | 307 | opt.rename_limit = ctx.cfg.renamelimit; |
308 | DIFF_OPT_SET(&opt, RECURSIVE); | 308 | DIFF_OPT_SET(&opt, RECURSIVE); |
309 | opt.format_callback = cgit_diff_tree_cb; | 309 | opt.format_callback = cgit_diff_tree_cb; |
310 | opt.format_callback_data = fn; | 310 | opt.format_callback_data = fn; |
311 | if (prefix) { | 311 | if (prefix) { |
312 | opt.nr_paths = 1; | 312 | opt.nr_paths = 1; |
313 | opt.paths = &prefix; | 313 | opt.paths = &prefix; |
314 | prefixlen = strlen(prefix); | 314 | prefixlen = strlen(prefix); |
315 | opt.pathlens = &prefixlen; | 315 | opt.pathlens = &prefixlen; |
316 | } | 316 | } |
317 | diff_setup_done(&opt); | 317 | diff_setup_done(&opt); |
318 | 318 | ||
319 | if (old_sha1 && !is_null_sha1(old_sha1)) | 319 | if (old_sha1 && !is_null_sha1(old_sha1)) |
320 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 320 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
321 | else | 321 | else |
322 | ret = diff_root_tree_sha1(new_sha1, "", &opt); | 322 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
323 | diffcore_std(&opt); | 323 | diffcore_std(&opt); |
324 | diff_flush(&opt); | 324 | diff_flush(&opt); |
325 | } | 325 | } |
326 | 326 | ||
327 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) | 327 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
328 | { | 328 | { |
329 | unsigned char *old_sha1 = NULL; | 329 | unsigned char *old_sha1 = NULL; |
330 | 330 | ||
331 | if (commit->parents) | 331 | if (commit->parents) |
332 | old_sha1 = commit->parents->item->object.sha1; | 332 | old_sha1 = commit->parents->item->object.sha1; |
333 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); | 333 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
334 | } | 334 | } |
335 | 335 | ||
336 | int cgit_parse_snapshots_mask(const char *str) | 336 | int cgit_parse_snapshots_mask(const char *str) |
337 | { | 337 | { |
338 | const struct cgit_snapshot_format *f; | 338 | const struct cgit_snapshot_format *f; |
339 | static const char *delim = " \t,:/|;"; | 339 | static const char *delim = " \t,:/|;"; |
340 | int tl, sl, rv = 0; | 340 | int tl, sl, rv = 0; |
341 | 341 | ||
342 | /* favor legacy setting */ | 342 | /* favor legacy setting */ |
343 | if(atoi(str)) | 343 | if(atoi(str)) |
344 | return 1; | 344 | return 1; |
345 | for(;;) { | 345 | for(;;) { |
346 | str += strspn(str,delim); | 346 | str += strspn(str,delim); |
347 | tl = strcspn(str,delim); | 347 | tl = strcspn(str,delim); |
348 | if (!tl) | 348 | if (!tl) |
349 | break; | 349 | break; |
350 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 350 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
351 | sl = strlen(f->suffix); | 351 | sl = strlen(f->suffix); |
352 | if((tl == sl && !strncmp(f->suffix, str, tl)) || | 352 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
353 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { | 353 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
354 | rv |= f->bit; | 354 | rv |= f->bit; |
355 | break; | 355 | break; |
356 | } | 356 | } |
357 | } | 357 | } |
358 | str += tl; | 358 | str += tl; |
359 | } | 359 | } |
360 | return rv; | 360 | return rv; |
361 | } | 361 | } |
362 | 362 | ||
363 | int cgit_open_filter(struct cgit_filter *filter) | 363 | int cgit_open_filter(struct cgit_filter *filter) |
364 | { | 364 | { |
365 | 365 | ||
366 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), | 366 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
367 | "Unable to duplicate STDOUT"); | 367 | "Unable to duplicate STDOUT"); |
368 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); | 368 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
369 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); | 369 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); |
370 | if (filter->pid == 0) { | 370 | if (filter->pid == 0) { |
371 | close(filter->pipe_fh[1]); | 371 | close(filter->pipe_fh[1]); |
372 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), | 372 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), |
373 | "Unable to use pipe as STDIN"); | 373 | "Unable to use pipe as STDIN"); |
374 | execvp(filter->cmd, filter->argv); | 374 | execvp(filter->cmd, filter->argv); |
375 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, | 375 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, |
376 | strerror(errno), errno); | 376 | strerror(errno), errno); |
377 | } | 377 | } |
378 | close(filter->pipe_fh[0]); | 378 | close(filter->pipe_fh[0]); |
379 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), | 379 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), |
380 | "Unable to use pipe as STDOUT"); | 380 | "Unable to use pipe as STDOUT"); |
381 | close(filter->pipe_fh[1]); | 381 | close(filter->pipe_fh[1]); |
382 | return 0; | 382 | return 0; |
383 | } | 383 | } |
384 | 384 | ||
385 | int cgit_close_filter(struct cgit_filter *filter) | 385 | int cgit_close_filter(struct cgit_filter *filter) |
386 | { | 386 | { |
387 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), | 387 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), |
388 | "Unable to restore STDOUT"); | 388 | "Unable to restore STDOUT"); |
389 | close(filter->old_stdout); | 389 | close(filter->old_stdout); |
390 | if (filter->pid < 0) | 390 | if (filter->pid < 0) |
391 | return 0; | 391 | return 0; |
392 | waitpid(filter->pid, &filter->exitstatus, 0); | 392 | waitpid(filter->pid, &filter->exitstatus, 0); |
393 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) | 393 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) |
394 | return 0; | 394 | return 0; |
395 | die("Subprocess %s exited abnormally", filter->cmd); | 395 | die("Subprocess %s exited abnormally", filter->cmd); |
396 | } | 396 | } |
397 | 397 | ||
398 | /* Read the content of the specified file into a newly allocated buffer, | 398 | /* Read the content of the specified file into a newly allocated buffer, |
399 | * zeroterminate the buffer and return 0 on success, errno otherwise. | 399 | * zeroterminate the buffer and return 0 on success, errno otherwise. |
400 | */ | 400 | */ |
401 | int readfile(const char *path, char **buf, size_t *size) | 401 | int readfile(const char *path, char **buf, size_t *size) |
402 | { | 402 | { |
403 | int fd; | 403 | int fd, e; |
404 | struct stat st; | 404 | struct stat st; |
405 | 405 | ||
406 | fd = open(path, O_RDONLY); | 406 | fd = open(path, O_RDONLY); |
407 | if (fd == -1) | 407 | if (fd == -1) |
408 | return errno; | 408 | return errno; |
409 | if (fstat(fd, &st)) { | 409 | if (fstat(fd, &st)) { |
410 | e = errno; | ||
410 | close(fd); | 411 | close(fd); |
411 | return errno; | 412 | return e; |
412 | } | 413 | } |
413 | if (!S_ISREG(st.st_mode)) { | 414 | if (!S_ISREG(st.st_mode)) { |
414 | close(fd); | 415 | close(fd); |
415 | return EISDIR; | 416 | return EISDIR; |
416 | } | 417 | } |
417 | *buf = xmalloc(st.st_size + 1); | 418 | *buf = xmalloc(st.st_size + 1); |
418 | *size = read_in_full(fd, *buf, st.st_size); | 419 | *size = read_in_full(fd, *buf, st.st_size); |
420 | e = errno; | ||
419 | (*buf)[*size] = '\0'; | 421 | (*buf)[*size] = '\0'; |
420 | close(fd); | 422 | close(fd); |
421 | return (*size == st.st_size ? 0 : errno); | 423 | return (*size == st.st_size ? 0 : e); |
422 | } | 424 | } |