[BusyBox-cvs] busybox/coreutils dd.c,1.54,1.55

[Erik Andersen]

Update of /var/cvs/busybox/coreutils
In directory nail:/tmp/cvs-serv11309/coreutils

Modified Files:
	dd.c 
Log Message:
Avoid symbol naming conflict with libm


Index: dd.c
===================================================================
RCS file: /var/cvs/busybox/coreutils/dd.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- dd.c	20 Jun 2003 09:01:52 -0000	1.54
+++ dd.c	30 Jan 2004 22:24:32 -0000	1.55
@@ -57,7 +57,7 @@
 	off_t skip = 0;
 	int sync_flag = FALSE;
 	int noerror = FALSE;
-	int trunc = TRUE;
+	int trunc_flag = TRUE;
 	int oflag;
 	int ifd;
 	int ofd;
@@ -83,7 +83,7 @@
 			buf = argv[i]+5;
 			while (1) {
 				if (strncmp("notrunc", buf, 7) == 0) {
-					trunc = FALSE;
+					trunc_flag = FALSE;
 					buf += 7;
 				} else if (strncmp("sync", buf, 4) == 0) {
 					sync_flag = TRUE;
@@ -115,7 +115,7 @@
 	if (outfile != NULL) {
 		oflag = O_WRONLY | O_CREAT;
 
-		if (!seek && trunc) {
+		if (!seek && trunc_flag) {
 			oflag |= O_TRUNC;
 		}
 
@@ -123,7 +123,7 @@
 			bb_perror_msg_and_die("%s", outfile);
 		}
 
-		if (seek && trunc) {
+		if (seek && trunc_flag) {
 			if (ftruncate(ofd, seek * bs) < 0) {
 				struct stat st;