From 32d83cf58764a4b1fad847675989c4bc9eacd8c4 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 14 Sep 2006 10:06:42 +0000 Subject: * src/mv.c (main): Remove unnecessary (always-true) test for 2 <= n. Instead, since it's a little fragile, assert the condition. (target_directory_operand): Update comment to reflect latest change. --- ChangeLog | 6 ++++++ src/mv.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 956aab0e1..f5cc129a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-09-14 Jim Meyering + + * src/mv.c (main): Remove unnecessary (always-true) test for 2 <= n. + Instead, since it's a little fragile, assert the condition. + (target_directory_operand): Update comment to reflect latest change. + 2006-09-12 Paul Eggert * src/who.c (print_user): Rewrite to avoid warning from diff --git a/src/mv.c b/src/mv.c index ffc86d186..299a6acfd 100644 --- a/src/mv.c +++ b/src/mv.c @@ -140,9 +140,8 @@ cp_option_init (struct cp_options *x) } /* FILE is the last operand of this command. Return true if FILE is a - directory. But report an error there is a problem accessing FILE, - or if FILE does not exist but would have to refer to an existing - directory if it referred to anything at all. */ + directory. But report an error if there is a problem accessing FILE, other + than nonexistence (errno == ENOENT). */ static bool target_directory_operand (char const *file) @@ -447,7 +446,8 @@ main (int argc, char **argv) } else if (!target_directory) { - if (2 <= n_files && target_directory_operand (file[n_files - 1])) + assert (2 <= n_files); + if (target_directory_operand (file[n_files - 1])) target_directory = file[--n_files]; else if (2 < n_files) error (EXIT_FAILURE, 0, _("target %s is not a directory"), -- cgit v1.2.3-70-g09d2