inetd: comment tweak. no code changes

[oweals/busybox.git] / coreutils / cp.c

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 78bd73c0f0a233a4e45da464d45dced88afbe1ed..71a29396f874630696d57ac24a8aab18f11e51b1 100644 (file)
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -21,7 +21,7 @@
 /* This is a NOEXEC applet. Be very careful! */
 
 
-int cp_main(int argc, char **argv);
+int cp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cp_main(int argc, char **argv)
 {
        struct stat source_stat;
@@ -37,20 +37,75 @@ int cp_main(int argc, char **argv)
                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),
        };
 
-       // Soft- and hardlinking don't mix
+       // Need at least two arguments
+       // Soft- and hardlinking doesn't mix
        // -P and -d are the same (-P is POSIX, -d is GNU)
        // -r and -R are the same
+       // -R (and therefore -r) turns on -d (coreutils does this)
        // -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 & OPT_L) ...
+       opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR:HL";
+       // -v (--verbose) is ignored
+       flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPHv");
+       /* Options of cp from GNU coreutils 6.10:
+        * -a, --archive
+        * -f, --force
+        * -i, --interactive
+        * -l, --link
+        * -L, --dereference
+        * -P, --no-dereference
+        * -R, -r, --recursive
+        * -s, --symbolic-link
+        * -v, --verbose
+        * -H   follow command-line symbolic links in SOURCE
+        * -d   same as --no-dereference --preserve=links
+        * -p   same as --preserve=mode,ownership,timestamps
+        * -c   same as --preserve=context
+        * NOT SUPPORTED IN BBOX:
+        * long options are not supported (even those above).
+        * --backup[=CONTROL]
+        *      make a backup of each existing destination file
+        * -b   like --backup but does not accept an argument
+        * --copy-contents
+        *      copy contents of special files when recursive
+        * --preserve[=ATTR_LIST]
+        *      preserve attributes (default: mode,ownership,timestamps),
+        *      if possible additional attributes: security context,links,all
+        * --no-preserve=ATTR_LIST
+        * --parents
+        *      use full source file name under DIRECTORY
+        * --remove-destination
+        *      remove  each existing destination file before attempting to open
+        * --sparse=WHEN
+        *      control creation of sparse files
+        * --strip-trailing-slashes
+        *      remove any trailing slashes from each SOURCE argument
+        * -S, --suffix=SUFFIX
+        *      override the usual backup suffix
+        * -t, --target-directory=DIRECTORY
+        *      copy all SOURCE arguments into DIRECTORY
+        * -T, --no-target-directory
+        *      treat DEST as a normal file
+        * -u, --update
+        *      copy only when the SOURCE file is newer than the destination
+        *      file or when the destination file is missing
+        * -x, --one-file-system
+        *      stay on this file system
+        * -Z, --context=CONTEXT
+        *      (SELinux) set SELinux security context of copy to CONTEXT
+        */
+       argc -= optind;
+       argv += optind;
+       flags ^= FILEUTILS_DEREFERENCE; /* the sense of this flag was reversed */
+       /* coreutils 6.9 compat:
+        * by default, "cp" derefs symlinks (creates regular dest files),
+        * but "cp -R" does not. We switch off deref if -r or -R (see above).
+        * However, "cp -RL" must still deref symlinks: */
+       if (flags & FILEUTILS_DEREF_SOFTLINK) /* -L */
+               flags |= FILEUTILS_DEREFERENCE;
+       /* The behavior of -H is *almost* like -L, but not quite, so let's
+        * just ignore it too for fun. TODO.
        if (flags & OPT_H) ... // deref command-line params only
        */
 
@@ -60,17 +115,9 @@ int cp_main(int argc, char **argv)
        }
 #endif
 
-       flags ^= FILEUTILS_DEREFERENCE;         /* The sense of this flag was reversed. */
-
-       if (optind + 2 > argc) {
-               bb_show_usage();
-       }
-
        last = argv[argc - 1];
-       argv += optind;
-
        /* If there are only two arguments and...  */
-       if (optind + 2 == argc) {
+       if (argc == 2) {
                s_flags = cp_mv_stat2(*argv, &source_stat,
                                      (flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
                if (s_flags < 0)
@@ -85,19 +132,24 @@ int cp_main(int argc, char **argv)
                        ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags)
                ) {
                        /* ...do a simple copy.  */
-                       dest = xstrdup(last);
-                       goto DO_COPY; /* Note: optind+2==argc implies argv[1]==last below. */
+                       dest = last;
+                       goto DO_COPY; /* NB: argc==2 -> *++argv==last */
                }
        }
 
-       do {
-               dest = concat_path_file(last, bb_get_last_path_component(*argv));
+       while (1) {
+               dest = concat_path_file(last, bb_get_last_path_component_strip(*argv));
  DO_COPY:
                if (copy_file(*argv, dest, flags) < 0) {
                        status = 1;
                }
+               if (*++argv == last) {
+                       /* possibly leaking dest... */
+                       break;
+               }
                free((void*)dest);
-       } while (*++argv != last);
+       }
 
+       /* Exit. We are NOEXEC, not NOFORK. We do exit at the end of main() */
        return status;
 }