Move start_stop_daemon to debianutils.

[oweals/busybox.git] / coreutils / dos2unix.c

diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index e110680c387e5c9c839f21c5c5905c11ff652045..c28e6a8b99d77ad875581ef5ba4601b37c158667 100644 (file)
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -30,14 +30,22 @@
 #include <string.h>
 #include <getopt.h>
 #include <unistd.h>
+#include <stdint.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include "busybox.h"
 
-/* Teach older glibc and libc5 what a uint64_t is */
-#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 3)
-typedef unsigned long int       uint64_t;
-#endif
+#define CT_AUTO         0
+#define CT_UNIX2DOS     1
+#define CT_DOS2UNIX     2
+
+/* We are making a lame pseudo-random string generator here.  in
+ * convert(), each pass through the while loop will add more and more
+ * stuff into value, which is _supposed_ to wrap.  We don't care about
+ * it being accurate.  We care about it being messy, since we then mod
+ * it by the sizeof(letters) and then use that as an index into letters
+ * to pick a random letter to add to out temporary file. */
+typedef unsigned long int bb_uint64_t;
 
 static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -47,24 +55,22 @@ static int convert(char *fn, int ConvType)
        int c, fd;
        struct timeval tv;
        char tempFn[BUFSIZ];
-       static uint64_t value=0;
+       static bb_uint64_t value=0;
        FILE *in = stdin, *out = stdout;
 
        if (fn != NULL) {
-               if ((in = wfopen(fn, "rw")) == NULL) {
-                       return -1;
-               }
-               strcpy(tempFn, fn);
+               in = bb_xfopen(fn, "rw");
+               safe_strncpy(tempFn, fn, sizeof(tempFn));
                c = strlen(tempFn);
                tempFn[c] = '.';
                while(1) {
                    if (c >=BUFSIZ)
-                       error_msg_and_die("unique name not found");
+                       bb_error_msg_and_die("unique name not found");
                    /* Get some semi random stuff to try and make a
                     * random filename based (and in the same dir as)
                     * the input file... */
                    gettimeofday (&tv, NULL);
-                   value += ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid ();
+                   value += ((bb_uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid ();
                    tempFn[++c] = letters[value % 62];
                    tempFn[c+1] = '\0';
                    value /= 62;
@@ -88,7 +94,7 @@ static int convert(char *fn, int ConvType)
                                // file is alredy in DOS format so it is not necessery to touch it
                                remove(tempFn);
                                if (fclose(in) < 0 || fclose(out) < 0) {
-                                       perror_msg(NULL);
+                                       bb_perror_nomsg();
                                        return -2;
                                }
                                return 0;
@@ -102,7 +108,7 @@ static int convert(char *fn, int ConvType)
                                // file is alredy in UNIX format so it is not necessery to touch it
                                remove(tempFn);
                                if ((fclose(in) < 0) || (fclose(out) < 0)) {
-                                       perror_msg(NULL);
+                                       bb_perror_nomsg();
                                        return -2;
                                }
                                return 0;
@@ -133,14 +139,16 @@ static int convert(char *fn, int ConvType)
 
        if (fn != NULL) {
            if (fclose(in) < 0 || fclose(out) < 0) {
-               perror_msg(NULL);
+               bb_perror_nomsg();
                remove(tempFn);
                return -2;
            }
 
-           /* Assume they are both on the same filesystem */
+           /* 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(tempFn, fn) < 0) {
-               perror_msg("unable to rename '%s' as '%s'", tempFn, fn);
+               bb_perror_msg("unable to rename '%s' as '%s'", tempFn, fn);
                return -1;
            }
        }
@@ -171,7 +179,7 @@ int dos2unix_main(int argc, char *argv[])
                        ConvType = CT_DOS2UNIX;
                        break;
                default:
-                       show_usage();
+                       bb_show_usage();
                }
        }