svn commit: branches/busybox_scratch/coreutils

[aldot at busybox.net]

Author: aldot
Date: 2006-08-20 04:20:06 -0700 (Sun, 20 Aug 2006)
New Revision: 15838

Log:
- cleanup dd: make some warnings go away. No objcode changes.


Modified:
   branches/busybox_scratch/coreutils/dd.c


Changeset:
Modified: branches/busybox_scratch/coreutils/dd.c
===================================================================
--- branches/busybox_scratch/coreutils/dd.c	2006-08-20 11:17:22 UTC (rev 15837)
+++ branches/busybox_scratch/coreutils/dd.c	2006-08-20 11:20:06 UTC (rev 15838)
@@ -36,20 +36,19 @@
 
 int dd_main(int argc, char **argv)
 {
-	size_t count = -1, oc = 0, ibs = 512, obs = 512;
-	ssize_t n;
-	off_t seek = 0, skip = 0;
 #define sync_flag	(1<<0)
 #define noerror		(1<<1)
 #define trunc_flag	(1<<2)
 #define twobufs_flag (1<<3)
 	int flags = trunc_flag;
-	int oflag, ifd, ofd, i;
+	size_t count = -1, oc = 0, ibs = 512, obs = 512;
+	ssize_t n;
+	off_t seek = 0, skip = 0;
+	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));
@@ -59,27 +58,27 @@
 		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);
+	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[i], 4)) {
-			obs = bb_xparse_number(argv[i]+4, dd_suffixes);
+		} 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[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;
+		} 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)) {
 					flags ^= trunc_flag;
@@ -91,7 +90,7 @@
 					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++;
@@ -159,9 +158,8 @@
 		}
 
 		n = safe_read(ifd, ibuf, ibs);
-		if (n == 0) {
+		if (n == 0)
 			break;
-		}
 		if (n < 0) {
 			if (flags & noerror) {
 				n = ibs;