From 73561cc75ac31e63bcab4b4ebfaf738e4ca225e6 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 28 Aug 2006 23:31:54 +0000 Subject: - pull from busybox_scratch: r15829:15850 Various fixes, cleanups and shrinkage: saves 952 Bytes: text data bss dec hex filename 1087742 15853 790632 1894227 1ce753 ../busybox/busybox.old 1086790 15853 790632 1893275 1ce39b busybox via: # scripts/bloat-o-meter ../busybox/busybox_unstripped.old busybox_unstripped function old new delta ipcrm_main 756 822 +66 getval - 61 +61 maybe_set_utc - 40 +40 udhcpc_main 2896 2912 +16 md5_hash_block 428 437 +9 opt 8 16 +8 qgravechar 106 110 +4 make_bitmap 292 295 +3 inflate_unzip 2056 2059 +3 add_partition 1412 1414 +2 __parsespent 156 158 +2 qrealloc 41 42 +1 format - 1 +1 catv_main 313 314 +1 watch_main 293 292 -1 varunset 81 80 -1 part 1 - -1 check_if_skip 837 836 -1 start_stop_daemon_main 840 837 -3 create_lost_and_found 175 172 -3 supress_non_delimited_lines 4 - -4 static.l 4 - -4 static.c 5 1 -4 bsd_sum_file 237 233 -4 eval2 338 332 -6 arithmetic_common 166 158 -8 cmpfunc 22 5 -17 cksum_main 294 275 -19 cmp_main 465 439 -26 dd_main 1535 1508 -27 rmmod_main 376 333 -43 cut_file 727 644 -83 ipcs_main 3809 3721 -88 cut_main 722 614 -108 date_main 1443 1263 -180 remove_ids 222 - -222 ------------------------------------------------------------------------------ (add/remove: 3/4 grow/shrink: 11/18 up/down: 217/-853) Total: -636 bytes --- coreutils/dd.c | 128 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 63 deletions(-) (limited to 'coreutils/dd.c') diff --git a/coreutils/dd.c b/coreutils/dd.c index 052cd2902..a9536a584 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c @@ -9,6 +9,7 @@ */ #include "busybox.h" +#include /* For FEATURE_DD_SIGNAL_HANDLING */ static const struct suffix_mult dd_suffixes[] = { { "c", 1 }, @@ -23,72 +24,72 @@ static const struct suffix_mult dd_suffixes[] = { { NULL, 0 } }; -static size_t out_full; -static size_t out_part; -static size_t in_full; -static size_t in_part; +static size_t out_full, out_part, in_full, in_part; -static void dd_output_status(int cur_signal) +static void dd_output_status(int ATTRIBUTE_UNUSED cur_signal) { - fprintf(stderr, "%ld+%ld records in\n%ld+%ld records out\n", + bb_fprintf(stderr, "%ld+%ld records in\n%ld+%ld records out\n", (long)in_full, (long)in_part, (long)out_full, (long)out_part); } int dd_main(int argc, char **argv) { +#define sync_flag (1<<0) +#define noerror (1<<1) +#define trunc_flag (1<<2) +#define twobufs_flag (1<<3) + int flags = trunc_flag; size_t count = -1, oc = 0, ibs = 512, obs = 512; ssize_t n; off_t seek = 0, skip = 0; - int sync_flag = FALSE, noerror = FALSE, trunc_flag = TRUE, twobufs_flag = 0, - oflag, ifd, ofd, i; + int oflag, ifd, ofd; const char *infile = NULL, *outfile = NULL; char *ibuf, *obuf; - if (ENABLE_FEATURE_DD_SIGNAL_HANDLING) - { + if (ENABLE_FEATURE_DD_SIGNAL_HANDLING) { struct sigaction sa; memset(&sa, 0, sizeof(sa)); - sa.sa_handler = dd_output_status; + sa.sa_handler = dd_output_status; sa.sa_flags = SA_RESTART; sigemptyset(&sa.sa_mask); - sigaction(SIGUSR1, &sa, 0); + sigaction(SIGUSR1, &sa, 0); } - for (i = 1; i < argc; i++) { - if (ENABLE_FEATURE_DD_IBS_OBS && !strncmp("ibs=", argv[i], 4)) { - ibs = bb_xparse_number(argv[i]+4, dd_suffixes); - twobufs_flag++; - } else if (ENABLE_FEATURE_DD_IBS_OBS && !strncmp("obs=", argv[i], 4)) { - obs = bb_xparse_number(argv[i]+4, dd_suffixes); - twobufs_flag++; - } else if (!strncmp("bs=", argv[i], 3)) { - ibs = obs = bb_xparse_number(argv[i]+3, dd_suffixes); - } else if (!strncmp("count=", argv[i], 6)) - count = bb_xparse_number(argv[i]+6, dd_suffixes); - else if (!strncmp("seek=", argv[i], 5)) - seek = bb_xparse_number(argv[i]+5, dd_suffixes); - else if (!strncmp("skip=", argv[i], 5)) - skip = bb_xparse_number(argv[i]+5, dd_suffixes); - else if (!strncmp("if=", argv[i], 3)) - infile = argv[i]+3; - else if (!strncmp("of=", argv[i], 3)) - outfile = argv[i]+3; - else if (ENABLE_FEATURE_DD_IBS_OBS && !strncmp("conv=", argv[i], 5)) { - ibuf = argv[i]+5; + for (n = 1; n < argc; n++) { + if (ENABLE_FEATURE_DD_IBS_OBS && !strncmp("ibs=", argv[n], 4)) { + ibs = bb_xparse_number(argv[n]+4, dd_suffixes); + flags |= twobufs_flag; + } else if (ENABLE_FEATURE_DD_IBS_OBS && !strncmp("obs=", argv[n], 4)) { + obs = bb_xparse_number(argv[n]+4, dd_suffixes); + flags |= twobufs_flag; + } else if (!strncmp("bs=", argv[n], 3)) + ibs = obs = bb_xparse_number(argv[n]+3, dd_suffixes); + else if (!strncmp("count=", argv[n], 6)) + count = bb_xparse_number(argv[n]+6, dd_suffixes); + else if (!strncmp("seek=", argv[n], 5)) + seek = bb_xparse_number(argv[n]+5, dd_suffixes); + else if (!strncmp("skip=", argv[n], 5)) + skip = bb_xparse_number(argv[n]+5, dd_suffixes); + else if (!strncmp("if=", argv[n], 3)) + infile = argv[n]+3; + else if (!strncmp("of=", argv[n], 3)) + outfile = argv[n]+3; + else if (ENABLE_FEATURE_DD_IBS_OBS && !strncmp("conv=", argv[n], 5)) { + ibuf = argv[n]+5; while (1) { if (!strncmp("notrunc", ibuf, 7)) { - trunc_flag = FALSE; + flags ^= trunc_flag; ibuf += 7; } else if (!strncmp("sync", ibuf, 4)) { - sync_flag = TRUE; + flags |= sync_flag; ibuf += 4; } else if (!strncmp("noerror", ibuf, 7)) { - noerror = TRUE; + flags |= noerror; ibuf += 7; } else { - bb_error_msg_and_die(bb_msg_invalid_arg, argv[i]+5, "conv"); + bb_error_msg_and_die(bb_msg_invalid_arg, argv[n]+5, "conv"); } if (ibuf[0] == '\0') break; if (ibuf[0] == ',') ibuf++; @@ -98,12 +99,14 @@ int dd_main(int argc, char **argv) } ibuf = xmalloc(ibs); - if (twobufs_flag) obuf = xmalloc(obs); - else obuf = ibuf; + if (flags & twobufs_flag) + obuf = xmalloc(obs); + else + obuf = ibuf; - if (infile != NULL) { + if (infile != NULL) ifd = xopen(infile, O_RDONLY); - } else { + else { ifd = STDIN_FILENO; infile = bb_msg_standard_input; } @@ -111,20 +114,18 @@ int dd_main(int argc, char **argv) if (outfile != NULL) { oflag = O_WRONLY | O_CREAT; - if (!seek && trunc_flag) { + if (!seek && (flags & trunc_flag)) oflag |= O_TRUNC; - } ofd = xopen3(outfile, oflag, 0666); - if (seek && trunc_flag) { + if (seek && (flags & trunc_flag)) { if (ftruncate(ofd, seek * obs) < 0) { struct stat st; - if (fstat (ofd, &st) < 0 || S_ISREG (st.st_mode) || - S_ISDIR (st.st_mode)) { - bb_perror_msg_and_die("%s", outfile); - } + if (fstat(ofd, &st) < 0 || S_ISREG(st.st_mode) || + S_ISDIR(st.st_mode)) + goto die_outfile; } } } else { @@ -145,44 +146,42 @@ int dd_main(int argc, char **argv) } if (seek) { - if (lseek(ofd, seek * obs, SEEK_CUR) < 0) { - bb_perror_msg_and_die("%s", outfile); - } + if (lseek(ofd, seek * obs, SEEK_CUR) < 0) + goto die_outfile; } while (in_full + in_part != count) { - if (noerror) { + if (flags & noerror) { /* Pre-zero the buffer when doing the noerror thing */ memset(ibuf, '\0', ibs); } n = safe_read(ifd, ibuf, ibs); - if (n == 0) { + if (n == 0) break; - } if (n < 0) { - if (noerror) { + if (flags & noerror) { n = ibs; bb_perror_msg("%s", infile); - } else { + } else bb_perror_msg_and_die("%s", infile); - } } - if ((size_t)n == ibs) { + if ((size_t)n == ibs) in_full++; - } else { + else { in_part++; if (sync_flag) { memset(ibuf + n, '\0', ibs - n); n = ibs; } } - if (twobufs_flag) { + if (flags & twobufs_flag) { char *tmp = ibuf; while (n) { size_t d = obs - oc; - if (d > n) d = n; + if (d > n) + d = n; memcpy(obuf + oc, tmp, d); n -= d; tmp += d; @@ -195,8 +194,10 @@ int dd_main(int argc, char **argv) } } else { xwrite(ofd, ibuf, n); - if (n == ibs) out_full++; - else out_part++; + if (n == ibs) + out_full++; + else + out_part++; } } @@ -209,6 +210,7 @@ int dd_main(int argc, char **argv) } if (close (ofd) < 0) { +die_outfile: bb_perror_msg_and_die("%s", outfile); } -- cgit v1.2.3