with this program; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-#include "system.h"
+#include <system.h>
#include <fnmatch.h>
#include <hash.h>
static uid_t cached_no_such_uid;
static gid_t cached_no_such_gid;
+static void register_individual_file (char const *name);
+
/* Given UID, find the corresponding UNAME. */
void
uid_to_uname (uid_t uid, char **uname)
if (uid != 0 && uid == cached_no_such_uid)
{
- *uname = strdup ("");
+ *uname = xstrdup ("");
return;
}
else
{
cached_no_such_uid = uid;
- *uname = strdup ("");
+ *uname = xstrdup ("");
return;
}
}
- *uname = strdup (cached_uname);
+ *uname = xstrdup (cached_uname);
}
/* Given GID, find the corresponding GNAME. */
if (gid != 0 && gid == cached_no_such_gid)
{
- *gname = strdup ("");
+ *gname = xstrdup ("");
return;
}
else
{
cached_no_such_gid = gid;
- *gname = strdup ("");
+ *gname = xstrdup ("");
return;
}
}
- *gname = strdup (cached_gname);
+ *gname = xstrdup (cached_gname);
}
/* Given UNAME, set the corresponding UID and return 1, or else, return 0. */
\f
/* Names from external name file. */
-static FILE *name_file; /* file to read names from */
static char *name_buffer; /* buffer to hold the current file name */
static size_t name_buffer_length; /* allocated length of name_buffer */
{
name_buffer = xmalloc (NAME_FIELD_SIZE + 2);
name_buffer_length = NAME_FIELD_SIZE;
-
- if (files_from_option)
- {
- if (!strcmp (files_from_option, "-"))
- {
- request_stdin ("-T");
- name_file = stdin;
- }
- else if (name_file = fopen (files_from_option, "r"), !name_file)
- open_fatal (files_from_option);
- }
}
void
free (name_array);
}
-/* Read the next filename from name_file and null-terminate it. Put
- it into name_buffer, reallocating and adjusting name_buffer_length
- if necessary. Return 0 at end of file, 1 otherwise. */
-static int
-read_name_from_file (void)
-{
- int character;
- size_t counter = 0;
-
- /* FIXME: getc may be called even if character was EOF the last time here. */
-
- /* FIXME: This + 2 allocation might serve no purpose. */
-
- while (character = getc (name_file),
- character != EOF && character != filename_terminator)
- {
- if (counter == name_buffer_length)
- {
- if (name_buffer_length * 2 < name_buffer_length)
- xalloc_die ();
- name_buffer_length *= 2;
- name_buffer = xrealloc (name_buffer, name_buffer_length + 2);
- }
- name_buffer[counter++] = character;
- }
-
- if (counter == 0 && character == EOF)
- return 0;
-
- if (counter == name_buffer_length)
- {
- if (name_buffer_length * 2 < name_buffer_length)
- xalloc_die ();
- name_buffer_length *= 2;
- name_buffer = xrealloc (name_buffer, name_buffer_length + 2);
- }
- name_buffer[counter] = '\0';
-
- return 1;
-}
-
/* Get the next name from ARGV or the file of names. Result is in
static storage and can't be relied upon across two calls.
if (filename_terminator == '\0')
change_dirs = 0;
- while (1)
+ while (name_index != names)
{
- /* Get a name, either from file or from saved arguments. */
-
- if (name_index == names)
+ size_t source_len;
+ source = name_array[name_index++];
+ source_len = strlen (source);
+ if (name_buffer_length < source_len)
{
- if (! name_file)
- break;
- if (! read_name_from_file ())
- break;
- }
- else
- {
- size_t source_len;
- source = name_array[name_index++];
- source_len = strlen (source);
- if (name_buffer_length < source_len)
+ do
{
- do
- {
- name_buffer_length *= 2;
- if (! name_buffer_length)
- xalloc_die ();
- }
- while (name_buffer_length < source_len);
-
- free (name_buffer);
- name_buffer = xmalloc (name_buffer_length + 2);
+ name_buffer_length *= 2;
+ if (! name_buffer_length)
+ xalloc_die ();
}
- strcpy (name_buffer, source);
+ while (name_buffer_length < source_len);
+
+ free (name_buffer);
+ name_buffer = xmalloc (name_buffer_length + 2);
}
+ strcpy (name_buffer, source);
/* Zap trailing slashes. */
chdir_flag = 1;
else
{
- unquote_string (name_buffer);
+ if (unquote_option)
+ unquote_string (name_buffer);
+ if (incremental_option)
+ register_individual_file (name_buffer);
return name_buffer;
}
}
- /* No more names in file. */
-
- if (name_file && chdir_flag)
- FATAL_ERROR ((0, 0, _("Missing file name after -C")));
-
return 0;
}
-/* Close the name file, if any. */
-void
-name_close (void)
-{
- if (name_file && name_file != stdin)
- if (fclose (name_file) != 0)
- close_error (name_buffer);
-}
-
/* Gather names in a list for scanning. Could hash them later if we
really care.
struct name *cursor = namelist;
if (!cursor)
- return ! files_from_option;
+ return 1;
if (cursor->fake)
{
chdir_do (cursor->change_dir);
namelist = 0;
nametail = &namelist;
- return ! files_from_option;
+ return 1;
}
cursor = namelist_match (file_name, length);
bool
excluded_name (char const *name)
{
- return excluded_filename (excluded, name + FILESYSTEM_PREFIX_LEN (name));
+ return excluded_filename (excluded, name + FILE_SYSTEM_PREFIX_LEN (name));
}
\f
/* Hash tables of strings. */
/* Calculate the hash of a string. */
-static unsigned
-hash_string_hasher (void const *name, unsigned n_buckets)
+static size_t
+hash_string_hasher (void const *name, size_t n_buckets)
{
return hash_string (name, n_buckets);
}
{
return hash_string_lookup (avoided_name_table, name);
}
+
\f
+static Hash_table *individual_file_table;
+
+static void
+register_individual_file (char const *name)
+{
+ struct stat st;
+
+ if (deref_stat (dereference_option, name, &st) != 0)
+ return; /* Will be complained about later */
+ if (S_ISDIR (st.st_mode))
+ return;
+
+ hash_string_insert (&individual_file_table, name);
+}
+
+bool
+is_individual_file (char const *name)
+{
+ return hash_string_lookup (individual_file_table, name);
+}
+
+\f
+
+static Hash_table *prefix_table[2];
+
+/* Return true if file names of some members in the archive were stripped off
+ their leading components. We could have used
+ return prefix_table[0] || prefix_table[1]
+ but the following seems to be safer: */
+bool
+removed_prefixes_p (void)
+{
+ return (prefix_table[0] && hash_get_n_entries (prefix_table[0]) != 0)
+ || (prefix_table[1] && hash_get_n_entries (prefix_table[1]) != 0);
+}
+
/* Return a safer suffix of FILE_NAME, or "." if it has no safer
suffix. Check for fully specified file names and other atrocities.
Warn the user if we do not return NAME. If LINK_TARGET is 1,
/* Skip file system prefixes, leading file name components that contain
"..", and leading slashes. */
- size_t prefix_len = FILESYSTEM_PREFIX_LEN (file_name);
+ size_t prefix_len = FILE_SYSTEM_PREFIX_LEN (file_name);
for (p = file_name + prefix_len; *p; )
{
if (prefix_len)
{
- static Hash_table *prefix_table[2];
char *prefix = alloca (prefix_len + 1);
memcpy (prefix, file_name, prefix_len);
prefix[prefix_len] = '\0';
N_("Removing leading `%s' from member names"),
N_("Removing leading `%s' from hard link targets")
};
- WARN ((0, 0, "%s", _(diagnostic[link_target]), prefix));
+ WARN ((0, 0, _(diagnostic[link_target]), prefix));
}
}
}
size_t
stripped_prefix_len (char const *file_name, size_t num)
{
- char const *p = file_name + FILESYSTEM_PREFIX_LEN (file_name);
+ char const *p = file_name + FILE_SYSTEM_PREFIX_LEN (file_name);
while (ISSLASH (*p))
p++;
while (*p)
bool
contains_dot_dot (char const *name)
{
- char const *p = name + FILESYSTEM_PREFIX_LEN (name);
+ char const *p = name + FILE_SYSTEM_PREFIX_LEN (name);
for (;; p++)
{
projects / chaz / tar / blobdiff