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

cpio: improve help text; document two TODOs

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-01-09 19:56:15 +01:00
parent dc698bb038
commit 93ac7d8468
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archival/cpio.c
View File

@ -304,8 +304,12 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
/* -L makes sense only with -o or -p */ /* -L makes sense only with -o or -p */
#if !ENABLE_FEATURE_CPIO_O #if !ENABLE_FEATURE_CPIO_O
/* no parameters */
opt_complementary = "=0";
opt = getopt32(argv, OPTION_STR, &cpio_filename); opt = getopt32(argv, OPTION_STR, &cpio_filename);
#else #else
/* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */
opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0";
opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt); opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt);
argv += optind; argv += optind;
if (opt & CPIO_OPT_PASSTHROUGH) { if (opt & CPIO_OPT_PASSTHROUGH) {
@ -346,13 +350,13 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
xchdir(*argv++); xchdir(*argv++);
close(pp.wr); close(pp.wr);
xmove_fd(pp.rd, STDIN_FILENO); xmove_fd(pp.rd, STDIN_FILENO);
opt &= ~CPIO_OPT_PASSTHROUGH; //opt &= ~CPIO_OPT_PASSTHROUGH;
opt |= CPIO_OPT_EXTRACT; opt |= CPIO_OPT_EXTRACT;
goto skip; goto skip;
} }
/* -o */ /* -o */
if (opt & CPIO_OPT_CREATE) { if (opt & CPIO_OPT_CREATE) {
if (*cpio_fmt != 'n') /* we _require_ "-H newc" */ if (cpio_fmt[0] != 'n') /* we _require_ "-H newc" */
bb_show_usage(); bb_show_usage();
if (opt & CPIO_OPT_FILE) { if (opt & CPIO_OPT_FILE) {
xmove_fd(xopen3(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO); xmove_fd(xopen3(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO);

4
archival/libunarchive/get_header_cpio.c
View File

@ -115,6 +115,10 @@ char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle)
if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) { if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
archive_handle->action_data(archive_handle); archive_handle->action_data(archive_handle);
//TODO: run "echo /etc/hosts | cpio -pv /tmp" twice. On 2nd run:
//cpio: etc/hosts not created: newer or same age file exists
//etc/hosts <-- should NOT show it
//2 blocks <-- should say "0 blocks"
archive_handle->action_header(file_header); archive_handle->action_header(file_header);
} else { } else {
data_skip(archive_handle); data_skip(archive_handle);

1
archival/libunarchive/header_list.c
View File

@ -7,5 +7,6 @@
void FAST_FUNC header_list(const file_header_t *file_header) void FAST_FUNC header_list(const file_header_t *file_header)
{ {
//TODO: cpio -vp DIR should output "DIR/NAME", not just "NAME" */
puts(file_header->name); puts(file_header->name);
} }

12
include/usage.h
View File

@ -560,11 +560,15 @@
"\n -l,-s Create (sym)links" \ "\n -l,-s Create (sym)links" \
#define cpio_trivial_usage \ #define cpio_trivial_usage \
"-[ti" IF_FEATURE_CPIO_O("o") IF_FEATURE_CPIO_P("p") "dmvu] [-F FILE]" \ "[-ti" IF_FEATURE_CPIO_O("o") "]" IF_FEATURE_CPIO_P(" [-p DIR]") \
IF_FEATURE_CPIO_O( " [-H newc]" ) " [-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]")
#define cpio_full_usage "\n\n" \ #define cpio_full_usage "\n\n" \
"Extract or list files from a cpio archive" \ "Extract or list files from a cpio archive" \
IF_FEATURE_CPIO_O( ", or create a cpio archive" ) \ IF_FEATURE_CPIO_O(", or" \
"\ncreate an archive" IF_FEATURE_CPIO_P(" (-o) or copy files (-p)") \
" using file list on standard input" \
) \
"\n" \
"\nMain operation mode:" \ "\nMain operation mode:" \
"\n -t List" \ "\n -t List" \
"\n -i Extract" \ "\n -i Extract" \
@ -572,7 +576,7 @@
"\n -o Create" \ "\n -o Create" \
) \ ) \
IF_FEATURE_CPIO_P( \ IF_FEATURE_CPIO_P( \
"\n -p Passthrough" \ "\n -p DIR Copy files to DIR" \
) \ ) \
"\nOptions:" \ "\nOptions:" \
"\n -d Make leading directories" \ "\n -d Make leading directories" \