Mercurial > hg > toybox

annotate toys/posix/cp.c @ 793:f8f5ddb6b69a 0.4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust umask(0) for cp -p so mknod doesn't have to try to fchmodat() without the unsupported symlink nofollow flag.
author Rob Landley <rob@landley.net>
date Fri, 18 Jan 2013 06:03:00 -0600
parents 6aa6efdd5883
children 16bcabb8cf97
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 *
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
5 * TODO: sHLP
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
785
50441fee583d Teach cp to do -n.
Rob Landley <rob@landley.net>
parents: 784
diff changeset
7 USE_CP(NEWTOY(cp, "<2"USE_CP_MORE("rdavsln")"RHLPfip[-ni]", TOYFLAG_BIN))
262
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
8
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
9 config CP
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
10 bool "cp"
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
11 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
12 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
13 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
14
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
15 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
16 be a directory.
262
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
17
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 -f force copy by deleting destination file
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 -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
20 -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
21 -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
22 -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
23 -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
24 -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
25
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
26 config CP_MORE
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
27 bool "cp -rdavsl options"
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 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
29 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
30 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
31 usage: cp [-rdavsl]
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
785
50441fee583d Teach cp to do -n.
Rob Landley <rob@landley.net>
parents: 784
diff changeset
33 -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
34 -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
35 -l hard link instead of copy
785
50441fee583d Teach cp to do -n.
Rob Landley <rob@landley.net>
parents: 784
diff changeset
36 -n no clobber (don't overwrite DEST)
50441fee583d Teach cp to do -n.
Rob Landley <rob@landley.net>
parents: 784
diff changeset
37 -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
38 -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
39 -v verbose
262
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
40 */
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
41
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
42 #define FOR_cp
262
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
43 #include "toys.h"
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
44
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
45 // TODO: PLHlsd
262
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
46
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
47 GLOBALS(
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
48 char *destname;
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
49 struct stat top;
262
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
50 )
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
51
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
52 // 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
53
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
54 int cp_node(struct dirtree *try)
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
55 {
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
56 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
57 tfd = dirtree_parentfd(try);
784
d8b2f7706f82 Teach cp to do mknod.
Rob Landley <rob@landley.net>
parents: 783
diff changeset
58 unsigned flags = toys.optflags;
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
59 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
60 struct stat cst;
262
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
61
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
62 if (!dirtree_notdotdot(try)) return 0;
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
63
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
64 // If returning from COMEAGAIN, jump straight to -p logic at end.
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
65 if (S_ISDIR(try->st.st_mode) && try->data == -1) {
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
66 fdout = try->extra;
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
67 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
68 } 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
69
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
70 // -d is only the same as -r for symlinks, not for directories
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
71 if (S_ISLNK(try->st.st_mode) & (flags & FLAG_d)) flags |= 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
72
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
73 // 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
74 // 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
75 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
76 && (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
77 || (!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
78 && 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
79 {
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
80 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
81 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
82
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
83 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
84 }
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
85
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
86 // Handle -inv
497
da73bb464ce8 Implemented -i for cp
Bryce Fricke
parents: 435
diff changeset
87
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
88 if ((flags & (FLAG_i|FLAG_n)) && !faccessat(cfd, catch, R_OK, 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
89 if ((flags & FLAG_n) || !yesno("cp: overwrite", 1)) 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
90
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
91 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
92 char *s = 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
93 printf("cp '%s'\n", 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
94 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
95 }
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
96
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
97 // 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
98 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
99
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
100 // 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
101
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
102 // 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
103
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
104 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
105 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
106
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 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
108 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
109 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
110 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
111 }
784
d8b2f7706f82 Teach cp to do mknod.
Rob Landley <rob@landley.net>
parents: 783
diff changeset
112
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
113 // 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
114 //
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
115 // 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
116 // 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
117 // 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
118 // 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
119
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 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
121 if (-1 != (try->extra = openat(cfd, catch, O_NOFOLLOW)))
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
122 if (!fstat(try->extra, &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
123 if (S_ISDIR(st2.st_mode)) return DIRTREE_COMEAGAIN;
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
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 // 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
126
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 } 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
128 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
129
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
130 // 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
131 } 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
132 && (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
133 {
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
134 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
135
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
136 // 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
137 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
138 ? (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
139 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
140 : !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
141 {
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
142 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
143 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
144 }
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
145
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
146 // 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
147 } 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
148 int fdin;
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
149
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
150 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
151 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
152 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
153 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
154 } 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
155 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
156 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
157 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
158 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
159 }
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
160 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
161 }
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 } while (err && (flags & FLAG_f) && !unlinkat(cfd, catch, 0));
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
164 }
282
a08f1affe016 Add -v to cp.
Rob Landley <rob@landley.net>
parents: 272
diff changeset
165
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
166 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
167 if (flags & (FLAG_a|FLAG_p)) {
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
168 struct timespec times[2];
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
169
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
170 // 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
171
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
172 times[0] = try->st.st_atim;
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
173 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
174
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
175 // If we can't get a filehandle to the actual object, use racy functions
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
176 if (fdout == AT_FDCWD) {
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
177 fchownat(cfd, catch, try->st.st_uid, try->st.st_gid,
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
178 AT_SYMLINK_NOFOLLOW);
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
179 utimensat(cfd, catch, times, AT_SYMLINK_NOFOLLOW);
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
180 // permission bits already correct for mknod, don't apply to symlink
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
181 } 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
182 fchown(fdout, try->st.st_uid, try->st.st_gid);
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
183 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
184 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
185 }
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
186 }
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
187
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 (fdout != AT_FDCWD) xclose(fdout);
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
189 }
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
190
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
191 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
192 return 0;
262
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
193 }
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
194
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
195 void cp_main(void)
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
196 {
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
197 char *destname = toys.optargs[--toys.optc];
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
198 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
199
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
200 if (toys.optc>1 && !destdir) error_exit("'%s' not directory", destname);
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
201
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
202 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
203
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
204 // 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
205
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
206 for (i=0; i<toys.optc; i++) {
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
207 struct dirtree *new;
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
208 char *src = toys.optargs[i];
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
209
783
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
210 // Skip nonexistent sources
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
211 if (!(new = dirtree_add_node(0, src, !(toys.optflags & (FLAG_d|FLAG_a)))))
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
212 perror_msg("bad '%s'", src);
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
213 else {
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
214 if (destdir) TT.destname = xmsprintf("%s/%s", destname, basename(src));
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
215 else TT.destname = destname;
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
216 dirtree_handle_callback(new, cp_node);
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
217 if (destdir) free(TT.destname);
7bbb49149bb6 Adapt cp to updated dirtree code.
Rob Landley <rob@landley.net>
parents: 694
diff changeset
218 }
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
219 }
262
70f36d9c5387 Add first pass at cp, totally untested, unlikely to work yet. :)
Rob Landley <rob@landley.net>
parents:
diff changeset
220 }