From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/coreutils/cp.c | 167 +++++++++++++++++++----------- 1 file changed, 105 insertions(+), 62 deletions(-) (limited to 'release/src/router/busybox/coreutils/cp.c') diff --git a/release/src/router/busybox/coreutils/cp.c b/release/src/router/busybox/coreutils/cp.c index c5dd31ec..71a29396 100644 --- a/release/src/router/busybox/coreutils/cp.c +++ b/release/src/router/busybox/coreutils/cp.c @@ -3,25 +3,11 @@ * Mini cp implementation for busybox * * Copyright (C) 2000 by Matt Kraai + * SELinux support by Yuichi Nakamura * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * 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) @@ -29,21 +15,14 @@ * Size reduction. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "busybox.h" +#include "libbb.h" #include "libcoreutils/coreutils.h" -static const char cp_opts[] = "pdRfia"; /* WARNING!! ORDER IS IMPORTANT!! */ +/* This is a NOEXEC applet. Be very careful! */ + -extern 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; struct stat dest_stat; @@ -53,60 +32,124 @@ extern 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), + }; - /* Since these are enums, #if tests will not work. So use assert()s. */ - assert(FILEUTILS_PRESERVE_STATUS == 1); - assert(FILEUTILS_DEREFERENCE == 2); - assert(FILEUTILS_RECUR == 4); - assert(FILEUTILS_FORCE == 8); - assert(FILEUTILS_INTERACTIVE == 16); - - flags = bb_getopt_ulflags(argc, argv, cp_opts); - - if (flags & 32) { - flags |= (FILEUTILS_PRESERVE_STATUS | FILEUTILS_RECUR | FILEUTILS_DEREFERENCE); - } - - flags ^= FILEUTILS_DEREFERENCE; /* The sense of this flag was reversed. */ + // 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 = "-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 + */ - if (optind + 2 > argc) { - bb_show_usage(); +#if ENABLE_SELINUX + if (flags & FILEUTILS_PRESERVE_SECURITY_CONTEXT) { + selinux_or_die(); } +#endif 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) || ((d_flags = cp_mv_stat(last, &dest_stat)) < 0)) { - exit(EXIT_FAILURE); - } + (flags & FILEUTILS_DEREFERENCE) ? stat : lstat); + 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; - 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)); - DO_COPY: + 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 (1); + free((void*)dest); + } - exit(status); + /* Exit. We are NOEXEC, not NOFORK. We do exit at the end of main() */ + return status; } -- cgit v1.2.3-54-g00ecf