(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.
This commit is contained in:
Paul Eggert
1999-12-03 13:04:17 +00:00
parent 3495d84e27
commit bc9dc01ec3

View File

@@ -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)
{