From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 30 Jan 2004 22:24:32 +0000 (-0000)
Subject: Avoid symbol naming conflict with libm
X-Git-Tag: 1_00_pre6~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ab26cc3d8aec8267aaa1319a3f2cfa11c6bf41d2;p=oweals%2Fbusybox.git

Avoid symbol naming conflict with libm
---

diff --git a/coreutils/dd.c b/coreutils/dd.c
index cd97b24ee..9a149e24a 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -57,7 +57,7 @@ int dd_main(int argc, char **argv)
 	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 @@ int dd_main(int argc, char **argv)
 			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 @@ int dd_main(int argc, char **argv)
 	if (outfile != NULL) {
 		oflag = O_WRONLY | O_CREAT;
 
-		if (!seek && trunc) {
+		if (!seek && trunc_flag) {
 			oflag |= O_TRUNC;
 		}
 
@@ -123,7 +123,7 @@ int dd_main(int argc, char **argv)
 			bb_perror_msg_and_die("%s", outfile);
 		}
 
-		if (seek && trunc) {
+		if (seek && trunc_flag) {
 			if (ftruncate(ofd, seek * bs) < 0) {
 				struct stat st;