Don't include <getline.h>. No longer needed.

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index 90f65922e81c0d01b3fbce2397f3d00d6200945e..f16d620b912542237d4a145d38511acbc26ca35d 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -7,7 +7,7 @@
 
    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
 
    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

-   Free Software Foundation; either version 2, or (at your option) any later
+   Free Software Foundation; either version 3, or (at your option) any later

    version.
 
    This program is distributed in the hope that it will be useful, but
    version.
 
    This program is distributed in the hope that it will be useful, but


@@ -22,7 +22,6 @@
 #include <system.h>
 
 #include <fnmatch.h>
 #include <system.h>
 
 #include <fnmatch.h>

-#include <getline.h>

 #include <argp.h>
 #include <argp-namefrob.h>
 #include <argp-fmtstream.h>
 #include <argp.h>
 #include <argp-namefrob.h>
 #include <argp-fmtstream.h>


@@ -617,7 +616,7 @@ static struct argp_option options[] = {
    N_("exclude directories containing CACHEDIR.TAG"), GRID+1 },
   {"exclude-tag", EXCLUDE_TAG_OPTION, N_("FILE"), 0,
    N_("exclude contents of directories containing FILE, except"
    N_("exclude directories containing CACHEDIR.TAG"), GRID+1 },
   {"exclude-tag", EXCLUDE_TAG_OPTION, N_("FILE"), 0,
    N_("exclude contents of directories containing FILE, except"

-      " for FILE itself"), GRID+1 }, 
+      " for FILE itself"), GRID+1 },

   {"exclude-tag-under", EXCLUDE_TAG_UNDER_OPTION, N_("FILE"), 0,
    N_("exclude everything under directories containing FILE"), GRID+1 },
   {"exclude-tag-all", EXCLUDE_TAG_ALL_OPTION, N_("FILE"), 0,
   {"exclude-tag-under", EXCLUDE_TAG_UNDER_OPTION, N_("FILE"), 0,
    N_("exclude everything under directories containing FILE"), GRID+1 },
   {"exclude-tag-all", EXCLUDE_TAG_ALL_OPTION, N_("FILE"), 0,


@@ -1539,15 +1538,15 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case EXCLUDE_TAG_OPTION:
       add_exclusion_tag (arg, exclusion_tag_contents, NULL);
       break;
     case EXCLUDE_TAG_OPTION:
       add_exclusion_tag (arg, exclusion_tag_contents, NULL);
       break;

-      
+

     case EXCLUDE_TAG_UNDER_OPTION:
       add_exclusion_tag (arg, exclusion_tag_under, NULL);
       break;
     case EXCLUDE_TAG_UNDER_OPTION:
       add_exclusion_tag (arg, exclusion_tag_under, NULL);
       break;

-      
+

     case EXCLUDE_TAG_ALL_OPTION:
       add_exclusion_tag (arg, exclusion_tag_all, NULL);
       break;
     case EXCLUDE_TAG_ALL_OPTION:
       add_exclusion_tag (arg, exclusion_tag_all, NULL);
       break;

-      
+

     case FORCE_LOCAL_OPTION:
       force_local_option = true;
       break;
     case FORCE_LOCAL_OPTION:
       force_local_option = true;
       break;


@@ -1934,23 +1933,23 @@ usage (int status)
 /* Parse the options for tar.  */
 
 static struct argp_option *
 /* Parse the options for tar.  */
 
 static struct argp_option *

-find_argp_option (struct argp_option *options, int letter)
+find_argp_option (struct argp_option *o, int letter)

 {
   for (;
 {
   for (;

-       !(options->name == NULL
-        && options->key == 0
-        && options->arg == 0
-        && options->flags == 0
-        && options->doc == NULL); options++)
-    if (options->key == letter)
-      return options;
+       !(o->name == NULL
+        && o->key == 0
+        && o->arg == 0
+        && o->flags == 0
+        && o->doc == NULL); o++)
+    if (o->key == letter)
+      return o;

   return NULL;
 }
 
 static void
 decode_options (int argc, char **argv)
 {
   return NULL;
 }
 
 static void
 decode_options (int argc, char **argv)
 {

-  int index;
+  int idx;

   struct tar_args args;
 
   /* Set some default option values.  */
   struct tar_args args;
 
   /* Set some default option values.  */


@@ -2041,7 +2040,7 @@ decode_options (int argc, char **argv)
   prepend_default_options (getenv ("TAR_OPTIONS"), &argc, &argv);
 
   if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_HELP,
   prepend_default_options (getenv ("TAR_OPTIONS"), &argc, &argv);
 
   if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_HELP,

-                 &index, &args))
+                 &idx, &args))

     exit (TAREXIT_FAILURE);
 
 
     exit (TAREXIT_FAILURE);
 
 


@@ -2069,9 +2068,9 @@ decode_options (int argc, char **argv)
     }
 
   /* Handle operands after any "--" argument.  */
     }
 
   /* Handle operands after any "--" argument.  */

-  for (; index < argc; index++)
+  for (; idx < argc; idx++)

     {
     {

-      name_add_name (argv[index], MAKE_INCL_OPTIONS (&args));
+      name_add_name (argv[idx], MAKE_INCL_OPTIONS (&args));

       args.input_files = true;
     }
 
       args.input_files = true;
     }
 


@@ -2302,9 +2301,6 @@ main (int argc, char **argv)
   /* Make sure we have first three descriptors available */
   stdopen ();
 
   /* Make sure we have first three descriptors available */
   stdopen ();
 

-  /* Close all inherited open descriptors, except for the first three */
-  closeopen ();
-

   /* Pre-allocate a few structures.  */
 
   allocated_archive_names = 10;
   /* Pre-allocate a few structures.  */
 
   allocated_archive_names = 10;


@@ -2322,6 +2318,7 @@ main (int argc, char **argv)
   /* Decode options.  */
 
   decode_options (argc, argv);
   /* Decode options.  */
 
   decode_options (argc, argv);

+

   name_init ();
 
   /* Main command execution.  */
   name_init ();
 
   /* Main command execution.  */


@@ -2410,6 +2407,7 @@ tar_stat_destroy (struct tar_stat_info *st)
   free (st->gname);
   free (st->sparse_map);
   free (st->dumpdir);
   free (st->gname);
   free (st->sparse_map);
   free (st->dumpdir);

+  xheader_destroy (&st->xhdr);

   memset (st, 0, sizeof (*st));
 }
 
   memset (st, 0, sizeof (*st));
 }