From: Paul Eggert Date: Wed, 29 Nov 2006 18:16:27 +0000 (+0000) Subject: Remove trailing white space. X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=01d61882973471f72122667e186331fdb6eee342;p=chaz%2Ftar Remove trailing white space. --- diff --git a/ChangeLog b/ChangeLog index 88adbf8..58873bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,9 +4,9 @@ struct timespec, overriding st->mtime * src/create.c (start_header): Pass mtime as a call-specific data to xheader_store. - + * tests/truncate.at: Do not use 'k' modifier in dd options. - * tests/append02.at: Do not depend on command timing. + * tests/append02.at: Do not depend on command timing. 2006-11-01 Sergey Poznyakoff @@ -26,7 +26,7 @@ 2006-10-31 Sergey Poznyakoff * src/extract.c, src/xheader.c: Call last_component instead of - base_name. The latter returns a malloced string since 2006-03-11. + base_name. The latter returns a malloced string since 2006-03-11. 2006-10-21 Sergey Poznyakoff diff --git a/NEWS b/NEWS index e0473c7..deb3baf 100644 --- a/NEWS +++ b/NEWS @@ -8,7 +8,7 @@ changed while being read. Previous versions exited with code 2 (fatal error), and only if some files were truncated while being archived. * New option --mtime allows to set modification times for all archive -members during creation. +members during creation. * Bug fixes ** Avoid running off file descriptors when using multiple -C options. @@ -34,14 +34,14 @@ no longer uses globbing by default. For example, the above invocation is now interpreted as a request to extract from the archive the file named '*.c'. -To treat member names as globbing patterns, use --wildcards option. +To treat member names as globbing patterns, use --wildcards option. If you wish tar to mimic the behavior of versions up to 1.15.90, add --wildcards to the value of the environment variable TAR_OPTIONS. The exact way in which tar interprets member names is controlled by the following command line options: - --wildcards use wildcards + --wildcards use wildcards --anchored patterns match file name start --ignore-case ignore case --wildcards-match-slash wildcards match `/' @@ -49,7 +49,7 @@ following command line options: Each of these options has a '--no-' counterpart that disables its effect (e.g. --no-wildcards). -These options affect both the interpretation of member names from +These options affect both the interpretation of member names from command line and that of the exclusion patterns (given with --exclude and --exclude-from options). The defaults are: @@ -65,7 +65,7 @@ case-sensitive matching for the rest of command line, one could write: ** Short option -l is now an alias of --check-links option, which complies with UNIX98. This ends the transition period started with version 1.14. - + * New features ** New option --transform allows to transform file names before storing them @@ -80,19 +80,19 @@ will add 'prefix/' to all file names stored in foo.tar. versions it worked only with --extract. ** New option --show-transformed-names enables display of transformed file -or archive. It generalizes --show-stored-names option, introduced in -1.15.90. In particular, when creating an archive in verbose mode, it lists +or archive. It generalizes --show-stored-names option, introduced in +1.15.90. In particular, when creating an archive in verbose mode, it lists member names as stored in the archive, i.e., with any eventual prefixes removed and file name transformations applied. The option is useful, for example, while comparing `tar cv' and `tar tv' outputs. -** New incremental snapshot file format keeps information about file names +** New incremental snapshot file format keeps information about file names as well as that about directories. ** The --checkpoint option takes an optional argument specifying the number of records between the two successive checkpoints. Optional dot starting the argument intructs tar to print dots instead of textual -checkpoints. +checkpoints. ** The --totals option can be used with any tar operation (previous versions understood it only with --create). If an argument to this option is diff --git a/src/Makefile.am b/src/Makefile.am index 4554770..2c4c4a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,7 +40,7 @@ tar_SOURCES = \ update.c\ utf8.c -INCLUDES = -I$(top_srcdir)/lib -I../ -I../lib +INCLUDES = -I$(top_srcdir)/lib -I../ -I../lib tar.o: ../lib/localedir.h diff --git a/src/common.h b/src/common.h index f5e0545..4aea8b5 100644 --- a/src/common.h +++ b/src/common.h @@ -254,7 +254,7 @@ GLOBAL bool show_omitted_dirs_option; GLOBAL bool sparse_option; GLOBAL unsigned tar_sparse_major; GLOBAL unsigned tar_sparse_minor; - + GLOBAL bool starting_file_option; /* Specified maximum byte length of each tape volume (multiple of 1024). */ @@ -296,7 +296,7 @@ GLOBAL int archive; /* Nonzero when outputting to /dev/null. */ GLOBAL bool dev_null_output; -/* Timestamps: */ +/* Timestamps: */ GLOBAL struct timespec start_time; /* when we started execution */ GLOBAL struct timespec volume_start_time; /* when the current volume was opened*/ @@ -727,5 +727,3 @@ bool utf8_convert (bool to_utf, char const *input, char **output); void set_transform_expr (const char *expr); bool transform_name (char **pinput); bool transform_name_fp (char **pinput, char *(*fun)(char *)); - - diff --git a/src/extract.c b/src/extract.c index 148fdfc..26c83b1 100644 --- a/src/extract.c +++ b/src/extract.c @@ -1331,10 +1331,10 @@ rename_directory (char *src, char *dst) e = errno; } break; - + case EXDEV: /* FIXME: Fall back to recursive copying */ - + default: break; } @@ -1346,7 +1346,7 @@ rename_directory (char *src, char *dst) } return true; } - + void fatal_exit (void) {