projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gz_open and gz_close were left in, even when BB_FEATURE_TAR_GZIP was disabled.
[oweals/busybox.git]
/
dd.c
diff --git
a/dd.c
b/dd.c
index 1618dd102a81c50a8442691136ff169496c80936..3f58929ba44f15382a232250158d0e115a8245a1 100644
(file)
--- a/
dd.c
+++ b/
dd.c
@@
-45,7
+45,7
@@
static const struct suffix_mult dd_suffixes[] = {
int dd_main(int argc, char **argv)
{
int dd_main(int argc, char **argv)
{
- int i, ifd, ofd, oflag, sync = FALSE, trunc = TRUE;
+ int i, ifd, ofd, oflag, sync
_flag
= FALSE, trunc = TRUE;
size_t in_full = 0, in_part = 0, out_full = 0, out_part = 0;
size_t bs = 512, count = -1;
ssize_t n;
size_t in_full = 0, in_part = 0, out_full = 0, out_part = 0;
size_t bs = 512, count = -1;
ssize_t n;
@@
-73,7
+73,7
@@
int dd_main(int argc, char **argv)
trunc = FALSE;
buf += 7;
} else if (strncmp("sync", buf, 4) == 0) {
trunc = FALSE;
buf += 7;
} else if (strncmp("sync", buf, 4) == 0) {
- sync = TRUE;
+ sync
_flag
= TRUE;
buf += 4;
} else {
error_msg_and_die("invalid conversion `%s'", argv[i]+5);
buf += 4;
} else {
error_msg_and_die("invalid conversion `%s'", argv[i]+5);
@@
-138,7
+138,7
@@
int dd_main(int argc, char **argv)
in_full++;
else
in_part++;
in_full++;
else
in_part++;
- if (sync) {
+ if (sync
_flag
) {
memset(buf + n, '\0', bs - n);
n = bs;
}
memset(buf + n, '\0', bs - n);
n = bs;
}