diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-22 03:40:20 +0400 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-22 03:40:20 +0400 |
commit | f24e1f40e032e99cf57a05730e7632b825d3016d (patch) | |
tree | a6d0fa74d59e67d1570c54157f5ebcc47b4522d0 /coreutils/ln.c | |
parent | 8d73c35916cbae67f5d0269b128de40f9992ddc6 (diff) |
cp: add support for -s, -l. Fix free(nonmalloc) bug.
Add doc on POSIX's rules on -i and -f (insane!).
ln: make "ln dangling_symlink new_link" work.
Diffstat (limited to 'coreutils/ln.c')
-rw-r--r-- | coreutils/ln.c | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/coreutils/ln.c b/coreutils/ln.c index cd6e470be..231a3bf03 100644 --- a/coreutils/ln.c +++ b/coreutils/ln.c @@ -49,36 +49,39 @@ int ln_main(int argc, char **argv) src = last; if (is_directory(src, - (flag & LN_NODEREFERENCE) ^ LN_NODEREFERENCE, - NULL)) { + (flag & LN_NODEREFERENCE) ^ LN_NODEREFERENCE, + NULL)) { src_name = xstrdup(*argv); src = concat_path_file(src, bb_get_last_path_component(src_name)); free(src_name); src_name = src; } if (!(flag & LN_SYMLINK) && stat(*argv, &statbuf)) { - bb_perror_msg("%s", *argv); - status = EXIT_FAILURE; - free(src_name); - continue; + // coreutils: "ln dangling_symlink new_hardlink" works + if (lstat(*argv, &statbuf) || !S_ISLNK(statbuf.st_mode)) { + bb_perror_msg("%s", *argv); + status = EXIT_FAILURE; + free(src_name); + continue; + } } if (flag & LN_BACKUP) { - char *backup; - backup = xasprintf("%s%s", src, suffix); - if (rename(src, backup) < 0 && errno != ENOENT) { - bb_perror_msg("%s", src); - status = EXIT_FAILURE; - free(backup); - continue; - } + char *backup; + backup = xasprintf("%s%s", src, suffix); + if (rename(src, backup) < 0 && errno != ENOENT) { + bb_perror_msg("%s", src); + status = EXIT_FAILURE; free(backup); - /* - * When the source and dest are both hard links to the same - * inode, a rename may succeed even though nothing happened. - * Therefore, always unlink(). - */ - unlink(src); + continue; + } + free(backup); + /* + * When the source and dest are both hard links to the same + * inode, a rename may succeed even though nothing happened. + * Therefore, always unlink(). + */ + unlink(src); } else if (flag & LN_FORCE) { unlink(src); } |