*
*/
-#include "busybox.h"
-
#include <sys/types.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
+#include "busybox.h"
+
-static struct suffix_mult dd_suffixes[] = {
+static const struct suffix_mult dd_suffixes[] = {
{ "c", 1 },
{ "w", 2 },
{ "b", 512 },
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;
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'\n", argv[i]+5);
+ error_msg_and_die("invalid conversion `%s'", argv[i]+5);
}
if (buf[0] == '\0')
break;
buf++;
}
} else
- usage(dd_usage);
+ show_usage();
}
buf = xmalloc(bs);
in_full++;
else
in_part++;
- if (sync) {
+ if (sync_flag) {
memset(buf + n, '\0', bs - n);
n = bs;
}
out_part++;
}
- fprintf(statusfp, "%d+%d records in\n", in_full, in_part);
- fprintf(statusfp, "%d+%d records out\n", out_full, out_part);
+ fprintf(statusfp, "%ld+%ld records in\n", (long)in_full, (long)in_part);
+ fprintf(statusfp, "%ld+%ld records out\n", (long)out_full, (long)out_part);
return EXIT_SUCCESS;
}