From bc9dc01ec379d8bb74dda3e805818f0c3227e616 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 3 Dec 1999 13:04:17 +0000 Subject: [PATCH] (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. --- src/names.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/names.c b/src/names.c index 8674ec9..89afe18 100644 --- 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) { -- 2.45.2