#include <hash.h>
#include <quotearg.h>
#include <wordsplit.h>
+#include <argp.h>
#include "common.h"
\f
int matching_flags;/* fnmatch options if type == NELT_FMASK */
struct /* File, if type == NELT_FILE */
{
- const char *name;/* File name */
+ const char *name;/* File name */
int term; /* File name terminator in the list */
FILE *fp;
} file;
struct file_id_list *next;
ino_t ino;
dev_t dev;
+ const char *from_file;
};
static struct file_id_list *file_id_list;
+/* Return the name of the file from which the file names and options
+ are being read.
+*/
+static const char *
+file_list_name (void)
+{
+ struct name_elt *elt;
+
+ for (elt = name_head; elt; elt = elt->next)
+ if (elt->type == NELT_FILE && elt->v.file.fp)
+ return elt->v.file.name;
+ return _("command line");
+}
+
static int
add_file_id (const char *filename)
{
struct file_id_list *p;
struct stat st;
+ const char *reading_from;
if (stat (filename, &st))
stat_fatal (filename);
+ reading_from = file_list_name ();
for (p = file_id_list; p; p = p->next)
if (p->ino == st.st_ino && p->dev == st.st_dev)
{
- ERROR ((0, 0, _("%s: file list already read"),
- quotearg_colon (filename)));
+ int oldc = set_char_quoting (NULL, ':', 1);
+ ERROR ((0, 0,
+ _("%s: file list requested from %s already read from %s"),
+ quotearg_n (0, filename),
+ reading_from, p->from_file));
+ set_char_quoting (NULL, ':', oldc);
return 1;
}
p = xmalloc (sizeof *p);
p->next = file_id_list;
p->ino = st.st_ino;
p->dev = st.st_dev;
+ p->from_file = reading_from;
file_id_list = p;
return 0;
}
size_t counter = 0;
FILE *fp = ent->v.file.fp;
int term = ent->v.file.term;
-
+
for (c = getc (fp); c != EOF && c != term; c = getc (fp))
{
if (counter == name_buffer_length)
{
struct wordsplit ws;
int i;
-
+
while (*str && isspace (*str))
;
if (*str != '-')
more_options (ws.ws_wordc+ws.ws_offs, ws.ws_wordv);
for (i = 0; i < ws.ws_wordc+ws.ws_offs; i++)
ws.ws_wordv[i] = NULL;
-
+
wordsplit_free (&ws);
return 0;
}
open_fatal (ent->v.file.name);
}
}
-
+
while (1)
{
switch (read_name_from_file (ent))
{
case file_list_skip:
continue;
-
+
case file_list_zero:
WARNOPT (WARN_FILENAME_WITH_NULS,
(0, 0, N_("%s: file name read contains nul character"),
ret->type = NELT_NAME;
ret->v.name = name_buffer;
return 0;
-
+
case file_list_end:
if (strcmp (ent->v.file.name, "-"))
fclose (ent->v.file.fp);
return 1;
}
}
-}
+}
\f
static void
copy_name (struct name_elt *ep)
case NELT_NOOP:
name_list_advance ();
break;
-
+
case NELT_FMASK:
matching_flags = ep->v.matching_flags;
name_list_advance ();
continue;
-
+
case NELT_FILE:
if (read_next_name (ep, &entry) == 0)
return &entry;
continue;
-
+
case NELT_CHDIR:
if (change_dirs)
{
- copy_name (ep);
- if (chdir (name_buffer) < 0)
- chdir_fatal (name_buffer);
+ chdir_do (chdir_arg (xstrdup (ep->v.name)));
name_list_advance ();
break;
}
- /* fall trhough */
+ /* fall through */
case NELT_NAME:
copy_name (ep);
if (unquote_option)
namelist = merge_sort (namelist, num_names, compare_names);
num_names = 0;
- nametab = hash_initialize (0, 0,
- name_hash,
- name_compare, NULL);
+ nametab = hash_initialize (0, 0, name_hash, name_compare, NULL);
for (name = namelist; name; name = next_name)
{
next_name = name->next;
- name->caname = normalize_filename (name->name);
+ name->caname = normalize_filename (name->change_dir, name->name);
if (prev_name)
{
struct name *p = hash_lookup (nametab, name);