+ allocated_names = 10;
+ name_array = xmalloc (sizeof (const char *) * allocated_names);
+ names = 0;
+}
+
+/* Add NAME at end of name_array, reallocating it as necessary. */
+void
+name_add (const char *name)
+{
+ if (names == allocated_names)
+ {
+ allocated_names *= 2;
+ name_array =
+ xrealloc (name_array, sizeof (const char *) * allocated_names);
+ }
+ name_array[names++] = name;
+}
+\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 */
+
+/* FIXME: I should better check more closely. It seems at first glance that
+ is_pattern is only used when reading a file, and ignored for all
+ command line arguments. */
+
+static inline int
+is_pattern (const char *string)
+{
+ return strchr (string, '*') || strchr (string, '[') || strchr (string, '?');
+}
+
+/* Set up to gather file names for tar. They can either come from a
+ file or were saved from decoding arguments. */
+void
+name_init (int argc, char *const *argv)
+{
+ 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
+name_term (void)
+{
+ free (name_buffer);
+ 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)
+ {
+ name_buffer_length += NAME_FIELD_SIZE;
+ 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)
+ {
+ name_buffer_length += NAME_FIELD_SIZE;
+ 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 CHANGE_DIRS is true, treat a filename of the form "-C" as
+ meaning that the next filename is the name of a directory to change
+ to. If filename_terminator is NUL, CHANGE_DIRS is effectively
+ always false. */
+char *
+name_next (int change_dirs)
+{
+ const char *source;
+ char *cursor;
+ int chdir_flag = 0;
+
+ if (filename_terminator == '\0')
+ change_dirs = 0;
+
+ while (1)
+ {
+ /* Get a name, either from file or from saved arguments. */
+
+ if (name_index == names)
+ {
+ if (! name_file)
+ break;
+ if (! read_name_from_file ())
+ break;
+ }
+ else
+ {
+ source = name_array[name_index++];
+ if (strlen (source) > name_buffer_length)
+ {
+ free (name_buffer);
+ name_buffer_length = strlen (source);
+ name_buffer = xmalloc (name_buffer_length + 2);
+ }
+ strcpy (name_buffer, source);
+ }
+
+ /* Zap trailing slashes. */
+
+ cursor = name_buffer + strlen (name_buffer) - 1;
+ while (cursor > name_buffer && ISSLASH (*cursor))
+ *cursor-- = '\0';
+
+ if (chdir_flag)
+ {
+ if (chdir (name_buffer) < 0)
+ chdir_fatal (name_buffer);
+ chdir_flag = 0;
+ }
+ else if (change_dirs && strcmp (name_buffer, "-C") == 0)
+ chdir_flag = 1;
+ else
+ {
+ unquote_string (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.
+
+ If the names are already sorted to match the archive, we just read
+ them one by one. name_gather reads the first one, and it is called
+ by name_match as appropriate to read the next ones. At EOF, the
+ last name read is just left in the buffer. This option lets users
+ of small machines extract an arbitrary number of files by doing
+ "tar t" and editing down the list of files. */
+
+void
+name_gather (void)
+{
+ /* Buffer able to hold a single name. */
+ static struct name *buffer;
+ static size_t allocated_length;
+
+ char const *name;
+
+ if (same_order_option)
+ {
+ static int change_dir;
+
+ if (allocated_length == 0)
+ {
+ allocated_length = sizeof (struct name) + NAME_FIELD_SIZE;
+ buffer = xmalloc (allocated_length);
+ /* FIXME: This memset is overkill, and ugly... */
+ memset (buffer, 0, allocated_length);
+ }
+
+ while ((name = name_next (0)) && strcmp (name, "-C") == 0)
+ {
+ char const *dir = name_next (0);
+ if (! dir)
+ FATAL_ERROR ((0, 0, _("Missing file name after -C")));
+ change_dir = chdir_arg (xstrdup (dir));
+ }
+
+ if (name)
+ {
+ buffer->length = strlen (name);
+ if (sizeof (struct name) + buffer->length >= allocated_length)
+ {
+ allocated_length = sizeof (struct name) + buffer->length;
+ buffer = xrealloc (buffer, allocated_length);
+ }
+ buffer->change_dir = change_dir;
+ memcpy (buffer->name, name, buffer->length + 1);
+ buffer->next = 0;
+ buffer->found = 0;
+
+ namelist = buffer;
+ nametail = &namelist->next;
+ }
+ }
+ else
+ {
+ /* Non sorted names -- read them all in. */
+ int change_dir = 0;