Use UTF-8 uniformly, rather than UTF-8 sometimes and Latin-1 sometimes.

diff --git a/ChangeLog b/ChangeLog
index 0b2e9bd2cede45ec63aaf53b60f12e8f9b2c1aef..ca0a12ff8a662bb1d933f822110ccb4750fd120b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,14 +26,14 @@
        * src/create.c: Assign orig_file_name
        to save_name uniformly over the program. This fixes matching
        directory names at the start of an archive volume.
-       * src/list.c: Likewise  
+       * src/list.c: Likewise
 
        * tests/multiv03.at: Modified to match the new behavior
        * tests/multiv04.at: New file. Test splittind directory members between
        the archive volumes.
        * tests/Makefile.am: Add multiv04.at
        * tests/testsuite.at: Likewise.
-       
+
 2005-04-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.ac (AC_CONFIG_AUX_DIR): Rename from config to build-aux,
@@ -1064,8 +1064,8 @@
 2004-04-20  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
        * configure.ac: Fixed test for iconv_t
-       * src/rmt.h: Bugfix by Jürgen Weigert
-       * THANKS: Add Jürgen Weigert
+       * src/rmt.h: Bugfix by Jürgen Weigert
+       * THANKS: Add Jürgen Weigert
        * tests/star/README: Fixed typo
 
 2004-04-04  Paul Eggert  <eggert@twinsun.com>

diff --git a/NEWS b/NEWS
index c9ba52cbff642d7f94afb607569d4360264ac1e7..911592dc13074a8aedd55ad2a28394bac52fc2fb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -34,7 +34,7 @@ was not processed correctly.
 \f
 version 1.15.1 - Sergey Poznyakoff, 2004-12-21
 
-This version fixes a bug introduced in 1.15 which caused 
+This version fixes a bug introduced in 1.15 which caused
 tar to refuse to extract files from standard input.
 
 \f
@@ -69,7 +69,7 @@ the file names had their prefixes stripped off.
 automatically on archive creation. Cache directories are those
 containing a standardized tag file, as specified at:
 
-       http://www.brynosaurus.com/cachedir/spec.html   
+       http://www.brynosaurus.com/cachedir/spec.html
 
 * New configure option --with-rmt allows to specify full path name to
 the `rmt' utility. This supercedes DEFAULT_RMT_COMMAND variable
@@ -93,12 +93,12 @@ lead to removing the already extracted copy. Preserve the first
 extracted copy in such cases.
 ** Restore script was passing improper argument to tar --listed option (which
 didn't affect the functionality, but was logically incorrect).
-** Fixed verification of created archives. 
+** Fixed verification of created archives.
 ** Fixed unquoting of file names containing backslash escapes (previous
 versions failed to recognize \a and \v).
 ** When attempting to delete a non-existing member from the archive, previous
 versions of tar used to overwrite last archive block with zeroes.
-  
+
 \f
 version 1.14 - Sergey Poznyakoff, 2004-05-11
 
@@ -126,7 +126,7 @@ version 1.14 - Sergey Poznyakoff, 2004-05-11
   with previous releases, however such usage is strongly deprecated as
   the option will change to its UNIX98 semantics in the future releases.
 
-* New option --occurrence[=N] can be used in conjunction with one of 
+* New option --occurrence[=N] can be used in conjunction with one of
   the subcommands --delete, --diff, --extract or --list when a list of
   files is given either on the command line or via -T option. This
   option instructs tar to process only the Nth occurrence of each named
@@ -157,8 +157,8 @@ DEFAULT_RMT_COMMAND=/etc/rmt.
 
 Notice also that the full path name of the "rmt" utility to
 use can be set at runtime, by giving option --rmt-command to
-tar. 
-      
+tar.
+
 * Removed obsolete command line options:
 ** --absolute-paths superseded by --absolute-names
 ** --block-compress is not needed any longer
@@ -171,7 +171,7 @@ tar.
 * New message translations fi (Finnish), gl (Galician), hr (Croatian),
   hu (Hungarian), ms (Malaysian), nb (Norwegian), ro (Romanian), sk
   (Slovak), zh_CN (Chinese simplified), zh_TW (Chinese traditional).
-  The code 'no' for Norwegian (Bokmål) has been withdrawn; use 'nb' instead.
+  The code 'no' for Norwegian (Bokmål) has been withdrawn; use 'nb' instead.
 
 * Bug fixes.
 
@@ -229,7 +229,7 @@ version 1.13.20 - Paul Eggert, 2001-08-27
   The translation for Korean has been withdrawn due to encoding errors.
   It will be reissued once those are fixed.
 
-\f  
+\f
 version 1.13.19 - Paul Eggert, 2001-01-13
 
 * The -I option has been withdrawn, as it was buggy and confusing.
@@ -238,7 +238,7 @@ version 1.13.19 - Paul Eggert, 2001-01-13
 * With an option like -N DATE, if DATE starts with "/" or ".", it is taken
   to be a file name; the last-modified time of that file is used as the date.
 
-\f  
+\f
 version 1.13.18 - Paul Eggert, 2000-10-29
 
 * Some security problems have been fixed.  `tar -x' now modifies only
