Fix the pwd and group functions. The bb_ stuff was a leftover from

[oweals/busybox.git] / uuencode.c

diff --git a/uuencode.c b/uuencode.c
index 8d15adbf6d87b58d9303cfd642401303c91d506f..5df49026b4f658e45d850efa179a3386c6ca769b 100644 (file)
--- a/uuencode.c
+++ b/uuencode.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <getopt.h>
-#include <pwd.h>
+#include <stdlib.h>
 
 #define        RW (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
 
@@ -142,7 +142,7 @@ static void encode()
   }
 
   if (ferror (stdin))
-    errorMsg("Read error\n");
+    error_msg("Read error\n");
 
   if (trans_ptr == uu_std) {
     putchar (ENC ('\0'));
@@ -160,15 +160,12 @@ int uuencode_main (int argc,
   trans_ptr = uu_std;      /* Standard encoding is old uu format */
 
   /* Parse any options */
-  while ((opt = getopt (argc, argv, "m")) != EOF) {
+  while ((opt = getopt (argc, argv, "m")) > 0) {
     switch (opt) {
      case 'm':
       trans_ptr = uu_base64;
       break;
 
-     case 0:
-      break;
-
      default:
       usage(uuencode_usage);
     }
@@ -178,7 +175,7 @@ int uuencode_main (int argc,
    case 2:
     /* Optional first argument is input file.  */
     if (!freopen (argv[optind], "r", stdin) || fstat (fileno (stdin), &sb)) {
-      errorMsg("%s: %s\n", argv[optind], strerror(errno));
+      perror_msg("%s", argv[optind]);
       return EXIT_FAILURE;
     }
     mode = sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
@@ -199,7 +196,7 @@ int uuencode_main (int argc,
   encode();
   printf(trans_ptr == uu_std ? "end\n" : "====\n");
   if (ferror (stdout)) {
-    errorMsg("Write error\n");
+    error_msg("Write error\n");
     return EXIT_FAILURE;
   }
   return EXIT_SUCCESS;