diff options
author | Pádraig Brady <P@draigBrady.com> | 2014-01-17 03:54:29 +0000 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2014-01-17 11:52:42 +0000 |
commit | 7fa1641db049912f59654153d077953714720ca2 (patch) | |
tree | b9bf1910a6fa9f1ad26fb5d324455a0aa53b83a9 /src | |
parent | 745de6dca52ef32cdaf9c459414b53d8a48459c3 (diff) | |
download | coreutils-7fa1641db049912f59654153d077953714720ca2.tar.xz |
ln: fix replacing symbolic links whose targets can't exist
* src/ln.c (errno_nonexisting): A new function to determine if
the errno implies that a file doesn't or can't (currently) exist.
(target_directory_operand): Use the new function to expand the
set of errors we handle.
* tests/ln/sf-1.sh: Add test cases for the newly handled errors.
* THANKS.in: Mention the reporter.
* NEWS: Mention the bug fix.
Diffstat (limited to 'src')
-rw-r--r-- | src/ln.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -103,8 +103,18 @@ static struct option const long_options[] = {NULL, 0, NULL, 0} }; +/* Return true when the passed ERR implies + that a file does not or could not exist. */ + +static bool +errno_nonexisting (int err) +{ + return err == ENOENT || err == ENAMETOOLONG || err == ENOTDIR || err == ELOOP; +} + + /* 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, + directory. But report an error if 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. */ @@ -119,7 +129,7 @@ target_directory_operand (char const *file) (dereference_dest_dir_symlinks ? stat (file, &st) : lstat (file, &st)); int err = (stat_result == 0 ? 0 : errno); bool is_a_dir = !err && S_ISDIR (st.st_mode); - if (err && err != ENOENT) + if (err && ! errno_nonexisting (errno)) error (EXIT_FAILURE, err, _("failed to access %s"), quote (file)); if (is_a_dir < looks_like_a_dir) error (EXIT_FAILURE, err, _("target %s is not a directory"), quote (file)); |