svn commit: trunk/busybox/coreutils

[vda at busybox.net]

Author: vda
Date: 2007-04-19 13:16:14 -0700 (Thu, 19 Apr 2007)
New Revision: 18501

Log:
dd: NOEXEC fix
dd: correct wrongly capitalized constant


Modified:
   trunk/busybox/coreutils/dd.c


Changeset:
Modified: trunk/busybox/coreutils/dd.c
===================================================================
--- trunk/busybox/coreutils/dd.c	2007-04-19 20:08:19 UTC (rev 18500)
+++ trunk/busybox/coreutils/dd.c	2007-04-19 20:16:14 UTC (rev 18501)
@@ -98,7 +98,7 @@
 		OP_conv,
 		OP_conv_notrunc,
 		OP_conv_sync,
-		OP_conv_NOERROR,
+		OP_conv_noerror,
 #endif
 	};
 	int flags = TRUNC_FLAG;
@@ -109,6 +109,8 @@
 	const char *infile = NULL, *outfile = NULL;
 	char *ibuf, *obuf;
 
+	memset(&G, 0, sizeof(G)); /* because of NOEXEC */
+
 	if (ENABLE_FEATURE_DD_SIGNAL_HANDLING) {
 		struct sigaction sa;
 
@@ -164,7 +166,7 @@
 						flags &= ~TRUNC_FLAG;
 					if (what == OP_conv_sync)
 						flags |= SYNC_FLAG;
-					if (what == OP_conv_NOERROR)
+					if (what == OP_conv_noerror)
 						flags |= NOERROR;
 					if (!key) /* no ',' left, so this was the last specifier */
 						break;