emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpio: fix "cpio -d -p A/B/C"

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-06-03 20:26:30 +02:00
parent 327b9f8848
commit b1a2762ecf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archival/cpio.c
View File

@ -418,7 +418,8 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
if (argv[0] == NULL) if (argv[0] == NULL)
bb_show_usage(); bb_show_usage();
if (opt & OPT_CREATE_LEADING_DIR) 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: /* Crude existence check:
* close(xopen(argv[0], O_RDONLY | O_DIRECTORY)); * close(xopen(argv[0], O_RDONLY | O_DIRECTORY));
* We can also xopen, fstat, IS_DIR, later fchdir. * 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. * a diffrerent problem earlier.
* This is good enough for now. * 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 #if !BB_MMU
pp.rd = 3; pp.rd = 3;
pp.wr = 4; pp.wr = 4;