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.

1 files changed, 27 insertions, 45 deletions

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 <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <utime.h>
-#include <errno.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <assert.h>
 #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;
 }