BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dd: code shrink 

function                                             old     new   delta
dd_main                                             1001     961     -40

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
1_22_stable
Denys Vlasenko 2013-08-20 12:08:46 +02:00
parent 5b9910f0a4
commit 4502bb1f21
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
coreutils/dd.c
View File

@ -203,10 +203,17 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
#endif #endif
}; };
smallint exitcode = EXIT_FAILURE; smallint exitcode = EXIT_FAILURE;
size_t ibs = 512, obs = 512;
int i; int i;
char *ibuf, *obuf; size_t ibs = 512;
/* And these are all zeroed at once! */ char *ibuf;
#if ENABLE_FEATURE_DD_IBS_OBS
size_t obs = 512;
char *obuf;
#else
# define obs ibs
# define obuf ibuf
#endif
/* These are all zeroed at once! */
struct { struct {
int flags; int flags;
size_t oc; size_t oc;
@ -260,6 +267,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
} }
if (what == OP_conv) { if (what == OP_conv) {
while (1) { while (1) {
int n;
/* find ',', replace them with NUL so we can use val for /* find ',', replace them with NUL so we can use val for
* index_in_strings() without copying. * index_in_strings() without copying.
* We rely on val being non-null, else strchr would fault. * We rely on val being non-null, else strchr would fault.
@ -267,20 +275,21 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
arg = strchr(val, ','); arg = strchr(val, ',');
if (arg) if (arg)
*arg = '\0'; *arg = '\0';
what = index_in_strings(conv_words, val); n = index_in_strings(conv_words, val);
if (what < 0) if (n < 0)
bb_error_msg_and_die(bb_msg_invalid_arg, val, "conv"); bb_error_msg_and_die(bb_msg_invalid_arg, val, "conv");
flags |= (1 << what); flags |= (1 << n);
if (!arg) /* no ',' left, so this was the last specifier */ if (!arg) /* no ',' left, so this was the last specifier */
break; break;
/* *arg = ','; - to preserve ps listing? */ /* *arg = ','; - to preserve ps listing? */
val = arg + 1; /* skip this keyword and ',' */ val = arg + 1; /* skip this keyword and ',' */
} }
continue; /* we trashed 'what', can't fall through */ /*continue;*/
} }
#endif #endif
if (what == OP_bs) { if (what == OP_bs) {
ibs = obs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, dd_suffixes); ibs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, dd_suffixes);
obs = ibs;
/*continue;*/ /*continue;*/
} }
/* These can be large: */ /* These can be large: */
@ -308,11 +317,14 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
} /* end of "for (argv[i])" */ } /* end of "for (argv[i])" */
//XXX:FIXME for huge ibs or obs, malloc'ing them isn't the brightest idea ever //XXX:FIXME for huge ibs or obs, malloc'ing them isn't the brightest idea ever
ibuf = obuf = xmalloc(ibs); ibuf = xmalloc(ibs);
obuf = ibuf;
#if ENABLE_FEATURE_DD_IBS_OBS
if (ibs != obs) { if (ibs != obs) {
flags |= FLAG_TWOBUFS; flags |= FLAG_TWOBUFS;
obuf = xmalloc(obs); obuf = xmalloc(obs);
} }
#endif
#if ENABLE_FEATURE_DD_SIGNAL_HANDLING #if ENABLE_FEATURE_DD_SIGNAL_HANDLING
signal_SA_RESTART_empty_mask(SIGUSR1, dd_output_status); signal_SA_RESTART_empty_mask(SIGUSR1, dd_output_status);
@ -321,12 +333,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
G.begin_time_us = monotonic_us(); G.begin_time_us = monotonic_us();
#endif #endif
if (infile != NULL) if (infile) {
xmove_fd(xopen(infile, O_RDONLY), ifd); xmove_fd(xopen(infile, O_RDONLY), ifd);
else { } else {
infile = bb_msg_standard_input; infile = bb_msg_standard_input;
} }
if (outfile != NULL) { if (outfile) {
int oflag = O_WRONLY | O_CREAT; int oflag = O_WRONLY | O_CREAT;
if (!seek && !(flags & FLAG_NOTRUNC)) if (!seek && !(flags & FLAG_NOTRUNC))