From e86e864544a87003ac900d60135a3ca9424cfb95 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 7 Feb 2006 20:55:49 +0000 Subject: [PATCH] Update copyright year to 2006. --- ChangeLog | 14 +++++++++---- NEWS | 9 ++------ src/common.h | 10 ++++----- src/extract.c | 16 +++++++-------- src/incremen.c | 56 +++++++++++++++++++++++++------------------------- src/list.c | 8 ++++---- src/names.c | 8 ++++---- src/tar.h | 4 ++-- src/xheader.c | 2 +- 9 files changed, 64 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e4f7c0..79776bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -2006-02-07 Jim Meyering +2006-02-07 Paul Eggert + + * ChangeLog, NEWS, src/common.h, src/extract.c, src/incremen.c: + * src/list.c, src/names.c, src/tar.h, src/xheader.c: + Update copyright year to 2006. + +2006-02-07 Jim Meyering * src/xheader.c (sparse_map_decoder): Fix misleading diagnostic. @@ -17,7 +23,7 @@ (decode_header): Set stat_info->is_dumpdir (skip_member): Do nothing if skipped is true * src/tar.h (struct tar_stat_info): New members is_dumpdir and skipped. - + 2006-01-22 Sergey Poznyakoff * src/tar.c (decode_options): Refuse using --delete with @@ -7120,8 +7126,8 @@ See ChangeLog.1 for earlier changes. -Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software -Foundation, Inc. +Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 +Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/NEWS b/NEWS index 25dc012..7642af7 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,4 @@ GNU tar NEWS - User visible changes. -Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, -2004, 2005, 2006 -Free Software Foundation, Inc. -See the end for copying conditions. - Please send GNU tar bug reports to version 1.15.2 (CVS version -- unreleased) @@ -737,8 +732,8 @@ Versions 1.07 back to 1.00 by Jay Fenlason. -Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003 -Free Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, +2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/src/common.h b/src/common.h index 85e37e0..710bacd 100644 --- a/src/common.h +++ b/src/common.h @@ -1,7 +1,7 @@ /* Common declarations for the tar program. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -327,13 +327,13 @@ GLOBAL bool test_label_option; /* Test archive volume label and exit */ /* When creating archive in verbose mode, list member names as stored in the archive */ -GLOBAL bool show_stored_names_option; +GLOBAL bool show_stored_names_option; /* Delay setting modification times and permissions of extracted directories until the end of extraction. This variable helps correctly restore directory timestamps from archives with an unusual member order. It is automatically set for incremental archives. */ -GLOBAL bool delay_directory_restore_option; +GLOBAL bool delay_directory_restore_option; /* Declarations for each module. */ @@ -577,7 +577,7 @@ void xpipe (int[2]); void *page_aligned_alloc (void **, size_t); int set_file_atime (int fd, char const *file, struct timespec const timespec[2]); - + /* Module names.c. */ extern struct name *gnu_list_name; @@ -658,7 +658,7 @@ void xheader_string_end (char const *keyword); bool xheader_keyword_deleted_p (const char *kw); char *xheader_format_name (struct tar_stat_info *st, const char *fmt, size_t n); - + /* Module system.c */ void sys_detect_dev_null_output (void); diff --git a/src/extract.c b/src/extract.c index c01c88d..a630bb7 100644 --- a/src/extract.c +++ b/src/extract.c @@ -1,7 +1,7 @@ /* Extract files from a tar archive. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000, - 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by John Gilmore, on 1985-11-19. @@ -759,26 +759,26 @@ extract_file (char *file_name, int typeflag) for (size = current_stat_info.stat.st_size; size > 0; ) { mv_size_left (size); - + /* Locate data, determine max length writeable, write it, block that we have used the data, then check if the write worked. */ - + data_block = find_next_block (); if (! data_block) { ERROR ((0, 0, _("Unexpected EOF in archive"))); break; /* FIXME: What happens, then? */ } - + written = available_space_after (data_block); - + if (written > size) written = size; errno = 0; count = full_write (fd, data_block->buffer, written); size -= written; - + set_next_block_after ((union block *) (data_block->buffer + written - 1)); if (count != written) @@ -793,7 +793,7 @@ extract_file (char *file_name, int typeflag) skip_file (size); mv_end (); - + /* If writing to stdout, don't try to do anything to the filename; it doesn't exist, or we don't want to touch it anyway. */ @@ -1210,7 +1210,7 @@ extract_archive (void) (see NOTICE in the comment to delay_set_stat above) */ if (!delay_directory_restore_option) apply_nonancestor_delayed_set_stat (file_name, 0); - + /* Take a safety backup of a previously existing file. */ if (backup_option) diff --git a/src/incremen.c b/src/incremen.c index 9e0bb54..4899403 100644 --- a/src/incremen.c +++ b/src/incremen.c @@ -1,7 +1,7 @@ /* GNU dump extensions to tar. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -115,13 +115,13 @@ update_parent_directory (const char *name) { struct directory *directory; char *p, *name_buffer; - + p = dir_name (name); name_buffer = xmalloc (strlen (p) + 2); strcpy (name_buffer, p); if (! ISSLASH (p[strlen (p) - 1])) strcat (name_buffer, "/"); - + directory = find_directory (name_buffer); free (name_buffer); if (directory) @@ -142,16 +142,16 @@ compare_dirents (const void *first, const void *second) (*(char *const *) second) + 1); } -enum children +enum children procdir (char *name_buffer, struct stat *stat_data, dev_t device, enum children children, bool verbose) -{ +{ struct directory *directory; bool nfs = NFS_FILE_STAT (*stat_data); struct name *np; - + if ((directory = find_directory (name_buffer)) != NULL) { /* With NFS, the same file can have two different devices @@ -160,7 +160,7 @@ procdir (char *name_buffer, struct stat *stat_data, To avoid spurious incremental redumping of directories, consider all NFS devices as equal, relying on the i-node to establish differences. */ - + if (! (((directory->nfs & nfs) || directory->device_number == stat_data->st_dev) && directory->inode_number == stat_data->st_ino)) @@ -212,7 +212,7 @@ procdir (char *name_buffer, struct stat *stat_data, directory->children = NO_CHILDREN; else if (children == ALL_CHILDREN) directory->children = ALL_CHILDREN; - + return directory->children; } @@ -247,7 +247,7 @@ scan_directory (struct obstack *stk, char *dir_name, dev_t device) } else children = procdir (name_buffer, &stat_data, device, NO_CHILDREN, false); - + if (dirp && children != NO_CHILDREN) for (entry = dirp; (entrylen = strlen (entry)) != 0; @@ -377,7 +377,7 @@ dumpdir_size (const char *p) totsize += size; p += size; } - return totsize + 1; + return totsize + 1; } @@ -399,7 +399,7 @@ static FILE *listed_incremental_stream; correctly and that tar will use the most conservative backup method among possible alternatives (i.e. prefer ALL_CHILDREN over CHANGED_CHILDREN, etc.) This ensures that the snapshots are updated to the recent version - without any loss of data. */ + without any loss of data. */ void read_directory_file (void) { @@ -436,7 +436,7 @@ read_directory_file (void) uintmax_t u; time_t t = u; int incremental_version; - + if (strncmp (buf, PACKAGE_NAME, sizeof PACKAGE_NAME - 1) == 0) { ebuf = buf + sizeof PACKAGE_NAME - 1; @@ -445,7 +445,7 @@ read_directory_file (void) for (; *ebuf != '-'; ebuf++) if (!*ebuf) ERROR((1, 0, _("Bad incremental file format"))); - + incremental_version = (errno = 0, strtoumax (ebuf+1, &ebuf, 10)); if (getline (&buf, &bufsize, fp) <= 0) { @@ -461,7 +461,7 @@ read_directory_file (void) if (incremental_version > TAR_INCREMENTAL_VERSION) ERROR((1, 0, _("Unsupported incremental format version: %d"), incremental_version)); - + t = u = (errno = 0, strtoumax (buf, &ebuf, 10)); if (buf == ebuf || (u == 0 && errno == EINVAL)) ERROR ((0, 0, "%s:%ld: %s", @@ -476,7 +476,7 @@ read_directory_file (void) else if (incremental_version == 1) { newer_mtime_option.tv_sec = t; - + t = u = (errno = 0, strtoumax (buf, &ebuf, 10)); if (buf == ebuf || (u == 0 && errno == EINVAL)) ERROR ((0, 0, "%s:%ld: %s", @@ -518,19 +518,19 @@ read_directory_file (void) ERROR ((0, 0, "%s:%ld: %s", quotearg_colon (listed_incremental_option), lineno, _("Invalid modification time (seconds)"))); - else if (mtime.tv_sec != u) + else if (mtime.tv_sec != u) ERROR ((0, 0, "%s:%ld: %s", quotearg_colon (listed_incremental_option), lineno, _("Modification time (seconds) out of range"))); strp = ebuf; - + errno = 0; mtime.tv_nsec = u = strtoumax (strp, &ebuf, 10); if (!isspace (*ebuf)) ERROR ((0, 0, "%s:%ld: %s", quotearg_colon (listed_incremental_option), lineno, _("Invalid modification time (nanoseconds)"))); - else if (mtime.tv_nsec != u) + else if (mtime.tv_nsec != u) ERROR ((0, 0, "%s:%ld: %s", quotearg_colon (listed_incremental_option), lineno, _("Modification time (nanoseconds) out of range"))); @@ -538,14 +538,14 @@ read_directory_file (void) } else memset (&mtime, 0, sizeof mtime); - + errno = 0; dev = u = strtoumax (strp, &ebuf, 10); if (!isspace (*ebuf)) ERROR ((0, 0, "%s:%ld: %s", quotearg_colon (listed_incremental_option), lineno, _("Invalid device number"))); - else if (dev != u) + else if (dev != u) ERROR ((0, 0, "%s:%ld: %s", quotearg_colon (listed_incremental_option), lineno, _("Device number out of range"))); @@ -588,7 +588,7 @@ write_directory_file_entry (void *entry, void *data) int e; char buf[UINTMAX_STRSIZE_BOUND]; char *str = quote_copy_string (directory->name); - + if (directory->nfs) fprintf (fp, "+"); fprintf (fp, "%s ", umaxtostr (directory->mtime.tv_sec, buf)); @@ -596,7 +596,7 @@ write_directory_file_entry (void *entry, void *data) fprintf (fp, "%s ", umaxtostr (directory->device_number, buf)); fprintf (fp, "%s ", umaxtostr (directory->inode_number, buf)); fprintf (fp, "%s\n", str ? str : directory->name); - + e = errno; if (str) free (str); @@ -621,7 +621,7 @@ write_directory_file (void) fprintf (fp, "%s-%s-%d\n", PACKAGE_NAME, PACKAGE_VERSION, TAR_INCREMENTAL_VERSION); - + fprintf (fp, "%lu %lu\n", (unsigned long int) start_time.tv_sec, (unsigned long int) start_time.tv_nsec); @@ -644,7 +644,7 @@ get_gnu_dumpdir (struct tar_stat_info *stat_info) union block *data_block; char *to; char *archive_dir; - + size = stat_info->stat.st_size; archive_dir = xmalloc (size); @@ -669,7 +669,7 @@ get_gnu_dumpdir (struct tar_stat_info *stat_info) } mv_end (); - + stat_info->dumpdir = archive_dir; stat_info->skipped = true; /* For skip_member() and friends to work correctly */ @@ -699,7 +699,7 @@ purge_directory (char const *directory_name) skip_member (); return; } - + current_dir = savedir (directory_name); if (!current_dir) @@ -771,13 +771,13 @@ list_dumpdir (char *buffer, size_t size) buffer++; size--; break; - + case 0: fputc ('\n', stdlis); buffer++; size--; break; - + default: fputc (*buffer, stdlis); buffer++; diff --git a/src/list.c b/src/list.c index ff54825..2d05873 100644 --- a/src/list.c +++ b/src/list.c @@ -1,7 +1,7 @@ /* List a tar archive, with support routines for reading a tar archive. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000, - 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by John Gilmore, on 1985-08-26. @@ -211,7 +211,7 @@ list_archive (void) decode_header (current_header, ¤t_stat_info, ¤t_format, 0); if (verbose_option) print_header (¤t_stat_info, block_ordinal); - + if (incremental_option) { if (verbose_option > 2) @@ -1006,7 +1006,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) } else temp_name = st->orig_file_name ? st->orig_file_name : st->file_name; - + if (block_number_option) { char buf[UINTMAX_STRSIZE_BOUND]; @@ -1277,7 +1277,7 @@ skip_file (off_t size) } mv_size_left (size); - + while (size > 0) { x = find_next_block (); diff --git a/src/names.c b/src/names.c index 03eece6..f998ffb 100644 --- a/src/names.c +++ b/src/names.c @@ -1,7 +1,7 @@ /* Various processing of names. Copyright (C) 1988, 1992, 1994, 1996, 1997, 1998, 1999, 2000, 2001, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -430,7 +430,7 @@ addname (char const *string, int change_dir) name->change_dir = change_dir; name->dir_contents = 0; name->explicit = 1; - + if (string && is_pattern (string)) { name->regexp = 1; @@ -713,7 +713,7 @@ add_hierarchy_to_namelist (struct name *name, dev_t device) if (*string == 'D') { struct name *np; - + if (allocated_length <= name_length + string_length) { do @@ -791,7 +791,7 @@ collect_and_sort_names (void) /* This is like name_match, except that 1. It returns a pointer to the name it matched, and doesn't set FOUND - in structure. The caller will have to do that if it wants to. + in structure. The caller will have to do that if it wants to. 2. If the namelist is empty, it returns null, unlike name_match, which returns TRUE. 3. The second argument (EXACT) controls matching algorithm. If it diff --git a/src/tar.h b/src/tar.h index a759a85..7235030 100644 --- a/src/tar.h +++ b/src/tar.h @@ -1,7 +1,7 @@ /* GNU tar Archive Format description. Copyright (C) 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + 2000, 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -303,7 +303,7 @@ struct tar_stat_info bool is_dumpdir; /* Is the member a dumpdir? */ bool skipped; /* The member contents is already read (for GNUTYPE_DUMPDIR) */ - char *dumpdir; /* Contents of the dump directory */ + char *dumpdir; /* Contents of the dump directory */ }; union block diff --git a/src/xheader.c b/src/xheader.c index 8399df8..087cb1b 100644 --- a/src/xheader.c +++ b/src/xheader.c @@ -1,6 +1,6 @@ /* POSIX extended headers for tar. - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the -- 2.44.0