X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fupdate.c;h=d4145d0421096cc3679ce2b5ee2d9f7f697e9221;hb=eff25ef359bfab5a10a3718450ed6a410cb84385;hp=c7e03192c5d9314687d26dcd4f3c4d9d1dac9539;hpb=91b2d65e9dccae981f308a659d6c7bdd32285598;p=chaz%2Ftar diff --git a/src/update.c b/src/update.c index c7e0319..d4145d0 100644 --- a/src/update.c +++ b/src/update.c @@ -32,8 +32,10 @@ extern union block *current_block; /* We've hit the end of the old stuff, and its time to start writing new stuff to the tape. This involves seeking back one record and - re-writing the current record (which has been changed). */ -int time_to_start_writing; + re-writing the current record (which has been changed). + FIXME: Either eliminate it or move it to common.h. +*/ +bool time_to_start_writing; /* Pointer to where we started to write in the first record we write out. This is used if we can't backspace the output and have to null out the @@ -108,7 +110,8 @@ update_archive (void) name_gather (); open_archive (ACCESS_UPDATE); - + xheader_write_global (); + while (!found_end) { enum read_header status = read_header (false); @@ -124,14 +127,15 @@ update_archive (void) struct name *name; if (subcommand_option == UPDATE_SUBCOMMAND - && (name = name_scan (current_stat_info.file_name), name)) + && (name = name_scan (current_stat_info.file_name)) != NULL) { struct stat s; enum archive_format unused; decode_header (current_header, ¤t_stat_info, &unused, 0); chdir_do (name->change_dir); - if (deref_stat (dereference_option, current_stat_info.file_name, &s) == 0 + if (deref_stat (dereference_option, + current_stat_info.file_name, &s) == 0 && s.st_mtime <= current_stat_info.stat.st_mtime) add_avoided_name (current_stat_info.file_name); } @@ -175,13 +179,13 @@ update_archive (void) } reset_eof (); - time_to_start_writing = 1; + time_to_start_writing = true; output_start = current_block->buffer; { char *path; - while (path = name_from_list (), path) + while ((path = name_from_list ()) != NULL) { if (excluded_name (path)) continue;