fix no previous prototype warning

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

diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 57d4e83717670c95f6b2b8c921cc6eec013dfd96..bf03252ac1a226ba0e3679f98f8ba6afa56029a2 100644 (file)
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -1,34 +1,22 @@
 /*
- *  GPLv2
  *  Copyright 2003, Glenn McGrath <bug1@iinet.net.au>
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as published
- *  by the Free Software Foundation; either version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  *  Based on specification from
  *  http://www.opengroup.org/onlinepubs/007904975/utilities/uuencode.html
  *
- *  Bugs: the spec doesnt mention anything about "`\n`\n" prior to the "end" line
+ *  Bugs: the spec doesn't mention anything about "`\n`\n" prior to the
+ *        "end" line
  */
 
 
 #include <stdio.h>
 #include <errno.h>
-#include <getopt.h>
+#include <getopt.h> /* optind */
 #include <string.h>
 #include <stdlib.h>
-
-#include "libbb.h"
+#include "busybox.h"
 
 static int read_stduu(FILE *src_stream, FILE *dst_stream)
 {
@@ -53,27 +41,27 @@ static int read_stduu(FILE *src_stream, FILE *dst_stream)
 
                line_ptr++;
                /* Tolerate an overly long line to acomadate a possible exta '`' */
-               if (strlen(line_ptr) < length) {
+               if (strlen(line_ptr) < (size_t)length) {
                        bb_error_msg_and_die("Short file");
                }
 
-               while (length > 0) {
+               while (length > 0) {
                        /* Merge four 6 bit chars to three 8 bit chars */
-                   fputc(((line_ptr[0] - 0x20) & 077) << 2 | ((line_ptr[1] - 0x20) & 077) >> 4, dst_stream);
+                       fputc(((line_ptr[0] - 0x20) & 077) << 2 | ((line_ptr[1] - 0x20) & 077) >> 4, dst_stream);
                        line_ptr++;
                        length--;
                        if (length == 0) {
                                break;
                        }
 
-                       fputc(((line_ptr[0] - 0x20) & 077) << 4 | ((line_ptr[1] - 0x20) & 077) >> 2, dst_stream);
+                       fputc(((line_ptr[0] - 0x20) & 077) << 4 | ((line_ptr[1] - 0x20) & 077) >> 2, dst_stream);
                        line_ptr++;
                        length--;
                        if (length == 0) {
                                break;
                        }
 
-                       fputc(((line_ptr[0] - 0x20) & 077) << 6 | ((line_ptr[1] - 0x20) & 077), dst_stream);
+                       fputc(((line_ptr[0] - 0x20) & 077) << 6 | ((line_ptr[1] - 0x20) & 077), dst_stream);
                        line_ptr += 2;
                        length -= 2;
                }
@@ -84,7 +72,7 @@ static int read_stduu(FILE *src_stream, FILE *dst_stream)
 
 static int read_base64(FILE *src_stream, FILE *dst_stream)
 {
-       const char *base64_table =
+       static const char base64_table[] =
                "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n";
        char term_count = 0;
 
@@ -94,7 +82,7 @@ static int read_base64(FILE *src_stream, FILE *dst_stream)
 
                while (count < 4) {
                        char *table_ptr;
-                       char ch;
+                       int ch;
 
                        /* Get next _valid_ character */
                        do {
@@ -131,15 +119,15 @@ static int read_base64(FILE *src_stream, FILE *dst_stream)
                /* Merge 6 bit chars to 8 bit */
            fputc(translated[0] << 2 | translated[1] >> 4, dst_stream);
                if (count > 2) {
-                       fputc(translated[1] << 4 | translated[2] >> 2, dst_stream);
+                       fputc(translated[1] << 4 | translated[2] >> 2, dst_stream);
                }
                if (count > 3) {
-                       fputc(translated[2] << 6 | translated[3], dst_stream);
+                       fputc(translated[2] << 6 | translated[3], dst_stream);
                }
        }
 }
 
-extern int uudecode_main(int argc, char **argv)
+int uudecode_main(int argc, char **argv)
 {
        int (*decode_fn_ptr) (FILE * src, FILE * dst);
        FILE *src_stream;