/* Diff files from a tar archive.
Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
- 2003, 2004 Free Software Foundation, Inc.
+ 2003, 2004, 2005 Free Software Foundation, Inc.
Written by John Gilmore, on 1987-04-30.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#include "system.h"
-
-#if HAVE_UTIME_H
-# include <utime.h>
-#else
-struct utimbuf
- {
- long actime;
- long modtime;
- };
-#endif
+#include <system.h>
#if HAVE_LINUX_FD_H
# include <linux/fd.h>
#endif
#include <quotearg.h>
+#include <utimens.h>
#include "common.h"
-#include "rmt.h"
+#include <rmt.h>
#include <stdarg.h>
/* Nonzero if we are verifying at the moment. */
void
diff_init (void)
{
- diff_buffer = valloc (record_size);
- if (!diff_buffer)
- xalloc_die ();
+ void *ptr;
+ diff_buffer = page_aligned_alloc (&ptr, record_size);
+ if (listed_incremental_option)
+ read_directory_file ();
}
/* Sigh about something that differs by writing a MESSAGE to stdlis,
if (memcmp (buffer, diff_buffer, bytes))
{
- report_difference (¤t_stat_info,
- _("Contents differ"));
+ report_difference (¤t_stat_info, _("Contents differ"));
return 0;
}
return 1;
}
-/* Diff a file against the archive. */
-void
-diff_archive (void)
+\f
+static void
+diff_dir (void)
{
struct stat stat_data;
- int status;
- struct utimbuf restore_times;
- set_next_block_after (current_header);
- decode_header (current_header, ¤t_stat_info, ¤t_format, 1);
+ if (!get_stat_data (current_stat_info.file_name, &stat_data))
+ return;
- /* Print the block from current_header and current_stat_info. */
+ if (!S_ISDIR (stat_data.st_mode))
+ report_difference (¤t_stat_info, _("File type differs"));
+ else if ((current_stat_info.stat.st_mode & MODE_ALL) !=
+ (stat_data.st_mode & MODE_ALL))
+ report_difference (¤t_stat_info, _("Mode differs"));
+}
- if (verbose_option)
+static void
+diff_file (void)
+{
+ struct stat stat_data;
+
+ if (!get_stat_data (current_stat_info.file_name, &stat_data))
+ skip_member ();
+ else if (!S_ISREG (stat_data.st_mode))
{
- if (now_verifying)
- fprintf (stdlis, _("Verify "));
- print_header (¤t_stat_info, -1);
+ report_difference (¤t_stat_info, _("File type differs"));
+ skip_member ();
}
-
- switch (current_header->header.typeflag)
+ else
{
- default:
- ERROR ((0, 0, _("%s: Unknown file type '%c', diffed as normal file"),
- quotearg_colon (current_stat_info.file_name),
- current_header->header.typeflag));
- /* Fall through. */
-
- case AREGTYPE:
- case REGTYPE:
- case GNUTYPE_SPARSE:
- case CONTTYPE:
-
- /* Appears to be a file. See if it's really a directory. */
-
- if (current_stat_info.had_trailing_slash)
- goto really_dir;
-
- if (!get_stat_data (current_stat_info.file_name, &stat_data))
- {
- skip_member ();
- goto quit;
- }
-
- if (!S_ISREG (stat_data.st_mode))
- {
- 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 (¤t_stat_info, _("Mode 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)
+ if (timespec_cmp (get_stat_mtime (&stat_data), current_stat_info.mtime))
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 (¤t_stat_info, _("Size differs"));
skip_member ();
- goto quit;
}
-
- diff_handle = open (current_stat_info.file_name, O_RDONLY | O_BINARY);
-
- if (diff_handle < 0)
- {
- open_error (current_stat_info.file_name);
- skip_member ();
- report_difference (¤t_stat_info, NULL);
- goto quit;
- }
-
- restore_times.actime = stat_data.st_atime;
- restore_times.modtime = stat_data.st_mtime;
-
- /* Need to treat sparse files completely differently here. */
-
- if (current_stat_info.is_sparse)
- sparse_diff_file (diff_handle, ¤t_stat_info);
else
{
- if (multi_volume_option)
+ diff_handle = open (current_stat_info.file_name, O_RDONLY | O_BINARY);
+
+ if (diff_handle < 0)
+ {
+ open_error (current_stat_info.file_name);
+ skip_member ();
+ report_difference (¤t_stat_info, NULL);
+ }
+ else
{
- assign_string (&save_name, current_stat_info.file_name);
- save_totsize = current_stat_info.stat.st_size;
- /* save_sizeleft is set in read_and_process. */
+ int status;
+
+ if (current_stat_info.is_sparse)
+ sparse_diff_file (diff_handle, ¤t_stat_info);
+ else
+ {
+ if (multi_volume_option)
+ {
+ assign_string (&save_name,
+ current_stat_info.orig_file_name);
+ save_totsize = current_stat_info.stat.st_size;
+ /* save_sizeleft is set in read_and_process. */
+ }
+
+ read_and_process (current_stat_info.stat.st_size,
+ process_rawdata);
+
+ if (multi_volume_option)
+ assign_string (&save_name, 0);
+ }
+
+ status = close (diff_handle);
+ if (status != 0)
+ close_error (current_stat_info.file_name);
+
+ if (atime_preserve_option)
+ {
+ struct timespec ts[2];
+ ts[0] = get_stat_atime (&stat_data);
+ ts[1] = get_stat_mtime (&stat_data);
+ if (utimens (current_stat_info.file_name, ts) != 0)
+ utime_error (current_stat_info.file_name);
+ }
}
+ }
+ }
+}
- read_and_process (current_stat_info.stat.st_size, process_rawdata);
+static void
+diff_link (void)
+{
+ struct stat file_data;
+ struct stat link_data;
+
+ if (get_stat_data (current_stat_info.file_name, &file_data)
+ && get_stat_data (current_stat_info.link_name, &link_data)
+ && !sys_compare_links (&file_data, &link_data))
+ report_difference (¤t_stat_info,
+ _("Not linked to %s"),
+ quote (current_stat_info.link_name));
+}
- if (multi_volume_option)
- assign_string (&save_name, 0);
- }
+#ifdef HAVE_READLINK
+static void
+diff_symlink (void)
+{
+ size_t len = strlen (current_stat_info.link_name);
+ char *linkbuf = alloca (len + 1);
- status = close (diff_handle);
- if (status != 0)
- close_error (current_stat_info.file_name);
+ int status = readlink (current_stat_info.file_name, linkbuf, len + 1);
- if (atime_preserve_option)
- utime (current_stat_info.file_name, &restore_times);
+ if (status < 0)
+ {
+ if (errno == ENOENT)
+ readlink_warn (current_stat_info.file_name);
+ else
+ readlink_error (current_stat_info.file_name);
+ report_difference (¤t_stat_info, NULL);
+ }
+ else if (status != len
+ || strncmp (current_stat_info.link_name, linkbuf, len) != 0)
+ report_difference (¤t_stat_info, _("Symlink differs"));
+}
+#endif
- quit:
- break;
+static void
+diff_special (void)
+{
+ struct stat stat_data;
- case LNKTYPE:
- {
- struct stat file_data;
- struct stat link_data;
-
- if (!get_stat_data (current_stat_info.file_name, &file_data))
- break;
- if (!get_stat_data (current_stat_info.link_name, &link_data))
- break;
- if (!sys_compare_links (&file_data, &link_data))
- report_difference (¤t_stat_info,
- _("Not linked to %s"),
- quote (current_stat_info.link_name));
- }
- break;
+ /* FIXME: deal with umask. */
-#ifdef HAVE_READLINK
- case SYMTYPE:
- {
- size_t len = strlen (current_stat_info.link_name);
- char *linkbuf = alloca (len + 1);
+ if (!get_stat_data (current_stat_info.file_name, &stat_data))
+ return;
- status = readlink (current_stat_info.file_name, linkbuf, len + 1);
+ if (current_header->header.typeflag == CHRTYPE
+ ? !S_ISCHR (stat_data.st_mode)
+ : current_header->header.typeflag == BLKTYPE
+ ? !S_ISBLK (stat_data.st_mode)
+ : /* current_header->header.typeflag == FIFOTYPE */
+ !S_ISFIFO (stat_data.st_mode))
+ {
+ report_difference (¤t_stat_info, _("File type differs"));
+ return;
+ }
- if (status < 0)
- {
- if (errno == ENOENT)
- readlink_warn (current_stat_info.file_name);
- else
- readlink_error (current_stat_info.file_name);
- report_difference (¤t_stat_info, NULL);
- }
- else if (status != len
- || strncmp (current_stat_info.link_name, linkbuf, len) != 0)
- report_difference (¤t_stat_info, _("Symlink differs"));
+ if ((current_header->header.typeflag == CHRTYPE
+ || current_header->header.typeflag == BLKTYPE)
+ && current_stat_info.stat.st_rdev != stat_data.st_rdev)
+ {
+ report_difference (¤t_stat_info, _("Device number differs"));
+ return;
+ }
- break;
- }
-#endif
+ if ((current_stat_info.stat.st_mode & MODE_ALL) !=
+ (stat_data.st_mode & MODE_ALL))
+ report_difference (¤t_stat_info, _("Mode differs"));
+}
- case CHRTYPE:
- case BLKTYPE:
- case FIFOTYPE:
+static void
+diff_dumpdir (void)
+{
+ char *dumpdir_buffer = get_directory_contents (current_stat_info.file_name,
+ 0);
- /* FIXME: deal with umask. */
+ if (multi_volume_option)
+ {
+ assign_string (&save_name, current_stat_info.orig_file_name);
+ save_totsize = current_stat_info.stat.st_size;
+ /* save_sizeleft is set in read_and_process. */
+ }
- if (!get_stat_data (current_stat_info.file_name, &stat_data))
- break;
+ if (dumpdir_buffer)
+ {
+ dumpdir_cursor = dumpdir_buffer;
+ read_and_process (current_stat_info.stat.st_size, process_dumpdir);
+ free (dumpdir_buffer);
+ }
+ else
+ read_and_process (current_stat_info.stat.st_size, process_noop);
- if (current_header->header.typeflag == CHRTYPE
- ? !S_ISCHR (stat_data.st_mode)
- : current_header->header.typeflag == BLKTYPE
- ? !S_ISBLK (stat_data.st_mode)
- : /* current_header->header.typeflag == FIFOTYPE */
- !S_ISFIFO (stat_data.st_mode))
- {
- report_difference (¤t_stat_info, _("File type differs"));
- break;
- }
+ if (multi_volume_option)
+ assign_string (&save_name, 0);
+}
- if ((current_header->header.typeflag == CHRTYPE
- || current_header->header.typeflag == BLKTYPE)
- && current_stat_info.stat.st_rdev != stat_data.st_rdev)
- {
- report_difference (¤t_stat_info, _("Device number differs"));
- break;
- }
+static void
+diff_multivol (void)
+{
+ struct stat stat_data;
+ int fd, status;
+ off_t offset;
- if ((current_stat_info.stat.st_mode & MODE_ALL) != (stat_data.st_mode & MODE_ALL))
- {
- report_difference (¤t_stat_info, _("Mode differs"));
- break;
- }
+ if (current_stat_info.had_trailing_slash)
+ {
+ diff_dir ();
+ return;
+ }
- break;
+ if (!get_stat_data (current_stat_info.file_name, &stat_data))
+ return;
- case GNUTYPE_DUMPDIR:
- {
- char *dumpdir_buffer = get_directory_contents (current_stat_info.file_name, 0);
+ if (!S_ISREG (stat_data.st_mode))
+ {
+ report_difference (¤t_stat_info, _("File type differs"));
+ skip_member ();
+ return;
+ }
- if (multi_volume_option)
- {
- assign_string (&save_name, current_stat_info.file_name);
- save_totsize = current_stat_info.stat.st_size;
- /* save_sizeleft is set in read_and_process. */
- }
+ offset = OFF_FROM_HEADER (current_header->oldgnu_header.offset);
+ if (stat_data.st_size != current_stat_info.stat.st_size + offset)
+ {
+ report_difference (¤t_stat_info, _("Size differs"));
+ skip_member ();
+ return;
+ }
- if (dumpdir_buffer)
- {
- dumpdir_cursor = dumpdir_buffer;
- read_and_process (current_stat_info.stat.st_size, process_dumpdir);
- free (dumpdir_buffer);
- }
- else
- read_and_process (current_stat_info.stat.st_size, process_noop);
+ fd = open (current_stat_info.file_name, O_RDONLY | O_BINARY);
- if (multi_volume_option)
- assign_string (&save_name, 0);
- /* Fall through. */
- }
+ if (fd < 0)
+ {
+ open_error (current_stat_info.file_name);
+ report_difference (¤t_stat_info, NULL);
+ skip_member ();
+ return;
+ }
- case DIRTYPE:
- really_dir:
- if (!get_stat_data (current_stat_info.file_name, &stat_data))
- break;
+ if (lseek (fd, offset, SEEK_SET) < 0)
+ {
+ seek_error_details (current_stat_info.file_name, offset);
+ report_difference (¤t_stat_info, NULL);
+ return;
+ }
- if (!S_ISDIR (stat_data.st_mode))
- {
- report_difference (¤t_stat_info, _("File type differs"));
- break;
- }
+ if (multi_volume_option)
+ {
+ assign_string (&save_name, current_stat_info.orig_file_name);
+ save_totsize = stat_data.st_size;
+ /* save_sizeleft is set in read_and_process. */
+ }
- if ((current_stat_info.stat.st_mode & MODE_ALL) != (stat_data.st_mode & MODE_ALL))
- {
- report_difference (¤t_stat_info, _("Mode differs"));
- break;
- }
+ read_and_process (current_stat_info.stat.st_size, process_rawdata);
- break;
+ if (multi_volume_option)
+ assign_string (&save_name, 0);
- case GNUTYPE_VOLHDR:
- break;
+ status = close (fd);
+ if (status != 0)
+ close_error (current_stat_info.file_name);
+}
- case GNUTYPE_MULTIVOL:
- {
- off_t offset;
+/* Diff a file against the archive. */
+void
+diff_archive (void)
+{
+
+ set_next_block_after (current_header);
+ decode_header (current_header, ¤t_stat_info, ¤t_format, 1);
- if (current_stat_info.had_trailing_slash)
- goto really_dir;
+ /* Print the block from current_header and current_stat_info. */
- if (!get_stat_data (current_stat_info.file_name, &stat_data))
- break;
+ if (verbose_option)
+ {
+ if (now_verifying)
+ fprintf (stdlis, _("Verify "));
+ print_header (¤t_stat_info, -1);
+ }
- if (!S_ISREG (stat_data.st_mode))
- {
- report_difference (¤t_stat_info, _("File type differs"));
- skip_member ();
- break;
- }
+ switch (current_header->header.typeflag)
+ {
+ default:
+ ERROR ((0, 0, _("%s: Unknown file type `%c', diffed as normal file"),
+ quotearg_colon (current_stat_info.file_name),
+ current_header->header.typeflag));
+ /* Fall through. */
- offset = OFF_FROM_HEADER (current_header->oldgnu_header.offset);
- if (stat_data.st_size != current_stat_info.stat.st_size + offset)
- {
- report_difference (¤t_stat_info, _("Size differs"));
- skip_member ();
- break;
- }
+ case AREGTYPE:
+ case REGTYPE:
+ case GNUTYPE_SPARSE:
+ case CONTTYPE:
- diff_handle = open (current_stat_info.file_name, O_RDONLY | O_BINARY);
+ /* Appears to be a file. See if it's really a directory. */
- if (diff_handle < 0)
- {
- open_error (current_stat_info.file_name);
- report_difference (¤t_stat_info, NULL);
- skip_member ();
- break;
- }
+ if (current_stat_info.had_trailing_slash)
+ diff_dir ();
+ else
+ diff_file ();
+ break;
- if (lseek (diff_handle, offset, SEEK_SET) < 0)
- {
- seek_error_details (current_stat_info.file_name, offset);
- report_difference (¤t_stat_info, NULL);
- break;
- }
+ case LNKTYPE:
+ diff_link ();
+ break;
- if (multi_volume_option)
- {
- assign_string (&save_name, current_stat_info.file_name);
- save_totsize = stat_data.st_size;
- /* save_sizeleft is set in read_and_process. */
- }
+#ifdef HAVE_READLINK
+ case SYMTYPE:
+ diff_symlink ();
+ break;
+#endif
- read_and_process (current_stat_info.stat.st_size, process_rawdata);
+ case CHRTYPE:
+ case BLKTYPE:
+ case FIFOTYPE:
+ diff_special ();
+ break;
- if (multi_volume_option)
- assign_string (&save_name, 0);
+ case GNUTYPE_DUMPDIR:
+ diff_dumpdir ();
+ /* Fall through. */
- status = close (diff_handle);
- if (status != 0)
- close_error (current_stat_info.file_name);
+ case DIRTYPE:
+ diff_dir ();
+ break;
- break;
- }
+ case GNUTYPE_VOLHDR:
+ break;
+
+ case GNUTYPE_MULTIVOL:
+ diff_multivol ();
}
}
void
verify_volume (void)
{
+ if (removed_prefixes_p ())
+ {
+ WARN((0, 0,
+ _("Archive contains file names with leading prefixes removed.")));
+ WARN((0, 0,
+ _("Verification may fail to locate original files.")));
+ }
+
if (!diff_buffer)
diff_init ();
do
{
counter++;
+ set_next_block_after (current_header);
status = read_header (false);
}
while (status == HEADER_FAILURE);
break;
diff_archive ();
+ tar_stat_destroy (¤t_stat_info);
+ xheader_destroy (&extended_header);
}
access_mode = ACCESS_WRITE;
projects / chaz / tar / blobdiff