toybox: toys/posix/cp.c annotate

annotate toys/posix/cp.c @ 1714:0c8ef714cf03 draft

Patches from Elliott Hughes to fix various printf() format strings. (Don't specify the space flag when it's the default behavior. The ifconfig stuff was actual bugs.)

author	Rob Landley <rob@landley.net>
date	Sun, 01 Mar 2015 16:08:51 -0600
parents	dee053b7c775
children	5a00bc5e1c0f

rev	line source
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	1 /* Copyright 2008 Rob Landley <rob@landley.net>
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	2 *
656 6df4ccc0acbe Regularize command headers, update links to standards documents. Rob Landley <rob@landley.net> parents: 653 diff changeset	3 * See http://opengroup.org/onlinepubs/9699919799/utilities/cp.html
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	4 *
1388 c4f5f82adce6 Implement -HL for cp. Rob Landley <rob@landley.net> parents: 1196 diff changeset	5 * Posix says "cp -Rf dir file" shouldn't delete file, but our -f does.
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 656 diff changeset	6
1615 95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	7 // This is subtle: MV options shared with CP must be in same order (right to
95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	8 // left) as CP for FLAG_X macros to work out right.
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	9
1699 dee053b7c775 Add --remove-destination longopt for -F because the host version doesn't have a shortopt for it. Rob Landley <rob@landley.net> parents: 1633 diff changeset	10 USE_CP(NEWTOY(cp, "<2RHLPp"USE_CP_MORE("rdaslvnF(remove-destination)")"fi[-HLP"USE_CP_MORE("d")"]"USE_CP_MORE("[-ni]"), TOYFLAG_BIN))
1615 95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	11 USE_MV(NEWTOY(mv, "<2"USE_CP_MORE("vnF")"fi"USE_CP_MORE("[-ni]"), TOYFLAG_BIN))
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	12 USE_INSTALL(NEWTOY(install, "<1cdDpsvm:o:g:", TOYFLAG_USR\|TOYFLAG_BIN))
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	13 *
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	14
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	15 config CP
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	16 bool "cp"
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	17 default y
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	18 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	19 usage: cp [-fipRHLP] SOURCE... DEST
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	20
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	21 Copy files from SOURCE to DEST. If more than one SOURCE, DEST must
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	22 be a directory.
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	23
1455 70f5188b4848 Add cp -F to force delete of existing destination files, and make install command use that. Rob Landley <rob@landley.net> parents: 1438 diff changeset	24 -f delete destination files we can't write to
1699 dee053b7c775 Add --remove-destination longopt for -F because the host version doesn't have a shortopt for it. Rob Landley <rob@landley.net> parents: 1633 diff changeset	25 -F delete any existing destination file first (--remove-destination)
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	26 -i interactive, prompt before overwriting existing DEST
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	27 -p preserve timestamps, ownership, and permissions
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	28 -R recurse into subdirectories (DEST must be a directory)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	29 -H Follow symlinks listed on command line
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	30 -L Follow all symlinks
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	31 -P Do not follow symlinks [default]
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 656 diff changeset	32
7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 656 diff changeset	33 config CP_MORE
1196 37ea9dff9c27 Tweak help text. Rob Landley <rob@landley.net> parents: 1183 diff changeset	34 bool "cp -adlnrsv options"
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	35 default y
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	36 depends on CP
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	37 help
1196 37ea9dff9c27 Tweak help text. Rob Landley <rob@landley.net> parents: 1183 diff changeset	38 usage: cp [-adlnrsv]
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 656 diff changeset	39
785 50441fee583d Teach cp to do -n. Rob Landley <rob@landley.net> parents: 784 diff changeset	40 -a same as -dpr
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	41 -d don't dereference symlinks
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	42 -l hard link instead of copy
785 50441fee583d Teach cp to do -n. Rob Landley <rob@landley.net> parents: 784 diff changeset	43 -n no clobber (don't overwrite DEST)
50441fee583d Teach cp to do -n. Rob Landley <rob@landley.net> parents: 784 diff changeset	44 -r synonym for -R
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	45 -s symlink instead of copy
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	46 -v verbose
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	47
1615 95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	48 config MV
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	49 bool "mv"
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	50 default y
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	51 depends on CP
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	52 help
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	53 usage: mv [-fi] SOURCE... DEST"
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	54
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	55 -f force copy by deleting destination file
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	56 -i interactive, prompt before overwriting existing DEST
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	57
1615 95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	58 config MV_MORE
985 32644e4439bd Need to specify bool for CP_MV_MORE config symbol to avoid warnings. Rob Landley <rob@landley.net> parents: 932 diff changeset	59 bool
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	60 default y
1615 95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	61 depends on MV && CP_MORE
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	62 help
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	63 usage: mv [-vn]
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	64
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	65 -v verbose
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	66 -n no clobber (don't overwrite DEST)
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	67
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	68 config INSTALL
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	69 bool "install"
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	70 default y
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	71 depends on CP && CP_MORE
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	72 help
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	73 usage: install [-dDpsv] [-o USER] [-g GROUP] [-m MODE] [SOURCE...] DEST
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	74
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	75 Copy files and set attributes.
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	76
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	77 -d Act like mkdir -p
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	78 -D Create leading directories for DEST
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	79 -g Make copy belong to GROUP
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	80 -m Set permissions to MODE
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	81 -o Make copy belong to USER
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	82 -p Preserve timestamps
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	83 -s Call "strip -p"
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	84 -v Verbose
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	85 */
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	86
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 656 diff changeset	87 #define FOR_cp
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	88 #include "toys.h"
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	89
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 656 diff changeset	90 GLOBALS(
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	91 // install's options
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	92 char *group;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	93 char *user;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	94 char *mode;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	95
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	96 char *destname;
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	97 struct stat top;
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	98 int (callback)(struct dirtree try);
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	99 uid_t uid;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	100 gid_t gid;
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	101 )
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	102
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	103 // Callback from dirtree_read() for each file/directory under a source dir.
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	104
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	105 int cp_node(struct dirtree *try)
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	106 {
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	107 int fdout = -1, cfd = try->parent ? try->parent->extra : AT_FDCWD,
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	108 tfd = dirtree_parentfd(try);
784 d8b2f7706f82 Teach cp to do mknod. Rob Landley <rob@landley.net> parents: 783 diff changeset	109 unsigned flags = toys.optflags;
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	110 char catch = try->parent ? try->name : TT.destname, err = "%s";
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	111 struct stat cst;
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	112
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	113 if (!dirtree_notdotdot(try)) return 0;
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	114
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	115 // If returning from COMEAGAIN, jump straight to -p logic at end.
1404 ffc7f606ce5b Move DIRTREE_COMEAGAIN second callback up to when the filehandle is still open, and add dir->again variable to distinguish second call instead of checking for -1 filehandle. Rob Landley <rob@landley.net> parents: 1388 diff changeset	116 if (S_ISDIR(try->st.st_mode) && try->again) {
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	117 fdout = try->extra;
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	118 err = 0;
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	119 } else {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	120
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	121 // -d is only the same as -r for symlinks, not for directories
1518 4bfbd8b96f66 Various bugfixes (mostly resource leaks) from Ashwini Sharma's static analysis, plus occasional tweak by me while reviewing them. Rob Landley <rob@landley.net> parents: 1472 diff changeset	122 if (S_ISLNK(try->st.st_mode) && (flags & FLAG_d)) flags \|= FLAG_r;
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	123
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	124 // Detect recursive copies via repeated top node (cp -R .. .) or
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	125 // identical source/target (fun with hardlinks).
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	126 if ((TT.top.st_dev == try->st.st_dev && TT.top.st_ino == try->st.st_ino
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	127 && (catch = TT.destname))
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	128 \|\| (!fstatat(cfd, catch, &cst, 0) && cst.st_dev == try->st.st_dev
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	129 && cst.st_ino == try->st.st_ino))
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	130 {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	131 error_msg("'%s' is '%s'", catch, err = dirtree_path(try, 0));
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	132 free(err);
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	133
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	134 return 0;
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	135 }
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	136
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	137 // Handle -inv
497 da73bb464ce8 Implemented -i for cp Bryce Fricke parents: 435 diff changeset	138
798 16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	139 if (!faccessat(cfd, catch, F_OK, 0) && !S_ISDIR(cst.st_mode)) {
16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	140 char *s;
16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	141
16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	142 if (S_ISDIR(try->st.st_dev)) {
16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	143 error_msg("dir at '%s'", s = dirtree_path(try, 0));
16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	144 free(s);
802 aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	145 return 0;
1455 70f5188b4848 Add cp -F to force delete of existing destination files, and make install command use that. Rob Landley <rob@landley.net> parents: 1438 diff changeset	146 } else if ((flags & FLAG_F) && unlinkat(cfd, catch, 0)) {
70f5188b4848 Add cp -F to force delete of existing destination files, and make install command use that. Rob Landley <rob@landley.net> parents: 1438 diff changeset	147 error_msg("unlink '%s'", catch);
70f5188b4848 Add cp -F to force delete of existing destination files, and make install command use that. Rob Landley <rob@landley.net> parents: 1438 diff changeset	148 return 0;
798 16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	149 } else if (flags & FLAG_n) return 0;
16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	150 else if (flags & FLAG_i) {
1521 a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	151 fprintf(stderr, "%s: overwrite '%s'", toys.which->name,
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	152 s = dirtree_path(try, 0));
798 16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	153 free(s);
16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	154 if (!yesno("", 1)) return 0;
16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	155 }
16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	156 }
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	157
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	158 if (flags & FLAG_v) {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	159 char *s = dirtree_path(try, 0);
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	160 printf("%s '%s'\n", toys.which->name, s);
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	161 free(s);
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	162 }
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	163
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	164 // Loop for -f retry after unlink
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	165 do {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	166
790 6aa6efdd5883 Make "sudo cp -rp /dev/null blah" work. Still not happy with it, fchmodat(AT_SYMLINK_NOFOLLOW) doesn't work (there's a glibc bug open for this. It's really a missing kernel syscall, but glibc fails without ever making any syscall if you feed it that flag, which isn't helpful). Rob Landley <rob@landley.net> parents: 786 diff changeset	167 // directory, hardlink, symlink, mknod (char, block, fifo, socket), file
6aa6efdd5883 Make "sudo cp -rp /dev/null blah" work. Still not happy with it, fchmodat(AT_SYMLINK_NOFOLLOW) doesn't work (there's a glibc bug open for this. It's really a missing kernel syscall, but glibc fails without ever making any syscall if you feed it that flag, which isn't helpful). Rob Landley <rob@landley.net> parents: 786 diff changeset	168
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	169 // Copy directory
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	170
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	171 if (S_ISDIR(try->st.st_mode)) {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	172 struct stat st2;
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	173
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	174 if (!(flags & (FLAG_a\|FLAG_r\|FLAG_R))) {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	175 err = "Skipped dir '%s'";
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	176 catch = try->name;
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	177 break;
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	178 }
784 d8b2f7706f82 Teach cp to do mknod. Rob Landley <rob@landley.net> parents: 783 diff changeset	179
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	180 // Always make directory writeable to us, so we can create files in it.
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	181 //
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	182 // Yes, there's a race window between mkdir() and open() so it's
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	183 // possible that -p can be made to chown a directory other than the one
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	184 // we created. The closest we can do to closing this is make sure
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	185 // that what we open _is_ a directory rather than something else.
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	186
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	187 if (!mkdirat(cfd, catch, try->st.st_mode \| 0200) \|\| errno == EEXIST)
790 6aa6efdd5883 Make "sudo cp -rp /dev/null blah" work. Still not happy with it, fchmodat(AT_SYMLINK_NOFOLLOW) doesn't work (there's a glibc bug open for this. It's really a missing kernel syscall, but glibc fails without ever making any syscall if you feed it that flag, which isn't helpful). Rob Landley <rob@landley.net> parents: 786 diff changeset	188 if (-1 != (try->extra = openat(cfd, catch, O_NOFOLLOW)))
1388 c4f5f82adce6 Implement -HL for cp. Rob Landley <rob@landley.net> parents: 1196 diff changeset	189 if (!fstat(try->extra, &st2) && S_ISDIR(st2.st_mode))
c4f5f82adce6 Implement -HL for cp. Rob Landley <rob@landley.net> parents: 1196 diff changeset	190 return DIRTREE_COMEAGAIN
c4f5f82adce6 Implement -HL for cp. Rob Landley <rob@landley.net> parents: 1196 diff changeset	191 \| (DIRTREE_SYMFOLLOW*!!(toys.optflags&FLAG_L));
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	192
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	193 // Hardlink
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	194
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	195 } else if (flags & FLAG_l) {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	196 if (!linkat(tfd, try->name, cfd, catch, 0)) err = 0;
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	197
802 aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	198 // Copy tree as symlinks. For non-absolute paths this involves
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	199 // appending the right number of .. entries as you go down the tree.
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	200
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	201 } else if (flags & FLAG_s) {
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	202 char *s;
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	203 struct dirtree *or;
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	204 int dotdots = 0;
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	205
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	206 s = dirtree_path(try, 0);
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	207 for (or = try; or->parent; or = or->parent) dotdots++;
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	208
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	209 if (*or->name == '/') dotdots = 0;
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	210 if (dotdots) {
1714 0c8ef714cf03 Patches from Elliott Hughes to fix various printf() format strings. Rob Landley <rob@landley.net> parents: 1699 diff changeset	211 char s2 = xmprintf("%c%s", 3*dotdots, ' ', s);
802 aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	212 free(s);
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	213 s = s2;
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	214 while(dotdots--) {
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	215 memcpy(s2, "../", 3);
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	216 s2 += 3;
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	217 }
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	218 }
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	219 if (!symlinkat(s, cfd, catch)) {
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	220 err = 0;
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	221 fdout = AT_FDCWD;
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	222 }
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	223 free(s);
aad12ce05aae Implement cp -s option. Rob Landley <rob@landley.net> parents: 798 diff changeset	224
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	225 // Do something _other_ than copy contents of a file?
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	226 } else if (!S_ISREG(try->st.st_mode)
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	227 && (try->parent \|\| (flags & (FLAG_a\|FLAG_r))))
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	228 {
793 f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	229 int i;
f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	230
f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	231 // make symlink, or make block/char/fifo/socket
f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	232 if (S_ISLNK(try->st.st_mode)
f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	233 ? (0 < (i = readlinkat(tfd, try->name, toybuf, sizeof(toybuf))) &&
f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	234 sizeof(toybuf) > i && !symlinkat(toybuf, cfd, catch))
f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	235 : !mknodat(cfd, catch, try->st.st_mode, try->st.st_rdev))
f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	236 {
f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	237 err = 0;
f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	238 fdout = AT_FDCWD;
790 6aa6efdd5883 Make "sudo cp -rp /dev/null blah" work. Still not happy with it, fchmodat(AT_SYMLINK_NOFOLLOW) doesn't work (there's a glibc bug open for this. It's really a missing kernel syscall, but glibc fails without ever making any syscall if you feed it that flag, which isn't helpful). Rob Landley <rob@landley.net> parents: 786 diff changeset	239 }
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	240
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	241 // Copy contents of file.
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	242 } else {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	243 int fdin;
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	244
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	245 fdin = openat(tfd, try->name, O_RDONLY);
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	246 if (fdin < 0) {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	247 catch = try->name;
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	248 break;
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	249 } else {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	250 fdout = openat(cfd, catch, O_RDWR\|O_CREAT\|O_TRUNC, try->st.st_mode);
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	251 if (fdout >= 0) {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	252 xsendfile(fdin, fdout);
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	253 err = 0;
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	254 }
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	255 close(fdin);
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	256 }
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	257 }
798 16bcabb8cf97 Fix -in behavior: descend into existing directory without prompting, show full path in error messages, actually overwrite when answering yes to -i. Rob Landley <rob@landley.net> parents: 793 diff changeset	258 } while (err && (flags & (FLAG_f\|FLAG_n)) && !unlinkat(cfd, catch, 0));
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	259 }
282 a08f1affe016 Add -v to cp. Rob Landley <rob@landley.net> parents: 272 diff changeset	260
786 5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	261 if (fdout != -1) {
5bc258a4c750 Update -p and -f to apply properly to various conditions. Still some bugs to squeeze out but this gets the infrastructure mostly right (and does away with the remaining gotos). Rob Landley <rob@landley.net> parents: 785 diff changeset	262 if (flags & (FLAG_a\|FLAG_p)) {
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	263 struct timespec times[2];
1571 e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	264 int rc;
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	265
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	266 // Inability to set these isn't fatal, some require root access.
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	267
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	268 times[0] = try->st.st_atim;
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	269 times[1] = try->st.st_mtim;
790 6aa6efdd5883 Make "sudo cp -rp /dev/null blah" work. Still not happy with it, fchmodat(AT_SYMLINK_NOFOLLOW) doesn't work (there's a glibc bug open for this. It's really a missing kernel syscall, but glibc fails without ever making any syscall if you feed it that flag, which isn't helpful). Rob Landley <rob@landley.net> parents: 786 diff changeset	270
6aa6efdd5883 Make "sudo cp -rp /dev/null blah" work. Still not happy with it, fchmodat(AT_SYMLINK_NOFOLLOW) doesn't work (there's a glibc bug open for this. It's really a missing kernel syscall, but glibc fails without ever making any syscall if you feed it that flag, which isn't helpful). Rob Landley <rob@landley.net> parents: 786 diff changeset	271 // If we can't get a filehandle to the actual object, use racy functions
1571 e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	272 if (fdout == AT_FDCWD)
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	273 rc = fchownat(cfd, catch, try->st.st_uid, try->st.st_gid,
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	274 AT_SYMLINK_NOFOLLOW);
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	275 else rc = fchown(fdout, try->st.st_uid, try->st.st_gid);
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	276 if (rc) {
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	277 char *pp;
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	278
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	279 perror_msg("chown '%s'", pp = dirtree_path(try, 0));
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	280 free(pp);
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	281 }
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	282
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	283 // permission bits already correct for mknod and don't apply to symlink
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	284 if (fdout == AT_FDCWD) utimensat(cfd, catch, times, AT_SYMLINK_NOFOLLOW);
e85e5f3b87c2 As long as Android's going to require fortify, fixup the warnings it generates. Rob Landley <rob@landley.net> parents: 1522 diff changeset	285 else {
793 f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	286 futimens(fdout, times);
f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	287 fchmod(fdout, try->st.st_mode);
790 6aa6efdd5883 Make "sudo cp -rp /dev/null blah" work. Still not happy with it, fchmodat(AT_SYMLINK_NOFOLLOW) doesn't work (there's a glibc bug open for this. It's really a missing kernel syscall, but glibc fails without ever making any syscall if you feed it that flag, which isn't helpful). Rob Landley <rob@landley.net> parents: 786 diff changeset	288 }
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	289 }
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	290
790 6aa6efdd5883 Make "sudo cp -rp /dev/null blah" work. Still not happy with it, fchmodat(AT_SYMLINK_NOFOLLOW) doesn't work (there's a glibc bug open for this. It's really a missing kernel syscall, but glibc fails without ever making any syscall if you feed it that flag, which isn't helpful). Rob Landley <rob@landley.net> parents: 786 diff changeset	291 if (fdout != AT_FDCWD) xclose(fdout);
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	292
1615 95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	293 if (CFG_MV && toys.which->name[0] == 'm')
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	294 if (unlinkat(tfd, try->name, S_ISDIR(try->st.st_mode) ? AT_REMOVEDIR :0))
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	295 err = "%s";
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	296 }
263 7c53152a483b Make cp pass most of its test suite. Still need to add symlink support. Rob Landley <rob@landley.net> parents: 262 diff changeset	297
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	298 if (err) perror_msg(err, catch);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	299 return 0;
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	300 }
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	301
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	302 void cp_main(void)
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	303 {
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	304 char *destname = toys.optargs[--toys.optc];
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	305 int i, destdir = !stat(destname, &TT.top) && S_ISDIR(TT.top.st_mode);
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	306
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	307 if (toys.optc>1 && !destdir) error_exit("'%s' not directory", destname);
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	308 if (toys.which->name[0] == 'm') toys.optflags \|= FLAG_d\|FLAG_p\|FLAG_R;
793 f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	309 if (toys.optflags & (FLAG_a\|FLAG_p)) umask(0);
f8f5ddb6b69a Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag. Rob Landley <rob@landley.net> parents: 790 diff changeset	310
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	311 if (!TT.callback) TT.callback = cp_node;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	312
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	313 // Loop through sources
263 7c53152a483b Make cp pass most of its test suite. Still need to add symlink support. Rob Landley <rob@landley.net> parents: 262 diff changeset	314
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	315 for (i=0; i<toys.optc; i++) {
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	316 struct dirtree *new;
7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	317 char *src = toys.optargs[i];
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	318 int rc = 1;
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	319
1183 0752b2d58909 Rename xmsprintf() to just xmprintf(). Rob Landley <rob@landley.net> parents: 985 diff changeset	320 if (destdir) TT.destname = xmprintf("%s/%s", destname, basename(src));
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	321 else TT.destname = destname;
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	322
58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	323 errno = EXDEV;
1615 95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	324 if (CFG_MV && toys.which->name[0] == 'm') {
1521 a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	325 if (!(toys.optflags & FLAG_f)) {
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	326 struct stat st;
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	327
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	328 // Technically "is writeable" is more complicated (022 is not writeable
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	329 // by the owner, just everybody _else_) but I don't care.
1522 fc2200f927af Fix last night's mv commit (use dest, not source). Rob Landley <rob@landley.net> parents: 1521 diff changeset	330 if (!stat(TT.destname, &st)
1521 a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	331 && ((toys.optflags & FLAG_i) \|\| !(st.st_mode & 0222)))
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	332 {
1522 fc2200f927af Fix last night's mv commit (use dest, not source). Rob Landley <rob@landley.net> parents: 1521 diff changeset	333 fprintf(stderr, "%s: overwrite '%s'", toys.which->name, TT.destname);
1521 a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	334 if (!yesno("", 1)) rc = 0;
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	335 else unlink(src);
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	336 }
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	337 }
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	338
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	339 if (rc) rc = rename(src, TT.destname);
a8d9bf6ca8bd Implement mv -f and -i. Rob Landley <rob@landley.net> parents: 1518 diff changeset	340 }
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 656 diff changeset	341
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	342 // Skip nonexistent sources
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	343 if (rc) {
1388 c4f5f82adce6 Implement -HL for cp. Rob Landley <rob@landley.net> parents: 1196 diff changeset	344 int symfollow = toys.optflags & (FLAG_H\|FLAG_L);
c4f5f82adce6 Implement -HL for cp. Rob Landley <rob@landley.net> parents: 1196 diff changeset	345
c4f5f82adce6 Implement -HL for cp. Rob Landley <rob@landley.net> parents: 1196 diff changeset	346 if (errno != EXDEV \|\| !(new = dirtree_add_node(0, src, symfollow)))
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	347 perror_msg("bad '%s'", src);
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	348 else dirtree_handle_callback(new, TT.callback);
783 7bbb49149bb6 Adapt cp to updated dirtree code. Rob Landley <rob@landley.net> parents: 694 diff changeset	349 }
932 58b5263d63bf Implement mv as an extension of cp. Rob Landley <rob@landley.net> parents: 802 diff changeset	350 if (destdir) free(TT.destname);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	351 }
262 70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :) Rob Landley <rob@landley.net> parents: diff changeset	352 }
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	353
1615 95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	354 void mv_main(void)
95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	355 {
95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	356 cp_main();
95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	357 }
95b6ae6498fd Decouple cp and mv so mv uses its own --help text. Rob Landley <rob@landley.net> parents: 1571 diff changeset	358
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	359 #define CLEANUP_cp
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	360 #define FOR_install
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	361 #include <generated/flags.h>
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	362
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	363 static int install_node(struct dirtree *try)
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	364 {
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	365 if (TT.mode) try->st.st_mode = string_to_mode(TT.mode, try->st.st_mode);
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	366 if (TT.group) try->st.st_gid = TT.gid;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	367 if (TT.user) try->st.st_uid = TT.uid;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	368
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	369 // Always returns 0 because no -r
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	370 cp_node(try);
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	371
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	372 // No -r so always one level deep, so destname as set by cp_node() is correct
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	373 if (toys.optflags & FLAG_s)
1472 2f9bc9495144 Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout. Rob Landley <rob@landley.net> parents: 1455 diff changeset	374 if (xrun((char *[]){"strip", "-p", TT.destname, 0})) toys.exitval = 1;
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	375
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	376 return 0;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	377 }
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	378
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	379 void install_main(void)
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	380 {
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	381 char **ss;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	382 int flags = toys.optflags;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	383
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	384 if (flags & FLAG_d) {
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	385 for (ss = toys.optargs; *ss; ss++) {
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	386 if (mkpathat(AT_FDCWD, ss, 0777, 3)) perror_msg("%s", ss);
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	387 if (flags & FLAG_v) printf("%s\n", *ss);
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	388 }
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	389
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	390 return;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	391 }
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	392
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	393 if (toys.optflags & FLAG_D) {
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	394 if (mkpathat(AT_FDCWD, TT.destname, 0, 2))
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	395 perror_exit("-D '%s'", TT.destname);
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	396 if (toys.optc == 1) return;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	397 }
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	398 if (toys.optc < 2) error_exit("needs 2 args");
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	399
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	400 // Translate flags from install to cp
1455 70f5188b4848 Add cp -F to force delete of existing destination files, and make install command use that. Rob Landley <rob@landley.net> parents: 1438 diff changeset	401 toys.optflags = 4; // Force cp's FLAG_F
1438 7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	402 if (flags & FLAG_v) toys.optflags \|= 8; // cp's FLAG_v
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	403 if (flags & (FLAG_p\|FLAG_o\|FLAG_g)) toys.optflags \|= 512; // cp's FLAG_p
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	404
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	405 if (TT.user) TT.uid = xgetpwnam(TT.user)->pw_uid;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	406 if (TT.group) TT.gid = xgetgrnam(TT.group)->gr_gid;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	407
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	408 TT.callback = install_node;
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	409 cp_main();
7a3afbc7fc8b Add install to cp/mv. Rob Landley <rob@landley.net> parents: 1404 diff changeset	410 }

Mercurial > hg > toybox

annotate toys/posix/cp.c @ 1714:0c8ef714cf03 draft