1
0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-20 18:56:39 +02:00

Further fix for -d regression.

This commit is contained in:
Paul Eggert
2004-08-11 23:41:44 +00:00
parent 312acd2aad
commit f469551274
2 changed files with 3 additions and 2 deletions

View File

@@ -325,7 +325,7 @@ main (int argc, char **argv)
n_files = argc - optind;
file = argv + optind;
if (n_files <= !(dir_arg || target_directory))
if (n_files <= ! (dir_arg || target_directory))
{
if (n_files <= 0)
error (0, 0, _("missing file operand"));
@@ -347,7 +347,7 @@ main (int argc, char **argv)
usage (EXIT_FAILURE);
}
}
else if (!target_directory)
else if (! (dir_arg || target_directory))
{
if (2 <= n_files && target_directory_operand (file[n_files - 1]))
target_directory = file[--n_files];

View File

@@ -61,5 +61,6 @@ test "$1" = -r-xr-xr-x || fail=1
# These failed in coreutils CVS from 2004-06-25 to 2004-08-11.
ginstall -d . || fail=1
ginstall -d newdir || fail=1
ginstall -d newdir1 newdir2 newdir3 || fail=1
(exit $fail); exit $fail