#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;
are being read.
*/
static const char *
-file_list_name ()
+file_list_name (void)
{
struct name_elt *elt;
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"),
ent->v.file.term = 0;
/* fall through */
case file_list_success:
+ if (unquote_option)
+ unquote_string (name_buffer);
if (handle_option (name_buffer) == 0)
{
name_list_adjust ();
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;
+ recursion_option = matching_flags & FNM_LEADING_DIR;
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);