Rewrote dd.

9 files changed, 306 insertions, 422 deletions

diff --git a/applets/usage.c b/applets/usage.c
index 876d253..c7bc0e8 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -170,10 +170,11 @@ const char dd_usage[] =
 	"\tcount=N\tcopy only N input blocks\n"
 	"\tskip=N\tskip N input blocks\n"
 	"\tseek=N\tskip N output blocks\n"
-	"\tconv=notrunc\t dont truncate of at end of write\n"
-	"\tconv=sync\t pad the last block with zeros until blocksize\n"
+	"\tconv=notrunc\tdon't truncate output file\n"
+	"\tconv=sync\tpad blocks with zeros\n"
 	"\n"
-	"Numbers may be suffixed by w (x2), k (x1024), b (x512), or M (x1024^2)\n"
+	"Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n"
+	"MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824).\n"
 #endif
 	;
 #endif
@@ -1185,20 +1186,20 @@ const char syslogd_usage[] =
 
 #if defined BB_TAIL
 const char tail_usage[] =
-	"tail [OPTION] [FILE]...\n"
+	"tail [OPTION]... [FILE]...\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
 	"\nPrint last 10 lines of each FILE to standard output.\n"
 	"With more than one FILE, precede each with a header giving the\n"
 	"file name. With no FILE, or when FILE is -, read standard input.\n\n"
 	"Options:\n"
 #ifndef BB_FEATURE_SIMPLE_TAIL
-	"\t-c=N[kbm]\toutput the last N bytes\n"
+	"\t-c N[kbm]\toutput the last N bytes\n"
 #endif
-	"\t-n NUM\t\tPrint last NUM lines instead of first 10\n"
-	"\t-f\t\tOutput data as the file grows.\n"
+	"\t-n N[kbm]\tprint last N lines instead of last 10\n"
+	"\t-f\t\toutput data as the file grows\n"
 #ifndef BB_FEATURE_SIMPLE_TAIL
 	"\t-q\t\tnever output headers giving file names\n"
-	"\t-s SEC\t\tWait SEC seconds between reads with -f\n"
+	"\t-s SEC\t\twait SEC seconds between reads with -f\n"
 	"\t-v\t\talways output headers giving file names\n\n"
 	"If the first character of N (bytes or lines) is a `+', output begins with \n"
 	"the Nth item from the start of each file, otherwise, print the last N items\n"
diff --git a/busybox.h b/busybox.h
index 5ff3975..4423525 100644
--- a/busybox.h
+++ b/busybox.h
@@ -190,6 +190,13 @@ extern char *xstrdup (const char *s);
 #endif
 extern char *xstrndup (const char *s, int n);
 
+struct suffix_mult {
+	char *suffix;
+	int mult;
+};
+
+extern unsigned long parse_number(const char *numstr, struct suffix_mult *suffixes);
+
 
 /* These parse entries in /etc/passwd and /etc/group.  This is desirable
  * for BusyBox since we want to avoid using the glibc NSS stuff, which
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 626b548..a0d2330 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -2,15 +2,8 @@
 /*
  * Mini dd implementation for busybox
  *
- * Copyright (C) 1999, 2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
- * Based in part on code taken from sash. 
- *   Copyright (c) 1999 by David I. Bell
- *   Permission is granted to use, distribute, or modify this source,
- *   provided that this copyright notice remains intact.
- *
- * Permission to distribute this code under the GPL has been granted.
+ * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,154 +21,128 @@
  *
  */
 
-
 #include "busybox.h"
-#include <features.h>
-#include <stdio.h>
+
+#include <sys/types.h>
 #include <fcntl.h>
-#include <errno.h>
-#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
-#include <inttypes.h>
-#else
-typedef unsigned long long int uintmax_t;
-#endif
 
