aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-01-30 22:24:32 +0000
committerEric Andersen <andersen@codepoet.org>2004-01-30 22:24:32 +0000
commitab26cc3d8aec8267aaa1319a3f2cfa11c6bf41d2 (patch)
treed5fc10c4d980b28595538ec6f9055bf320b007cf
parentebce2daa6045c8893897bd5874065ee9b372f46d (diff)
downloadbusybox-w32-ab26cc3d8aec8267aaa1319a3f2cfa11c6bf41d2.tar.gz
busybox-w32-ab26cc3d8aec8267aaa1319a3f2cfa11c6bf41d2.tar.bz2
busybox-w32-ab26cc3d8aec8267aaa1319a3f2cfa11c6bf41d2.zip
Avoid symbol naming conflict with libm
-rw-r--r--coreutils/dd.c8
1 files changed, 4 insertions, 4 deletions
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)
57 off_t skip = 0; 57 off_t skip = 0;
58 int sync_flag = FALSE; 58 int sync_flag = FALSE;
59 int noerror = FALSE; 59 int noerror = FALSE;
60 int trunc = TRUE; 60 int trunc_flag = TRUE;
61 int oflag; 61 int oflag;
62 int ifd; 62 int ifd;
63 int ofd; 63 int ofd;
@@ -83,7 +83,7 @@ int dd_main(int argc, char **argv)
83 buf = argv[i]+5; 83 buf = argv[i]+5;
84 while (1) { 84 while (1) {
85 if (strncmp("notrunc", buf, 7) == 0) { 85 if (strncmp("notrunc", buf, 7) == 0) {
86 trunc = FALSE; 86 trunc_flag = FALSE;
87 buf += 7; 87 buf += 7;
88 } else if (strncmp("sync", buf, 4) == 0) { 88 } else if (strncmp("sync", buf, 4) == 0) {
89 sync_flag = TRUE; 89 sync_flag = TRUE;
@@ -115,7 +115,7 @@ int dd_main(int argc, char **argv)
115 if (outfile != NULL) { 115 if (outfile != NULL) {
116 oflag = O_WRONLY | O_CREAT; 116 oflag = O_WRONLY | O_CREAT;
117 117
118 if (!seek && trunc) { 118 if (!seek && trunc_flag) {
119 oflag |= O_TRUNC; 119 oflag |= O_TRUNC;
120 } 120 }
121 121
@@ -123,7 +123,7 @@ int dd_main(int argc, char **argv)
123 bb_perror_msg_and_die("%s", outfile); 123 bb_perror_msg_and_die("%s", outfile);
124 } 124 }
125 125
126 if (seek && trunc) { 126 if (seek && trunc_flag) {
127 if (ftruncate(ofd, seek * bs) < 0) { 127 if (ftruncate(ofd, seek * bs) < 0) {
128 struct stat st; 128 struct stat st;
129 129