@@ -266,7 +266,7 @@ version 1.13.18 - Paul Eggert, 2000-10-29
 
 * This version of tar works best with GNU gzip test version 1.3 or later.
   Please see <ftp://alpha.gnu.org/gnu/gzip/>.
-  
+
 * `tar --delete -f -' now works again.
 
 \f
@@ -319,13 +319,13 @@ version 1.13.16 - Paul Eggert, 1999-12-13.
 * tar now ignores socket files when creating an archive.
   Previously tar archived sockets as fifos, which caused problems.
 
-\f  
+\f
 version 1.13.15 - Paul Eggert, 1999-12-03.
 
 * If a file's ctime changes when being archived, report an error.
   Previously tar looked at mtime, which missed some errors.
 
-\f  
+\f
 version 1.13.14 - Paul Eggert, 1999-11-07.
 
 * New translations ja, pt_BR.

diff --git a/src/tar.h b/src/tar.h
index 6d484087a2a80dcbbdd26bf54463be857ff2c288..ad6872428496a7dc5ad9c2f36500e4650e08581a 100644 (file)
--- 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 Free Software Foundation, Inc.
+   2000, 2001, 2003, 2004, 2005 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
@@ -193,7 +193,7 @@ struct oldgnu_header
 #define SOLARIS_XHDTYPE 'X'
 
 \f
-/* Jörg Schilling star header */
+/* Jörg Schilling star header */
 
 struct star_header
 {                              /* byte offset */
@@ -287,17 +287,17 @@ struct tar_stat_info
   unsigned long atime_nsec;
   unsigned long mtime_nsec;
   unsigned long ctime_nsec;
-  
+
   off_t archive_file_size;  /* Size of file as stored in the archive.
                               Equals stat.st_size for non-sparse files */
 
-  bool   is_sparse;         /* Is the file sparse */ 
-  
+  bool   is_sparse;         /* Is the file sparse */
+
   size_t sparse_map_avail;  /* Index to the first unused element in
                               sparse_map array. Zero if the file is
                               not sparse */
   size_t sparse_map_size;   /* Size of the sparse map */
-  struct sp_array *sparse_map; 
+  struct sp_array *sparse_map;
 };
 
 union block

diff --git a/tests/multiv04.at b/tests/multiv04.at
index 2f1cb85b9bd57185e442e20275cbfb8db96f0efe..22fb5421b8d3545b7189ac0e786e6e7345a8df4d 100644 (file)
--- a/tests/multiv04.at
+++ b/tests/multiv04.at
@@ -20,7 +20,7 @@
 
 # Problem: Tar was not able to match directory name if the directory
 # member was split between two volumes
-# References: Jörg Schilling pretends to have reported this two
+# References: Jörg Schilling pretends to have reported this two
 # years ago (<42551FF2.nail98011FRAT@burner>).
 
 # Test idea:
@@ -62,7 +62,3 @@ block 35: ** Block of NULs **
 [],[],[gnu, oldgnu])
 
 AT_CLEANUP
-
-
-
-