-extern int dd_main(int argc, char **argv)
+static struct suffix_mult dd_suffixes[] = {
+	{ "c", 1 },
+	{ "w", 2 },
+	{ "b", 512 },
+	{ "kD", 1000 },
+	{ "k", 1024 },
+	{ "MD", 1000000 },
+	{ "M", 1048576 },
+	{ "GD", 1000000000 },
+	{ "G", 1073741824 },
+	{ NULL, 0 }
+};
+
+int dd_main(int argc, char **argv)
 {
-	char *inFile = NULL;
-	char *outFile = NULL;
-	int inFd;
-	int outFd;
-	int inCc = 0;
-	int outCc;
-	int trunc=TRUE;
-	int sync=FALSE;
-	long blockSize = 512,ibs;
-	uintmax_t skipBlocks = 0;
-	uintmax_t seekBlocks = 0;
-	uintmax_t count = (uintmax_t) - 1;
-	uintmax_t inTotal = 0;
-	uintmax_t outTotal = 0;
-	uintmax_t totalSize;
-
-	unsigned char buf[BUFSIZ];
-	char *keyword = NULL;
-
-	argc--;
-	argv++;
-
-	/* Parse any options */
-	while (argc) {
-		if (inFile == NULL && (strncmp(*argv, "if", 2) == 0))
-			inFile = ((strchr(*argv, '=')) + 1);
-		else if (outFile == NULL && (strncmp(*argv, "of", 2) == 0))
-			outFile = ((strchr(*argv, '=')) + 1);
-		else if (strncmp("count", *argv, 5) == 0) {
-			count = atoi_w_units((strchr(*argv, '=')) + 1);
-			if (count < 0) {
-				error_msg("Bad count value %s\n", *argv);
-				goto usage;
-			}
-		} else if (strncmp(*argv, "bs", 2) == 0) {
-			blockSize = atoi_w_units((strchr(*argv, '=')) + 1);
-			if (blockSize <= 0) {
-				error_msg("Bad block size value %s\n", *argv);
-				goto usage;
-			}
-		} else if (strncmp(*argv, "skip", 4) == 0) {
-			skipBlocks = atoi_w_units((strchr(*argv, '=')) + 1);
-			if (skipBlocks <= 0) {
-				error_msg("Bad skip value %s\n", *argv);
-				goto usage;
-			}
-
-		} else if (strncmp(*argv, "seek", 4) == 0) {
-			seekBlocks = atoi_w_units((strchr(*argv, '=')) + 1);
-			if (seekBlocks <= 0) {
-				error_msg("Bad seek value %s\n", *argv);
-				goto usage;
+	int i, ifd, ofd, sync = 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;
+	off_t seek = 0, skip = 0;
+	FILE *statusfp;
+	char *infile = NULL, *outfile = NULL, *buf;
+
+	for (i = 1; i < argc; i++) {
+		if (strncmp("bs=", argv[i], 3) == 0)
+			bs = parse_number(argv[i]+3, dd_suffixes);
+		else if (strncmp("count=", argv[i], 6) == 0)
+			count = parse_number(argv[i]+6, dd_suffixes);
+		else if (strncmp("seek=", argv[i], 5) == 0)
+			seek = parse_number(argv[i]+5, dd_suffixes);
+		else if (strncmp("skip=", argv[i], 5) == 0)
+			skip = parse_number(argv[i]+5, dd_suffixes);
+		else if (strncmp("if=", argv[i], 3) == 0)
+			infile = argv[i]+3;
+		else if (strncmp("of=", argv[i], 3) == 0)
+			outfile = argv[i]+3;
+		else if (strncmp("conv=", argv[i], 5) == 0) {
+			buf = argv[i]+5;
+			while (1) {
+				if (strncmp("notrunc", buf, 7) == 0) {
+					trunc = FALSE;
+					buf += 7;
+				} else if (strncmp("sync", buf, 4) == 0) {
+					sync = TRUE;
+					buf += 4;
+				} else {
+					error_msg_and_die("invalid conversion `%s'\n", argv[i]+5);
+				}
+				if (buf[0] == '\0')
+					break;
+				if (buf[0] == ',')
+					buf++;
 			}
-		} else if (strncmp(*argv, "conv", 4) == 0) {
-			keyword = (strchr(*argv, '=') + 1);
-                	if (strcmp(keyword, "notrunc") == 0) 
-				trunc=FALSE;
-			if (strcmp(keyword, "sync") == 0) 
-				sync=TRUE;
-		} else {
-			goto usage;
-		}
-		argc--;
-		argv++;
+		} else
+			usage(dd_usage);
 	}
 
-	if (inFile == NULL)
-		inFd = fileno(stdin);
-	else
-		inFd = open(inFile, 0);
-
-	if (inFd < 0) {
-		/* Note that we are not freeing buf or closing
-		 * files here to save a few bytes. This exits
-		 * here anyways... */
+	buf = xmalloc(bs);
 
-		/* free(buf); */
-		perror_msg_and_die("%s", inFile);
+	if (infile != NULL) {
+		if ((ifd = open(infile, O_RDONLY)) < 0)
+			perror_msg_and_die("%s", infile);
+	} else {
+		ifd = STDIN_FILENO;
+		infile = "standard input";
 	}
 
-	if (outFile == NULL)
-		outFd = fileno(stdout);
-	else
-		outFd = open(outFile, O_WRONLY | O_CREAT, 0666);
-
-	if (outFd < 0) {
-		/* Note that we are not freeing buf or closing
-		 * files here to save a few bytes. This exits
-		 * here anyways... */
+	if (outfile != NULL) {
+		if ((ofd = open(outfile, O_WRONLY | O_CREAT, 0666)) < 0)
+			perror_msg_and_die("%s", outfile);
+		statusfp = stdout;
+	} else {
+		ofd = STDOUT_FILENO;
+		outfile = "standard output";
+		statusfp = stderr;
+	}
 
-		/* close(inFd);
-		   free(buf); */
-		perror_msg_and_die("%s", outFile);
+	if (skip) {
+		if (lseek(ifd, skip * bs, SEEK_CUR) < 0)
+			perror_msg_and_die("%s", infile);
 	}
 
-	lseek(inFd, (off_t) (skipBlocks * blockSize), SEEK_SET);
-	lseek(outFd, (off_t) (seekBlocks * blockSize), SEEK_SET);
-	totalSize=count*blockSize;
+	if (seek) {
+		if (lseek(ofd, seek * bs, SEEK_CUR) < 0)
+			perror_msg_and_die("%s", outfile);
+	}
 
-	ibs=blockSize;
-	if (ibs > BUFSIZ)
-		ibs=BUFSIZ;
-			
-	while (totalSize > outTotal) {
-		inCc = full_read(inFd, buf, ibs);
-		inTotal += inCc;
-		if ( (sync==TRUE) && (inCc>0) )
-			while (inCc<ibs)
-				buf[inCc++]='\0';
+	if (trunc) {
+		if (ftruncate(ofd, seek * bs) < 0)
+			perror_msg_and_die("%s", outfile);
+	}
 
-		if ((outCc = full_write(outFd, buf, inCc)) < 1){
-			if (outCc < 0 ){
-				perror("Error during write");
-			}
+	while (in_full + in_part != count) {
+		n = safe_read(ifd, buf, bs);
+		if (n < 0)
+			perror_msg_and_die("%s", infile);
+		if (n == 0)
 			break;
+		if (n == bs)
+			in_full++;
+		else
+			in_part++;
+		if (sync) {
+			memset(buf + n, '\0', bs - n);
+			n = bs;
 		}
-		outTotal += outCc;
-        }
-	if (trunc == TRUE) {
-		ftruncate(outFd, lseek(outFd, 0, SEEK_CUR));
+		n = full_write(ofd, buf, n);
+		if (n < 0)
+			perror_msg_and_die("%s", outfile);
+		if (n == bs)
+			out_full++;
+		else
+			out_part++;
 	}
-	/* Note that we are not freeing memory or closing
-	 * files here, to save a few bytes. */
-#ifdef BB_FEATURE_CLEAN_UP
-	close(inFd);
-	close(outFd);
-#endif
 
-	printf("%ld+%d records in\n", (long) (inTotal / blockSize),
-		   (inTotal % blockSize) != 0);
-	printf("%ld+%d records out\n", (long) (outTotal / blockSize),
-		   (outTotal % blockSize) != 0);
-	return EXIT_SUCCESS;
-  usage:
+	fprintf(statusfp, "%d+%d records in\n", in_full, in_part);
+	fprintf(statusfp, "%d+%d records out\n", out_full, out_part);
 
-	usage(dd_usage);
+	return EXIT_SUCCESS;
 }
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 308bb30..5f03818 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -61,6 +61,13 @@ static char verbose = 0;
 
 static off_t units=0;
 
+static struct suffix_mult tail_suffixes[] = {
+	{ "b", 512 },
+	{ "k", 1024 },
+	{ "m", 1048576 },
+	{ NULL, 0 }
+};
+
 static int tail_stream(int fd)
 {
 	ssize_t startpoint;
@@ -170,32 +177,6 @@ int tail_main(int argc, char **argv)
 
 		switch (opt) {
 #ifndef BB_FEATURE_SIMPLE_TAIL
-		case 'c':
-			unit_type = BYTES;
-			test = atoi(optarg);
-			if(test==0)
-				usage(tail_usage);
-			if(optarg[strlen(optarg)-1]>'9') {
-				switch (optarg[strlen(optarg)-1]) {
-				case 'b':
-					test *= 512;
-					break;
-				case 'k':
-					test *= 1024;
-					break;
-				case 'm':
-					test *= (1024 * 1024);
-					break;
-				default:
-					fprintf(stderr,"Size must be b,k, or m.");
-					usage(tail_usage);
-				}
-			}
-			if(optarg[0]=='+')
-				units=test+1;
-			else
-				units=-(test+1);
-			break;
 		case 'q':
 			show_headers = 0;
 			break;
@@ -207,15 +188,12 @@ int tail_main(int argc, char **argv)
 		case 'v':
 			verbose = 1;
 			break;
+		case 'c':
+			unit_type = BYTES;
+			/* FALLS THROUGH */
 #endif
-		case 'f':
-			follow = 1;
-			break;
-		case 'h':
-			usage(tail_usage);
-			break;
 		case 'n':
-			test = atoi(optarg);
+			test = parse_number(optarg, tail_suffixes);
 			if (test) {
 				if (optarg[0] == '+')
 					units = test;
@@ -224,8 +202,10 @@ int tail_main(int argc, char **argv)
 			} else
 				usage(tail_usage);
 			break;
+		case 'f':
+			follow = 1;
+			break;
 		default:
-			error_msg("\nUnknown arg: %c.\n\n",optopt);
 			usage(tail_usage);
 		}
 	}
diff --git a/dd.c b/dd.c
index 626b548..a0d2330 100644
--- a/dd.c
+++ b/dd.c
@@ -2,15 +2,8 @@
 /*
  * Mini dd implementation for busybox
  *
- * Copyright (C) 1999, 2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
- * Based in part on code taken from sash. 
- *   Copyright (c) 1999 by David I. Bell
- *   Permission is granted to use, distribute, or modify this source,
- *   provided that this copyright notice remains intact.
- *
- * Permission to distribute this code under the GPL has been granted.
+ * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,154 +21,128 @@
  *
  */
 
-
 #include "busybox.h"
-#include <features.h>
-#include <stdio.h>
+
+#include <sys/types.h>
 #include <fcntl.h>
-#include <errno.h>
-#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
-#include <inttypes.h>
-#else
-typedef unsigned long long int uintmax_t;
-#endif
 
-extern int dd_main(int argc, char **argv)
+static struct suffix_mult dd_suffixes[] = {
+	{ "c", 1 },
+	{ "w", 2 },
+	{ "b", 512 },
+	{ "kD", 1000 },
+	{ "k", 1024 },
+	{ "MD", 1000000 },
+	{ "M", 1048576 },
+	{ "GD", 1000000000 },
+	{ "G", 1073741824 },
+	{ NULL, 0 }
+};
+
+int dd_main(int argc, char **argv)
 {
-	char *inFile = NULL;
-	char *outFile = NULL;
-	int inFd;
-	int outFd;
-	int inCc = 0;
-	int outCc;
-	int trunc=TRUE;
-	int sync=FALSE;
-	long blockSize = 512,ibs;
-	uintmax_t skipBlocks = 0;
-	uintmax_t seekBlocks = 0;
-	uintmax_t count = (uintmax_t) - 1;
-	uintmax_t inTotal = 0;
-	uintmax_t outTotal = 0;
-	uintmax_t totalSize;
-
-	unsigned char buf[BUFSIZ];
-	char *keyword = NULL;
-
-	argc--;
-	argv++;
-
-	/* Parse any options */
-	while (argc) {
-		if (inFile == NULL && (strncmp(*argv, "if", 2) == 0))
-			inFile = ((strchr(*argv, '=')) + 1);
-		else if (outFile == NULL && (strncmp(*argv, "of", 2) == 0))
-			outFile = ((strchr(*argv, '=')) + 1);
-		else if (strncmp("count", *argv, 5) == 0) {
-			count = atoi_w_units((strchr(*argv, '=')) + 1);
-			if (count < 0) {
-				error_msg("Bad count value %s\n", *argv);
-				goto usage;
-			}
-		} else if (strncmp(*argv, "bs", 2) == 0) {
-			blockSize = atoi_w_units((strchr(*argv, '=')) + 1);
-			if (blockSize <= 0) {
-				error_msg("Bad block size value %s\n", *argv);
-				goto usage;
-			}
-		} else if (strncmp(*argv, "skip", 4) == 0) {
-			skipBlocks = atoi_w_units((strchr(*argv, '=')) + 1);
-			if (skipBlocks <= 0) {
-				error_msg("Bad skip value %s\n", *argv);
-				goto usage;
-			}
-
-		} else if (strncmp(*argv, "seek", 4) == 0) {
-			seekBlocks = atoi_w_units((strchr(*argv, '=')) + 1);
-			if (seekBlocks <= 0) {
-				error_msg("Bad seek value %s\n", *argv);
-				goto usage;
+	int i, ifd, ofd, sync = 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;
+	off_t seek = 0, skip = 0;
+	FILE *statusfp;
+	char *infile = NULL, *outfile = NULL, *buf;
+
+	for (i = 1; i < argc; i++) {
+		if (strncmp("bs=", argv[i], 3) == 0)
+			bs = parse_number(argv[i]+3, dd_suffixes);
+		else if (strncmp("count=", argv[i], 6) == 0)
+			count = parse_number(argv[i]+6, dd_suffixes);
+		else if (strncmp("seek=", argv[i], 5) == 0)
+			seek = parse_number(argv[i]+5, dd_suffixes);
+		else if (strncmp("skip=", argv[i], 5) == 0)
+			skip = parse_number(argv[i]+5, dd_suffixes);
+		else if (strncmp("if=", argv[i], 3) == 0)
+			infile = argv[i]+3;
+		else if (strncmp("of=", argv[i], 3) == 0)
+			outfile = argv[i]+3;
+		else if (strncmp("conv=", argv[i], 5) == 0) {
+			buf = argv[i]+5;
+			while (1) {
+				if (strncmp("notrunc", buf, 7) == 0) {
+					trunc = FALSE;
+					buf += 7;
+				} else if (strncmp("sync", buf, 4) == 0) {
+					sync = TRUE;
+					buf += 4;
+				} else {
+					error_msg_and_die("invalid conversion `%s'\n", argv[i]+5);
+				}
+				if (buf[0] == '\0')
+					break;
+				if (buf[0] == ',')
+					buf++;
 			}
-		} else if (strncmp(*argv, "conv", 4) == 0) {
-			keyword = (strchr(*argv, '=') + 1);
-                	if (strcmp(keyword, "notrunc") == 0) 
-				trunc=FALSE;
-			if (strcmp(keyword, "sync") == 0) 
-				sync=TRUE;
-		} else {
-			goto usage;
-		}
-		argc--;
-		argv++;
+		} else
+			usage(dd_usage);
 	}
 
-	if (inFile == NULL)
-		inFd = fileno(stdin);
-	else
-		inFd = open(inFile, 0);
-
-	if (inFd < 0) {
-		/* Note that we are not freeing buf or closing
-		 * files here to save a few bytes. This exits
-		 * here anyways... */
+	buf = xmalloc(bs);
 
-		/* free(buf); */
-		perror_msg_and_die("%s", inFile);
+	if (infile != NULL) {
+		if ((ifd = open(infile, O_RDONLY)) < 0)
+			perror_msg_and_die("%s", infile);
+	} else {
+		ifd = STDIN_FILENO;
+		infile = "standard input";
 	}
 
-	if (outFile == NULL)
-		outFd = fileno(stdout);
-	else
-		outFd = open(outFile, O_WRONLY | O_CREAT, 0666);
-
-	if (outFd < 0) {
-		/* Note that we are not freeing buf or closing
-		 * files here to save a few bytes. This exits
-		 * here anyways... */
+	if (outfile != NULL) {
+		if ((ofd = open(outfile, O_WRONLY | O_CREAT, 0666)) < 0)
+			perror_msg_and_die("%s", outfile);
+		statusfp = stdout;
+	} else {
+		ofd = STDOUT_FILENO;
+		outfile = "standard output";
+		statusfp = stderr;
+	}
 
-		/* close(inFd);
-		   free(buf); */
-		perror_msg_and_die("%s", outFile);
+	if (skip) {
+		if (lseek(ifd, skip * bs, SEEK_CUR) < 0)
+			perror_msg_and_die("%s", infile);
 	}
 
-	lseek(inFd, (off_t) (skipBlocks * blockSize), SEEK_SET);
-	lseek(outFd, (off_t) (seekBlocks * blockSize), SEEK_SET);
-	totalSize=count*blockSize;
+	if (seek) {
+		if (lseek(ofd, seek * bs, SEEK_CUR) < 0)
+			perror_msg_and_die("%s", outfile);
+	}
 
-	ibs=blockSize;
-	if (ibs > BUFSIZ)
-		ibs=BUFSIZ;
-			
-	while (totalSize > outTotal) {
-		inCc = full_read(inFd, buf, ibs);
-		inTotal += inCc;
-		if ( (sync==TRUE) && (inCc>0) )
-			while (inCc<ibs)
-				buf[inCc++]='\0';
+	if (trunc) {
+		if (ftruncate(ofd, seek * bs) < 0)
+			perror_msg_and_die("%s", outfile);
+	}
 
-		if ((outCc = full_write(outFd, buf, inCc)) < 1){
-			if (outCc < 0 ){
-				perror("Error during write");
-			}
+	while (in_full + in_part != count) {
+		n = safe_read(ifd, buf, bs);
+		if (n < 0)
+			perror_msg_and_die("%s", infile);
+		if (n == 0)
 			break;
+		if (n == bs)
+			in_full++;
+		else
+			in_part++;
+		if (sync) {
+			memset(buf + n, '\0', bs - n);
+			n = bs;
 		}
-		outTotal += outCc;
-        }
-	if (trunc == TRUE) {
-		ftruncate(outFd, lseek(outFd, 0, SEEK_CUR));
+		n = full_write(ofd, buf, n);
+		if (n < 0)
+			perror_msg_and_die("%s", outfile);
+		if (n == bs)
+			out_full++;
+		else
+			out_part++;
 	}
-	/* Note that we are not freeing memory or closing
-	 * files here, to save a few bytes. */
-#ifdef BB_FEATURE_CLEAN_UP
-	close(inFd);
-	close(outFd);
-#endif
 
-	printf("%ld+%d records in\n", (long) (inTotal / blockSize),
-		   (inTotal % blockSize) != 0);
-	printf("%ld+%d records out\n", (long) (outTotal / blockSize),
-		   (outTotal % blockSize) != 0);
-	return EXIT_SUCCESS;
-  usage:
+	fprintf(statusfp, "%d+%d records in\n", in_full, in_part);
+	fprintf(statusfp, "%d+%d records out\n", out_full, out_part);
 
-	usage(dd_usage);
+	return EXIT_SUCCESS;
 }
diff --git a/include/busybox.h b/include/busybox.h
index 5ff3975..4423525 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -190,6 +190,13 @@ extern char *xstrdup (const char *s);
 #endif
 extern char *xstrndup (const char *s, int n);
 
+struct suffix_mult {
+	char *suffix;
+	int mult;
+};
+
+extern unsigned long parse_number(const char *numstr, struct suffix_mult *suffixes);
+
 
 /* These parse entries in /etc/passwd and /etc/group.  This is desirable
  * for BusyBox since we want to avoid using the glibc NSS stuff, which
diff --git a/tail.c b/tail.c
index 308bb30..5f03818 100644
--- a/tail.c
+++ b/tail.c
@@ -61,6 +61,13 @@ static char verbose = 0;
 
 static off_t units=0;
 
+static struct suffix_mult tail_suffixes[] = {
+	{ "b", 512 },
+	{ "k", 1024 },
+	{ "m", 1048576 },
+	{ NULL, 0 }
+};
+
 static int tail_stream(int fd)
 {
 	ssize_t startpoint;
@@ -170,32 +177,6 @@ int tail_main(int argc, char **argv)
 
 		switch (opt) {
 #ifndef BB_FEATURE_SIMPLE_TAIL
-		case 'c':
-			unit_type = BYTES;
-			test = atoi(optarg);
-			if(test==0)
-				usage(tail_usage);
-			if(optarg[strlen(optarg)-1]>'9') {
-				switch (optarg[strlen(optarg)-1]) {
-				case 'b':
-					test *= 512;
-					break;
-				case 'k':
-					test *= 1024;
-					break;
-				case 'm':
-					test *= (1024 * 1024);
-					break;
-				default:
-					fprintf(stderr,"Size must be b,k, or m.");
-					usage(tail_usage);
-				}
-			}
-			if(optarg[0]=='+')
-				units=test+1;
-			else
-				units=-(test+1);
-			break;
 		case 'q':
 			show_headers = 0;
 			break;
@@ -207,15 +188,12 @@ int tail_main(int argc, char **argv)
 		case 'v':
 			verbose = 1;
 			break;
+		case 'c':
+			unit_type = BYTES;
+			/* FALLS THROUGH */
 #endif
-		case 'f':
-			follow = 1;
-			break;
-		case 'h':
-			usage(tail_usage);
-			break;
 		case 'n':
-			test = atoi(optarg);
+			test = parse_number(optarg, tail_suffixes);
 			if (test) {
 				if (optarg[0] == '+')
 					units = test;
@@ -224,8 +202,10 @@ int tail_main(int argc, char **argv)
 			} else
 				usage(tail_usage);
 			break;
+		case 'f':
+			follow = 1;
+			break;
 		default:
-			error_msg("\nUnknown arg: %c.\n\n",optopt);
 			usage(tail_usage);
 		}
 	}
diff --git a/usage.c b/usage.c
index 876d253..c7bc0e8 100644
--- a/usage.c
+++ b/usage.c
@@ -170,10 +170,11 @@ const char dd_usage[] =
 	"\tcount=N\tcopy only N input blocks\n"
 	"\tskip=N\tskip N input blocks\n"
 	"\tseek=N\tskip N output blocks\n"
-	"\tconv=notrunc\t dont truncate of at end of write\n"
-	"\tconv=sync\t pad the last block with zeros until blocksize\n"
+	"\tconv=notrunc\tdon't truncate output file\n"
+	"\tconv=sync\tpad blocks with zeros\n"
 	"\n"
-	"Numbers may be suffixed by w (x2), k (x1024), b (x512), or M (x1024^2)\n"
+	"Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n"
+	"MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824).\n"
 #endif
 	;
 #endif
@@ -1185,20 +1186,20 @@ const char syslogd_usage[] =
 
 #if defined BB_TAIL
 const char tail_usage[] =
-	"tail [OPTION] [FILE]...\n"
+	"tail [OPTION]... [FILE]...\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
 	"\nPrint last 10 lines of each FILE to standard output.\n"
 	"With more than one FILE, precede each with a header giving the\n"
 	"file name. With no FILE, or when FILE is -, read standard input.\n\n"
 	"Options:\n"
 #ifndef BB_FEATURE_SIMPLE_TAIL
-	"\t-c=N[kbm]\toutput the last N bytes\n"
+	"\t-c N[kbm]\toutput the last N bytes\n"
 #endif
-	"\t-n NUM\t\tPrint last NUM lines instead of first 10\n"
-	"\t-f\t\tOutput data as the file grows.\n"
+	"\t-n N[kbm]\tprint last N lines instead of last 10\n"
+	"\t-f\t\toutput data as the file grows\n"
 #ifndef BB_FEATURE_SIMPLE_TAIL
 	"\t-q\t\tnever output headers giving file names\n"
-	"\t-s SEC\t\tWait SEC seconds between reads with -f\n"
+	"\t-s SEC\t\twait SEC seconds between reads with -f\n"
 	"\t-v\t\talways output headers giving file names\n\n"
 	"If the first character of N (bytes or lines) is a `+', output begins with \n"
 	"the Nth item from the start of each file, otherwise, print the last N items\n"
diff --git a/utility.c b/utility.c
index 794a928..34341c8 100644
--- a/utility.c
+++ b/utility.c
@@ -562,10 +562,9 @@ int full_write(int fd, const char *buf, int len)
 
 	return total;
 }
-#endif /* BB_TAR || BB_CP_MV || BB_AR */
-
+#endif
 
-#if defined BB_TAR || defined BB_TAIL || defined BB_AR || defined BB_SH || defined BB_CP_MV || defined BB_DD
+#if defined BB_AR || defined BB_CP_MV || defined BB_SH || defined BB_TAR
 /*
  * Read all of the supplied buffer from a file.
  * This does multiple reads as necessary.
@@ -1215,58 +1214,6 @@ extern struct mntent *find_mount_point(const char *name, const char *table)
 }
 #endif							/* BB_DF || BB_MTAB */
 
-
-
-#if defined BB_DD || defined BB_TAIL
-/*
- * Read a number with a possible multiplier.
- * Returns -1 if the number format is illegal.
- */
-extern long atoi_w_units(const char *cp)
-{
-	long value;
-
-	if (!is_decimal(*cp))
-		return -1;
-
-	value = 0;
-
-	while (is_decimal(*cp))
-		value = value * 10 + *cp++ - '0';
-
-	switch (*cp++) {
-	case 'M':
-	case 'm':					/* `tail' uses it traditionally */
-		value *= 1048576;
-		break;
-
-	case 'k':
-		value *= 1024;
-		break;
-
-	case 'b':
-		value *= 512;
-		break;
-
-	case 'w':
-		value *= 2;
-		break;
-
-	case '\0':
-		return value;
-
-	default:
-		return -1;
-	}
-
-	if (*cp)
-		return -1;
-
-	return value;
-}
-#endif							/* BB_DD || BB_TAIL */
-
-
 #if defined BB_INIT || defined BB_SYSLOGD 
 /* try to open up the specified device */
 extern int device_open(char *device, int mode)
@@ -1313,11 +1260,11 @@ extern pid_t* find_pid_by_name( char* pidName)
 	/* open device */ 
 	fd = open(device, O_RDONLY);
 	if (fd < 0)
-		perror_msg_and_die( "open failed for `%s'", device);
+		perror_msg_and_die("open failed for `%s'", device);
 
 	/* Find out how many processes there are */
 	if (ioctl (fd, DEVPS_GET_NUM_PIDS, &num_pids)<0) 
-		perror_msg_and_die( "\nDEVPS_GET_PID_LIST");
+		perror_msg_and_die("\nDEVPS_GET_PID_LIST");
 	
 	/* Allocate some memory -- grab a few extras just in case 
 	 * some new processes start up while we wait. The kernel will
@@ -1328,7 +1275,7 @@ extern pid_t* find_pid_by_name( char* pidName)
 
 	/* Now grab the pid list */
 	if (ioctl (fd, DEVPS_GET_PID_LIST, pid_array)<0) 
-		perror_msg_and_die( "\nDEVPS_GET_PID_LIST");
+		perror_msg_and_die("\nDEVPS_GET_PID_LIST");
 
 	/* Now search for a match */
 	for (i=1, j=0; i<pid_array[0] ; i++) {
@@ -1337,7 +1284,7 @@ extern pid_t* find_pid_by_name( char* pidName)
 
 	    info.pid = pid_array[i];
 	    if (ioctl (fd, DEVPS_GET_PID_INFO, &info)<0)
-			perror_msg_and_die( "\nDEVPS_GET_PID_INFO");
+			perror_msg_and_die("\nDEVPS_GET_PID_INFO");
 
 		/* Make sure we only match on the process name */
 		p=info.command_line+1;
@@ -1361,7 +1308,7 @@ extern pid_t* find_pid_by_name( char* pidName)
 
 	/* close device */
 	if (close (fd) != 0) 
-		perror_msg_and_die( "close failed for `%s'", device);
+		perror_msg_and_die("close failed for `%s'", device);
 
 	return pidList;
 }
@@ -1387,7 +1334,7 @@ extern pid_t* find_pid_by_name( char* pidName)
 
 	dir = opendir("/proc");
 	if (!dir)
-		perror_msg_and_die( "Cannot open /proc");
+		perror_msg_and_die("Cannot open /proc");
 	
 	while ((next = readdir(dir)) != NULL) {
 		FILE *status;
@@ -1791,7 +1738,34 @@ int applet_name_compare(const void *x, const void *y)
 	return strcmp(applet1->name, applet2->name);
 }
 
-#if defined BB_NC
+#if defined BB_DD || defined BB_TAIL
+unsigned long parse_number(const char *numstr, struct suffix_mult *suffixes)
+{
+	struct suffix_mult *sm;
+	unsigned long int ret;
+	int len;
+	char *end;
+	
+	ret = strtoul(numstr, &end, 10);
+	if (numstr == end)
+		error_msg_and_die("invalid number `%s'\n", numstr);
+	while (end[0] != '\0') {
+		for (sm = suffixes; sm->suffix != NULL; sm++) {
+			len = strlen(sm->suffix);
+			if (strncmp(sm->suffix, end, len) == 0) {
+				ret *= sm->mult;
+				end += len;
+				break;
+			}
+		}
+		if (sm->suffix == NULL)
+			error_msg_and_die("invalid number `%s'\n", numstr);
+	}
+	return ret;
+}
+#endif
+
+#if defined BB_DD || defined BB_NC
 ssize_t safe_read(int fd, void *buf, size_t count)
 {
 	ssize_t n;