X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fdos2unix.c;h=5bf16e5af99c4127f16c98cfaf55cb2b478294f1;hb=5929edc1fac4340f99ed84e92bf3a2bedd4177c2;hp=c9f783f1a6c5e675f55827e1ca491eaf7a5560cd;hpb=3570a34de46b1f7dedd16999bb1687e2d6b55d40;p=oweals%2Fbusybox.git

diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index c9f783f1a..5bf16e5af 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -1,45 +1,119 @@
+/* vi: set sw=4 ts=4: */
 /*
-    Mini dos2unix implementation for busybox
- 
-    Copyright 1994,1995  Patrick Volkerding, Moorhead, Minnesota USA
-    All rights reserved.
-
- Redistribution and use of this source code, with or without modification, is
- permitted provided that the following condition is met:
-
- 1. Redistributions of this source code must retain the above copyright
-    notice, this condition, and the following disclaimer.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * dos2unix for BusyBox
+ *
+ * dos2unix '\n' convertor 0.5.0
+ * based on Unix2Dos 0.9.0 by Peter Hanecak (made 19.2.1997)
+ * Copyright 1997,.. by Peter Hanecak <hanecak@megaloman.sk>.
+ * All rights reserved.
+ *
+ * dos2unix filters reading input from stdin and writing output to stdout.
+ *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
 */
 
+#include <string.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <fcntl.h>
 #include "busybox.h"
-#include <stdio.h>
-
-int dos2unix_main( int argc, char **argv ) {
- 	int c;
-	if (argc > 1) {
-	        c = *argv[1];
-		if (c == '-') {
-                usage(dos2unix_usage);
-		} 
+
+enum ConvType {
+	CT_UNIX2DOS = 1,
+	CT_DOS2UNIX
+} ConvType;
+
+/* if fn is NULL then input is stdin and output is stdout */
+static int convert(char *fn)
+{
+	FILE *in, *out;
+	int i;
+
+	if (fn != NULL) {
+		in = bb_xfopen(fn, "rw");
+		/*
+		   The file is then created with mode read/write and
+		   permissions 0666 for glibc 2.0.6 and earlier or
+		   0600  for glibc  2.0.7 and  later.
+		 */
+		snprintf(bb_common_bufsiz1, sizeof(bb_common_bufsiz1), "%sXXXXXX", fn);
+		/*
+		   sizeof bb_common_bufsiz1 is 4096, so it should be big enough to
+		   hold the full path.  However if the output is truncated the
+		   subsequent call to mkstemp would fail.
+		 */
+		if ((i = mkstemp(&bb_common_bufsiz1[0])) == -1
+			|| chmod(bb_common_bufsiz1, 0600) == -1) {
+			bb_perror_nomsg_and_die();
+		}
+		out = fdopen(i, "w+");
+		if (!out) {
+			close(i);
+			remove(bb_common_bufsiz1);
+		}
+	} else {
+		in = stdin;
+		out = stdout;
+	}
+
+	while ((i = fgetc(in)) != EOF) {
+		if (i == '\r')
+			continue;
+		if (i == '\n') {
+			if (ConvType == CT_UNIX2DOS)
+				fputc('\r', out);
+			fputc('\n', out);
+			continue;
+		}
+		fputc(i, out);
+	}
+
+	if (fn != NULL) {
+		if (fclose(in) < 0 || fclose(out) < 0) {
+			bb_perror_nomsg();
+			remove(bb_common_bufsiz1);
+			return -2;
+		}
+		/* Assume they are both on the same filesystem (which
+		 * should be true since we put them into the same directory
+		 * so we _should_ be ok, but you never know... */
+		if (rename(bb_common_bufsiz1, fn) < 0) {
+			bb_perror_msg("cannot rename '%s' as '%s'", bb_common_bufsiz1, fn);
+			return -1;
+		}
 	}
-	c = getchar();
-	while (c != EOF) {
-		/* Eat any \r's... they shouldn't be here */
-		while (c == '\r') c = getchar();
-		if (c == EOF) break;
-                putchar(c);
-                c = getchar();
-	} 
+
 	return 0;
 }
+
+int dos2unix_main(int argc, char *argv[])
+{
+	int o;
+
+	/* See if we are supposed to be doing dos2unix or unix2dos */
+	if (bb_applet_name[0] == 'd') {
+		ConvType = CT_DOS2UNIX;	/*2 */
+	} else {
+		ConvType = CT_UNIX2DOS;	/*1 */
+	}
+	/* -u and -d are mutally exclusive */
+	bb_opt_complementally = "?:u--d:d--u";
+	/* process parameters */
+	/* -u convert to unix */
+	/* -d convert to dos  */
+	o = bb_getopt_ulflags(argc, argv, "du");
+
+	/* Do the conversion requested by an argument else do the default
+	 * conversion depending on our name.  */
+	if (o)
+		ConvType = o;
+
+	if (optind < argc) {
+		while (optind < argc)
+			if ((o = convert(argv[optind++])) < 0)
+				break;
+	} else
+		o = convert(NULL);
+
+	return o;
+}