diff options
| author | Denys Vlasenko | 2021-06-03 20:26:30 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2021-06-03 20:26:30 +0200 |
| commit | b1a2762ecfe3d0f7c953abe4c48eb0582303c197 (patch) | |
| tree | b84044589060468a57bb0dc42daf5a3dc3d8e7a0 | |
| parent | 327b9f88486e67ade875780ea06dc8031fd70a49 (diff) | |
| download | busybox-b1a2762ecfe3d0f7c953abe4c48eb0582303c197.zip busybox-b1a2762ecfe3d0f7c953abe4c48eb0582303c197.tar.gz | |
cpio: fix "cpio -d -p A/B/C"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | archival/cpio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/archival/cpio.c b/archival/cpio.c index 9430338..d84f693 100644 --- a/archival/cpio.c +++ b/archival/cpio.c @@ -418,7 +418,8 @@ int cpio_main(int argc UNUSED_PARAM, char **argv) if (argv[0] == NULL) bb_show_usage(); if (opt & OPT_CREATE_LEADING_DIR) - mkdir(argv[0], 0777); + /* GNU cpio 2.13: "cpio -d -p a/b/c" works */ + bb_make_directory(argv[0], -1, FILEUTILS_RECUR); /* Crude existence check: * close(xopen(argv[0], O_RDONLY | O_DIRECTORY)); * We can also xopen, fstat, IS_DIR, later fchdir. @@ -428,6 +429,11 @@ int cpio_main(int argc UNUSED_PARAM, char **argv) * a diffrerent problem earlier. * This is good enough for now. */ +//FIXME: GNU cpio -d -p DIR does not immediately create DIR - +//it just prepends "DIR/" to the names of files to be created. +//The first file (fails to) be copied, and then the -d logic +//triggers and creates all necessary directories. +//IOW: bare "cpio -d -p DIR" + ^C shouldn't create anything. #if !BB_MMU pp.rd = 3; pp.wr = 4; |