X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcompare.c;h=5a91b9059b534494d6b342a2f42e23f5fccd91e0;hb=bb798080beec25634f7552934324b5f5c995707f;hp=2c3a21d2a5317c89c5e01d488067b76589939d67;hpb=2c390b2c218aa47182652b203b0f2e06e8458e48;p=chaz%2Ftar diff --git a/src/compare.c b/src/compare.c index 2c3a21d..5a91b90 100644 --- a/src/compare.c +++ b/src/compare.c @@ -39,9 +39,7 @@ struct utimbuf #include "common.h" #include "rmt.h" - -/* Spare space for messages, hopefully safe even after gettext. */ -#define MESSAGE_BUFFER_SIZE 100 +#include /* Nonzero if we are verifying at the moment. */ bool now_verifying; @@ -63,12 +61,20 @@ diff_init (void) /* Sigh about something that differs by writing a MESSAGE to stdlis, given MESSAGE is nonzero. Also set the exit status if not already. */ -static void -report_difference (const char *message) +void +report_difference (struct tar_stat_info *st, const char *fmt, ...) { - if (message) - fprintf (stdlis, "%s: %s\n", quotearg_colon (current_stat_info.file_name), message); + if (fmt) + { + va_list ap; + fprintf (stdlis, "%s: ", quotearg_colon (current_stat_info.file_name)); + va_start (ap, fmt); + vfprintf (stdlis, fmt, ap); + va_end (ap); + fprintf (stdlis, "\n"); + } + if (exit_status == TAREXIT_SUCCESS) exit_status = TAREXIT_DIFFERS; } @@ -86,27 +92,29 @@ static int process_rawdata (size_t bytes, char *buffer) { ssize_t status = safe_read (diff_handle, diff_buffer, bytes); - char message[MESSAGE_BUFFER_SIZE]; if (status != bytes) { if (status < 0) { read_error (current_stat_info.file_name); - report_difference (0); + report_difference (¤t_stat_info, NULL); } else { - sprintf (message, _("Could only read %lu of %lu bytes"), - (unsigned long) status, (unsigned long) bytes); - report_difference (message); + report_difference (¤t_stat_info, + ngettext ("Could only read %lu of %lu byte", + "Could only read %lu of %lu bytes", + bytes), + (unsigned long) status, (unsigned long) bytes); } return 0; } if (memcmp (buffer, diff_buffer, bytes)) { - report_difference (_("Contents differ")); + report_difference (¤t_stat_info, + _("Contents differ")); return 0; } @@ -122,7 +130,7 @@ process_dumpdir (size_t bytes, char *buffer) { if (memcmp (buffer, dumpdir_cursor, bytes)) { - report_difference (_("Contents differ")); + report_difference (¤t_stat_info, _("Contents differ")); return 0; } @@ -165,152 +173,6 @@ read_and_process (off_t size, int (*processor) (size_t, char *)) } } -/* JK Diff'ing a sparse file with its counterpart on the tar file is a - bit of a different story than a normal file. First, we must know what - areas of the file to skip through, i.e., we need to construct a - sparsearray, which will hold all the information we need. We must - compare small amounts of data at a time as we find it. */ - -/* FIXME: This does not look very solid to me, at first glance. Zero areas - are not checked, spurious sparse entries seemingly goes undetected, and - I'm not sure overall identical sparsity is verified. */ - -static void -diff_sparse_files (void) -{ - off_t remaining_size = current_stat_info.stat.st_size; - char *buffer = xmalloc (BLOCKSIZE * sizeof (char)); - size_t buffer_size = BLOCKSIZE; - union block *data_block = 0; - int counter = 0; - int different = 0; - - if (! fill_in_sparse_array ()) - fatal_exit (); - - while (remaining_size > 0) - { - ssize_t status; - size_t chunk_size; - off_t offset; - -#if 0 - off_t amount_read = 0; -#endif - - data_block = find_next_block (); - if (!data_block) - FATAL_ERROR ((0, 0, _("Unexpected EOF in archive"))); - chunk_size = sparsearray[counter].numbytes; - if (!chunk_size) - break; - - offset = sparsearray[counter].offset; - if (lseek (diff_handle, offset, SEEK_SET) < 0) - { - seek_error_details (current_stat_info.file_name, offset); - report_difference (0); - } - - /* Take care to not run out of room in our buffer. */ - - while (buffer_size < chunk_size) - { - if (buffer_size * 2 < buffer_size) - xalloc_die (); - buffer_size *= 2; - buffer = xrealloc (buffer, buffer_size * sizeof (char)); - } - - while (chunk_size > BLOCKSIZE) - { - if (status = safe_read (diff_handle, buffer, BLOCKSIZE), - status != BLOCKSIZE) - { - if (status < 0) - { - read_error (current_stat_info.file_name); - report_difference (0); - } - else - { - char message[MESSAGE_BUFFER_SIZE]; - - sprintf (message, _("Could only read %lu of %lu bytes"), - (unsigned long) status, (unsigned long) chunk_size); - report_difference (message); - } - break; - } - - if (memcmp (buffer, data_block->buffer, BLOCKSIZE)) - { - different = 1; - break; - } - - chunk_size -= status; - remaining_size -= status; - set_next_block_after (data_block); - data_block = find_next_block (); - if (!data_block) - FATAL_ERROR ((0, 0, _("Unexpected EOF in archive"))); - } - if (status = safe_read (diff_handle, buffer, chunk_size), - status != chunk_size) - { - if (status < 0) - { - read_error (current_stat_info.file_name); - report_difference (0); - } - else - { - char message[MESSAGE_BUFFER_SIZE]; - - sprintf (message, _("Could only read %lu of %lu bytes"), - (unsigned long) status, (unsigned long) chunk_size); - report_difference (message); - } - break; - } - - if (memcmp (buffer, data_block->buffer, chunk_size)) - { - different = 1; - break; - } -#if 0 - amount_read += chunk_size; - if (amount_read >= BLOCKSIZE) - { - amount_read = 0; - set_next_block_after (data_block); - data_block = find_next_block (); - if (!data_block) - FATAL_ERROR ((0, 0, _("Unexpected EOF in archive"))); - } -#endif - set_next_block_after (data_block); - counter++; - remaining_size -= chunk_size; - } - -#if 0 - /* If the number of bytes read isn't the number of bytes supposedly in - the file, they're different. */ - - if (amount_read != current_stat_info.stat.st_size) - different = 1; -#endif - - set_next_block_after (data_block); - free (sparsearray); - - if (different) - report_difference (_("Contents differ")); -} - /* Call either stat or lstat over STAT_DATA, depending on --dereference (-h), for a file which should exist. Diagnose any problem. Return nonzero for success, zero otherwise. */ @@ -325,7 +187,7 @@ get_stat_data (char const *file_name, struct stat *stat_data) stat_warn (file_name); else stat_error (file_name); - report_difference (0); + report_difference (¤t_stat_info, NULL); return 0; } @@ -349,7 +211,7 @@ diff_archive (void) { if (now_verifying) fprintf (stdlis, _("Verify ")); - print_header (-1); + print_header (¤t_stat_info, -1); } switch (current_header->header.typeflag) @@ -378,30 +240,26 @@ diff_archive (void) if (!S_ISREG (stat_data.st_mode)) { - report_difference (_("File type differs")); + report_difference (¤t_stat_info, _("File type differs")); skip_member (); goto quit; } - if ((current_stat_info.stat.st_mode & MODE_ALL) != (stat_data.st_mode & MODE_ALL)) - report_difference (_("Mode differs")); - -#if !MSDOS - /* stat() in djgpp's C library gives a constant number of 42 as the - uid and gid of a file. So, comparing an FTP'ed archive just after - unpack would fail on MSDOS. */ - if (stat_data.st_uid != current_stat_info.stat.st_uid) - report_difference (_("Uid differs")); - if (stat_data.st_gid != current_stat_info.stat.st_gid) - report_difference (_("Gid differs")); -#endif + if ((current_stat_info.stat.st_mode & MODE_ALL) != + (stat_data.st_mode & MODE_ALL)) + report_difference (¤t_stat_info, _("Mode differs")); + + if (!sys_compare_uid (&stat_data, ¤t_stat_info.stat)) + report_difference (¤t_stat_info, _("Uid differs")); + if (!sys_compare_gid (&stat_data, ¤t_stat_info.stat)) + report_difference (¤t_stat_info, _("Gid differs")); if (stat_data.st_mtime != current_stat_info.stat.st_mtime) - report_difference (_("Mod time differs")); + report_difference (¤t_stat_info, _("Mod time differs")); if (current_header->header.typeflag != GNUTYPE_SPARSE && stat_data.st_size != current_stat_info.stat.st_size) { - report_difference (_("Size differs")); + report_difference (¤t_stat_info, _("Size differs")); skip_member (); goto quit; } @@ -412,7 +270,7 @@ diff_archive (void) { open_error (current_stat_info.file_name); skip_member (); - report_difference (0); + report_difference (¤t_stat_info, NULL); goto quit; } @@ -422,7 +280,7 @@ diff_archive (void) /* Need to treat sparse files completely differently here. */ if (current_header->header.typeflag == GNUTYPE_SPARSE) - diff_sparse_files (); + sparse_diff_file (diff_handle, ¤t_stat_info); else { if (multi_volume_option) @@ -448,33 +306,21 @@ diff_archive (void) quit: break; -#if !MSDOS case LNKTYPE: { - struct stat link_data; + struct stat link_data, stat_data; if (!get_stat_data (current_stat_info.file_name, &stat_data)) break; if (!get_stat_data (current_stat_info.link_name, &link_data)) break; - - if (stat_data.st_dev != link_data.st_dev - || stat_data.st_ino != link_data.st_ino) - { - char *message = - xmalloc (MESSAGE_BUFFER_SIZE + 4 * strlen (current_stat_info.link_name)); - - sprintf (message, _("Not linked to %s"), - quote (current_stat_info.link_name)); - report_difference (message); - free (message); - break; - } - - break; + if (!sys_compare_links (&stat_data, &link_data)) + report_difference (¤t_stat_info, + _("Not linked to %s"), + quote (current_stat_info.link_name)); } -#endif /* not MSDOS */ - + break; + #ifdef HAVE_READLINK case SYMTYPE: { @@ -489,11 +335,11 @@ diff_archive (void) readlink_warn (current_stat_info.file_name); else readlink_error (current_stat_info.file_name); - report_difference (0); + report_difference (¤t_stat_info, NULL); } else if (status != len || strncmp (current_stat_info.link_name, linkbuf, len) != 0) - report_difference (_("Symlink differs")); + report_difference (¤t_stat_info, _("Symlink differs")); break; } @@ -515,7 +361,7 @@ diff_archive (void) : /* current_header->header.typeflag == FIFOTYPE */ !S_ISFIFO (stat_data.st_mode)) { - report_difference (_("File type differs")); + report_difference (¤t_stat_info, _("File type differs")); break; } @@ -523,13 +369,13 @@ diff_archive (void) || current_header->header.typeflag == BLKTYPE) && current_stat_info.stat.st_rdev != stat_data.st_rdev) { - report_difference (_("Device number differs")); + report_difference (¤t_stat_info, _("Device number differs")); break; } if ((current_stat_info.stat.st_mode & MODE_ALL) != (stat_data.st_mode & MODE_ALL)) { - report_difference (_("Mode differs")); + report_difference (¤t_stat_info, _("Mode differs")); break; } @@ -567,13 +413,13 @@ diff_archive (void) if (!S_ISDIR (stat_data.st_mode)) { - report_difference (_("File type differs")); + report_difference (¤t_stat_info, _("File type differs")); break; } if ((current_stat_info.stat.st_mode & MODE_ALL) != (stat_data.st_mode & MODE_ALL)) { - report_difference (_("Mode differs")); + report_difference (¤t_stat_info, _("Mode differs")); break; } @@ -594,7 +440,7 @@ diff_archive (void) if (!S_ISREG (stat_data.st_mode)) { - report_difference (_("File type differs")); + report_difference (¤t_stat_info, _("File type differs")); skip_member (); break; } @@ -602,7 +448,7 @@ diff_archive (void) offset = OFF_FROM_HEADER (current_header->oldgnu_header.offset); if (stat_data.st_size != current_stat_info.stat.st_size + offset) { - report_difference (_("Size differs")); + report_difference (¤t_stat_info, _("Size differs")); skip_member (); break; } @@ -612,7 +458,7 @@ diff_archive (void) if (diff_handle < 0) { open_error (current_stat_info.file_name); - report_difference (0); + report_difference (¤t_stat_info, NULL); skip_member (); break; } @@ -620,7 +466,7 @@ diff_archive (void) if (lseek (diff_handle, offset, SEEK_SET) < 0) { seek_error_details (current_stat_info.file_name, offset); - report_difference (0); + report_difference (¤t_stat_info, NULL); break; } @@ -714,7 +560,9 @@ verify_volume (void) while (status == HEADER_FAILURE); ERROR ((0, 0, - _("VERIFY FAILURE: %d invalid header(s) detected"), counter)); + ngettext ("VERIFY FAILURE: %d invalid header detected", + "VERIFY FAILURE: %d invalid headers detected", + counter), counter)); } if (status == HEADER_ZERO_BLOCK || status == HEADER_END_OF_FILE) break;