From f24e1f40e032e99cf57a05730e7632b825d3016d Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 21 Oct 2006 23:40:20 +0000 Subject: 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. --- coreutils/cp.c | 72 ++++++++++++++----------------------- coreutils/libcoreutils/cp_mv_stat.c | 4 +-- coreutils/ln.c | 43 +++++++++++----------- coreutils/mv.c | 13 +++---- 4 files changed, 58 insertions(+), 74 deletions(-) (limited to 'coreutils') diff --git a/coreutils/cp.c b/coreutils/cp.c index fabfe58e0..47ad85ecf 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c @@ -7,8 +7,6 @@ * Licensed under GPL v2 or later, see file LICENSE in this tarball for details. */ -/* BB_AUDIT SUSv3 defects - unsupported options -H, -L, and -P. */ -/* BB_AUDIT GNU defects - only extension options supported are -a and -d. */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/cp.html */ /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) @@ -16,15 +14,6 @@ * Size reduction. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "busybox.h" #include "libcoreutils/coreutils.h" @@ -38,31 +27,26 @@ int cp_main(int argc, char **argv) int d_flags; int flags; int status = 0; + enum { + OPT_a = 1 << (sizeof(FILEUTILS_CP_OPTSTR)-1), + OPT_r = 1 << (sizeof(FILEUTILS_CP_OPTSTR)), + OPT_P = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+1), + OPT_H = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2), + OPT_L = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+3), + }; - flags = getopt32(argc, argv, "pdRfiarPHL"); - - if (flags & 32) { - flags |= (FILEUTILS_PRESERVE_STATUS | FILEUTILS_RECUR | FILEUTILS_DEREFERENCE); - } - if (flags & 64) { - /* Make -r a synonym for -R, - * -r was marked as obsolete in SUSv3, but is included for compatibility - */ - flags |= FILEUTILS_RECUR; - } - if (flags & 128) { - /* Make -P a synonym for -d, - * -d is the GNU option while -P is the POSIX 2003 option - */ - flags |= FILEUTILS_DEREFERENCE; - } + // Soft- and hardlinking don't mix + // -P and -d are the same (-P is POSIX, -d is GNU) + // -r and -R are the same + // -a = -pdR + opt_complementary = "?:l--s:s--l:Pd:rR:apdR"; + flags = getopt32(argc, argv, FILEUTILS_CP_OPTSTR "arPHL"); /* Default behavior of cp is to dereference, so we don't have to do * anything special when we are given -L. * The behavior of -H is *almost* like -L, but not quite, so let's * just ignore it too for fun. - if (flags & 256 || flags & 512) { - ; - } + if (flags & OPT_L) ... + if (flags & OPT_H) ... // deref command-line params only */ flags ^= FILEUTILS_DEREFERENCE; /* The sense of this flag was reversed. */ @@ -78,33 +62,31 @@ int cp_main(int argc, char **argv) if (optind + 2 == argc) { s_flags = cp_mv_stat2(*argv, &source_stat, (flags & FILEUTILS_DEREFERENCE) ? stat : lstat); - if ((s_flags < 0) || ((d_flags = cp_mv_stat(last, &dest_stat)) < 0)) { - exit(EXIT_FAILURE); - } + if (s_flags < 0) + return EXIT_FAILURE; + d_flags = cp_mv_stat(last, &dest_stat); + if (d_flags < 0) + return EXIT_FAILURE; + /* ...if neither is a directory or... */ if ( !((s_flags | d_flags) & 2) || /* ...recursing, the 1st is a directory, and the 2nd doesn't exist... */ - /* ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags) */ - /* Simplify the above since FILEUTILS_RECUR >> 1 == 2. */ - ((((flags & FILEUTILS_RECUR) >> 1) & s_flags) && !d_flags) + ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags) ) { /* ...do a simple copy. */ - dest = last; + dest = xstrdup(last); goto DO_COPY; /* Note: optind+2==argc implies argv[1]==last below. */ } } do { dest = concat_path_file(last, bb_get_last_path_component(*argv)); - DO_COPY: + DO_COPY: if (copy_file(*argv, dest, flags) < 0) { status = 1; } - if (*++argv == last) { - break; - } - free((void *) dest); - } while (1); + free((void*)dest); + } while (*++argv != last); - exit(status); + return status; } diff --git a/coreutils/libcoreutils/cp_mv_stat.c b/coreutils/libcoreutils/cp_mv_stat.c index d401bcc75..0849ebc6c 100644 --- a/coreutils/libcoreutils/cp_mv_stat.c +++ b/coreutils/libcoreutils/cp_mv_stat.c @@ -20,8 +20,6 @@ * */ -#include -#include #include "libbb.h" #include "coreutils.h" @@ -29,7 +27,7 @@ int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf) { if (sf(fn, fn_stat) < 0) { if (errno != ENOENT) { - bb_perror_msg("unable to stat `%s'", fn); + bb_perror_msg("unable to stat '%s'", fn); return -1; } return 0; 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); } diff --git a/coreutils/mv.c b/coreutils/mv.c index 770b42417..52ddd9fb7 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c @@ -57,7 +57,8 @@ int mv_main(int argc, char **argv) argv += optind; if (optind + 2 == argc) { - if ((dest_exists = cp_mv_stat(last, &dest_stat)) < 0) { + dest_exists = cp_mv_stat(last, &dest_stat); + if (dest_exists < 0) { return 1; } @@ -69,8 +70,8 @@ int mv_main(int argc, char **argv) do { dest = concat_path_file(last, bb_get_last_path_component(*argv)); - - if ((dest_exists = cp_mv_stat(dest, &dest_stat)) < 0) { + dest_exists = cp_mv_stat(dest, &dest_stat); + if (dest_exists < 0) { goto RET_1; } @@ -79,7 +80,7 @@ DO_MOVE: if (dest_exists && !(flags & OPT_FILEUTILS_FORCE) && ((access(dest, W_OK) < 0 && isatty(0)) || (flags & OPT_FILEUTILS_INTERACTIVE))) { - if (fprintf(stderr, "mv: overwrite `%s'? ", dest) < 0) { + if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) { goto RET_1; /* Ouch! fprintf failed! */ } if (!bb_ask_confirmation()) { @@ -92,7 +93,7 @@ DO_MOVE: if (errno != EXDEV || (source_exists = cp_mv_stat(*argv, &source_stat)) < 1) { - bb_perror_msg("unable to rename `%s'", *argv); + bb_perror_msg("cannot rename '%s'", *argv); } else { if (dest_exists) { if (dest_exists == 3) { @@ -107,7 +108,7 @@ DO_MOVE: } } if (unlink(dest) < 0) { - bb_perror_msg("cannot remove `%s'", dest); + bb_perror_msg("cannot remove '%s'", dest); goto RET_1; } } -- cgit v1.2.3