Migrate to Git

[chaz/tar] / src / names.c

diff --git a/src/names.c b/src/names.c
index 936d7fd042b548fbad357db575eeac5acaf560ea..05f89b15d19ab615c793c7dcc4709a436c294ac0 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -1,11 +1,11 @@
 /* Various processing of names.
 
    Copyright (C) 1988, 1992, 1994, 1996, 1997, 1998, 1999, 2000, 2001,
 /* Various processing of names.
 
    Copyright (C) 1988, 1992, 1994, 1996, 1997, 1998, 1999, 2000, 2001,

-   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2006, 2007 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
 
    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


@@ -289,9 +289,8 @@ static int matching_flags; /* exclude_fnmatch options */
    static storage and can't be relied upon across two calls.
 
    If CHANGE_DIRS is true, treat any entries of type NELT_CHDIR as
    static storage and can't be relied upon across two calls.
 
    If CHANGE_DIRS is true, treat any entries of type NELT_CHDIR as

-   the request to change to the given directory.  If filename_terminator
-   is NUL, CHANGE_DIRS is effectively always false.
-
+   the request to change to the given directory.
+   

    Entries of type NELT_FMASK cause updates of the matching_flags
    value. */
 struct name_elt *
    Entries of type NELT_FMASK cause updates of the matching_flags
    value. */
 struct name_elt *


@@ -301,9 +300,6 @@ name_next_elt (int change_dirs)
   const char *source;
   char *cursor;
 
   const char *source;
   char *cursor;
 

-  if (filename_terminator == '\0')
-    change_dirs = 0;
-

   while (name_index != names)
     {
       struct name_elt *ep;
   while (name_index != names)
     {
       struct name_elt *ep;


@@ -392,9 +388,7 @@ name_gather (void)
       if (allocated_size == 0)
        {
          allocated_size = offsetof (struct name, name) + NAME_FIELD_SIZE + 1;
       if (allocated_size == 0)
        {
          allocated_size = offsetof (struct name, name) + NAME_FIELD_SIZE + 1;

-         buffer = xmalloc (allocated_size);
-         /* FIXME: This memset is overkill, and ugly...  */
-         memset (buffer, 0, allocated_size);
+         buffer = xzalloc (allocated_size);

        }
       
       while ((ep = name_next_elt (0)) && ep->type == NELT_CHDIR)
        }
       
       while ((ep = name_next_elt (0)) && ep->type == NELT_CHDIR)


@@ -572,8 +566,7 @@ all_names_found (struct tar_stat_info *p)
   len = strlen (p->file_name);
   for (cursor = namelist; cursor; cursor = cursor->next)
     {
   len = strlen (p->file_name);
   for (cursor = namelist; cursor; cursor = cursor->next)
     {

-      if (cursor->matching_flags /* FIXME: check this */
-         || (!WASFOUND (cursor) && cursor->name[0])
+      if ((cursor->name[0] && !WASFOUND (cursor))

          || (len >= cursor->length && ISSLASH (p->file_name[cursor->length])))
        return false;
     }
          || (len >= cursor->length && ISSLASH (p->file_name[cursor->length])))
        return false;
     }


@@ -735,7 +728,7 @@ static void
 add_hierarchy_to_namelist (struct name *name, dev_t device)
 {
   char *file_name = name->name;
 add_hierarchy_to_namelist (struct name *name, dev_t device)
 {
   char *file_name = name->name;

-  char *buffer = get_directory_contents (file_name, device);
+  const char *buffer = get_directory_contents (file_name, device);

 
   if (! buffer)
     name->dir_contents = "\0\0\0\0";
 
   if (! buffer)
     name->dir_contents = "\0\0\0\0";


@@ -747,7 +740,7 @@ add_hierarchy_to_namelist (struct name *name, dev_t device)
                                 : NAME_FIELD_SIZE);
       char *namebuf = xmalloc (allocated_length + 1);
                                /* FIXME: + 2 above?  */
                                 : NAME_FIELD_SIZE);
       char *namebuf = xmalloc (allocated_length + 1);
                                /* FIXME: + 2 above?  */

-      char *string;
+      const char *string;

       size_t string_length;
       int change_dir = name->change_dir;
 
       size_t string_length;
       int change_dir = name->change_dir;
 


@@ -1013,11 +1006,10 @@ contains_dot_dot (char const *name)
       if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
        return 1;
 
       if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
        return 1;
 

-      do
+      while (! ISSLASH (*p))

        {
          if (! *p++)
            return 0;
        }
        {
          if (! *p++)
            return 0;
        }

-      while (! ISSLASH (*p));

     }
 }
     }
 }