When computing write rate do not take

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index 6c76e0be4d42e37764ac25456b9ea9e4b07d2d61..78638d02c3aacd2616e484c76c23f9e7408c9416 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -270,7 +270,7 @@ static struct argp_option options[] = {
    N_("list the contents of an archive"), 10 },
   {"extract", 'x', 0, 0,
    N_("extract files from an archive"), 10 },
-  {"get", 0, 0, OPTION_ALIAS, NULL},
+  {"get", 0, 0, OPTION_ALIAS, NULL, 0 },
   {"create", 'c', 0, 0,
    N_("create a new archive"), 10 },
   {"diff", 'd', 0, 0,
@@ -448,9 +448,9 @@ static struct argp_option options[] = {
   {"ignore-case", IGNORE_CASE_OPTION, 0, 0,
    N_("exclusion ignores case"), 71 },
   {"anchored", ANCHORED_OPTION, 0, 0,
-   N_("exclude patterns match file name start (default)"), 71 },
+   N_("exclude patterns match file name start"), 71 },
   {"no-anchored", NO_ANCHORED_OPTION, 0, 0,
-   N_("exclude patterns match after any /"), 71 },
+   N_("exclude patterns match after any / (default)"), 71 },
   {"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0,
    N_("exclusion is case sensitive (default)"), 71 },
   {"no-wildcards", NO_WILDCARDS_OPTION, 0, 0,
@@ -527,7 +527,7 @@ static struct argp_option options[] = {
   /* FIXME -V (--label) conflicts with the default short option for
      --version */
   
-  {0, 0, 0, 0}
+  {0, 0, 0, 0, 0, 0}
 };
 
 struct tar_args {
@@ -583,13 +583,13 @@ for complete list of authors.\n"));
     "   the Free Software Foundation; either version 2 of the License, or\n"
     "   (at your option) any later version.\n"
     "\n"
-    "   GNU Mailutils is distributed in the hope that it will be useful,\n"
+    "   GNU tar is distributed in the hope that it will be useful,\n"
     "   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
     "   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
     "   GNU General Public License for more details.\n"
     "\n"
     "   You should have received a copy of the GNU General Public License\n"
-    "   along with GNU Mailutils; if not, write to the Free Software\n"
+    "   along with GNU tar; if not, write to the Free Software\n"
     "   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA\n\n"));
   exit (0);
 }
@@ -754,7 +754,7 @@ parse_opt(int key, char *arg, struct argp_state *state)
       if (NEWER_OPTION_INITIALIZED (newer_mtime_option))
        USAGE_ERROR ((0, 0, _("More than one threshold date")));
       
-      if (FILESYSTEM_PREFIX_LEN (arg) != 0
+      if (FILE_SYSTEM_PREFIX_LEN (arg) != 0
          || ISSLASH (*arg)
          || *arg == '.')
        {
@@ -1268,7 +1268,7 @@ find_argp_option (struct argp_option *options, int letter)
        !(options->name == NULL
         && options->key == 0
         && options->arg == 0
-        && options->flags
+        && options->flags == 0
         && options->doc == NULL); options++)
     if (options->key == letter)
       return options;
@@ -1278,7 +1278,6 @@ find_argp_option (struct argp_option *options, int letter)
 static void
 decode_options (int argc, char **argv)
 {
-  int optchar;                 /* option letter */
   int index;
   struct tar_args args;
   
@@ -1290,7 +1289,6 @@ decode_options (int argc, char **argv)
   args.backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
   args.version_control_string = 0;
   args.input_files = 0;
-  
 
   subcommand_option = UNKNOWN_SUBCOMMAND;
   archive_format = DEFAULT_FORMAT;