(name_next): If file names are given both in the

command line (e.g. via -C) and in a file (via -T), do not
ignore the command-line names.

diff --git a/src/names.c b/src/names.c
index 8674ec92613c052eb46d6bd4d76cd2cbe4eeb5ab..89afe185ce7fc81e17bab9860e9dd18309318424 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -344,16 +344,15 @@ name_next (int change_dirs)
     {
       /* Get a name, either from file or from saved arguments.  */
 
-      if (name_file)
+      if (name_index == names)
        {
-         if (!read_name_from_file ())
+         if (! name_file)
+           break;
+         if (! read_name_from_file ())
            break;
        }
       else
        {
-         if (name_index == names)
-           break;
-
          source = name_array[name_index++];
          if (strlen (source) > name_buffer_length)
            {