Patch from Denis Vlasenko turning static const int (which gets emitted into
[oweals/busybox.git] / networking / tftp.c
index f00b64bf29ea19ec1ceb772f84ddad2202b13625..402d5d03c8b0be04969b58a987a5e3ef08928a3b 100644 (file)
@@ -1,34 +1,34 @@
 /* ------------------------------------------------------------------------- */
-/* tftp.c                                                                    */
-/*                                                                           */
-/* A simple tftp client for busybox.                                         */
-/* Tries to follow RFC1350.                                                  */
-/* Only "octet" mode supported.                                              */
+/* tftp.c                                                                  */
+/*                                                                        */
+/* A simple tftp client for busybox.                                    */
+/* Tries to follow RFC1350.                                              */
+/* Only "octet" mode supported.                                              */
 /* Optional blocksize negotiation (RFC2347 + RFC2348)                        */
-/*                                                                           */
+/*                                                                        */
 /* Copyright (C) 2001 Magnus Damm <damm@opensource.se>                       */
-/*                                                                           */
-/* Parts of the code based on:                                               */
-/*                                                                           */
+/*                                                                        */
+/* Parts of the code based on:                                        */
+/*                                                                        */
 /* atftp:  Copyright (C) 2000 Jean-Pierre Lefebvre <helix@step.polymtl.ca>   */
 /*                        and Remi Lefebvre <remi@debian.org>                */
-/*                                                                           */
+/*                                                                        */
 /* utftp:  Copyright (C) 1999 Uwe Ohse <uwe@ohse.de>                         */
-/*                                                                           */
+/*                                                                        */
 /* This program is free software; you can redistribute it and/or modify      */
 /* it under the terms of the GNU General Public License as published by      */
 /* the Free Software Foundation; either version 2 of the License, or         */
 /* (at your option) any later version.                                       */
-/*                                                                           */
+/*                                                                        */
 /* 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          */
 /* 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   */
-/*                                                                           */
+/*                                                                        */
 /* ------------------------------------------------------------------------- */
 
 #include <stdio.h>
@@ -60,7 +60,7 @@
 #define TFTP_ERROR 5
 #define TFTP_OACK  6
 
-static const char *tftp_bb_error_msg[] = {
+static const char * const tftp_bb_error_msg[] = {
        "Undefined error",
        "File not found",
        "Access violation",
@@ -71,20 +71,29 @@ static const char *tftp_bb_error_msg[] = {
        "No such user"
 };
 
-const int tftp_cmd_get = 1;
-const int tftp_cmd_put = 2;
+#ifdef CONFIG_FEATURE_TFTP_GET
+# define tftp_cmd_get 1
+#else
+# define tftp_cmd_get 0
+#endif
+#ifdef CONFIG_FEATURE_TFTP_PUT
+# define tftp_cmd_put (tftp_cmd_get+1)
+#else
+# define tftp_cmd_put 0
+#endif
+
 
 #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
 
-static int tftp_blocksize_check(int blocksize, int bufsize)  
+static int tftp_blocksize_check(int blocksize, int bufsize)
 {
-        /* Check if the blocksize is valid: 
+       /* Check if the blocksize is valid:
         * RFC2348 says between 8 and 65464,
         * but our implementation makes it impossible
         * to use blocksizes smaller than 22 octets.
         */
 
-        if ((bufsize && (blocksize > bufsize)) || 
+       if ((bufsize && (blocksize > bufsize)) ||
            (blocksize < 8) || (blocksize > 65464)) {
                bb_error_msg("bad blocksize");
                return 0;
@@ -93,12 +102,12 @@ static int tftp_blocksize_check(int blocksize, int bufsize)
        return blocksize;
 }
 
-static char *tftp_option_get(char *buf, int len, char *option)  
+static char *tftp_option_get(char *buf, int len, char *option)
 {
-        int opt_val = 0;
+       int opt_val = 0;
        int opt_found = 0;
        int k;
-  
+
        while (len > 0) {
 
                /* Make sure the options are terminated correctly */
@@ -117,21 +126,21 @@ static char *tftp_option_get(char *buf, int len, char *option)
                        if (strcasecmp(buf, option) == 0) {
                                opt_found = 1;
                        }
-               }      
+               }
                else {
                        if (opt_found) {
                                return buf;
                        }
                }
-    
+
                k++;
-               
+
                buf += k;
                len -= k;
-               
+
                opt_val ^= 1;
        }
-       
+
        return NULL;
 }
 
@@ -207,7 +216,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
                if ((cmd_get && (opcode == TFTP_RRQ)) ||
                        (cmd_put && (opcode == TFTP_WRQ))) {
-                        int too_long = 0; 
+                       int too_long = 0;
 
                        /* see if the filename fits into buf */
                        /* and fill in packet                */
@@ -267,7 +276,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
                        block_nr++;
 
                        if (cmd_put && (opcode == TFTP_DATA)) {
-                               len = read(localfd, cp, tftp_bufsize - 4);
+                               len = bb_full_read(localfd, cp, tftp_bufsize - 4);
 
                                if (len < 0) {
                                        bb_perror_msg("read");
@@ -294,7 +303,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
 #ifdef CONFIG_FEATURE_TFTP_DEBUG
                        fprintf(stderr, "sending %u bytes\n", len);
                        for (cp = buf; cp < &buf[len]; cp++)
-                               fprintf(stderr, "%02x ", *cp);
+                               fprintf(stderr, "%02x ", (unsigned char)*cp);
                        fprintf(stderr, "\n");
 #endif
                        if (sendto(socketfd, buf, len, 0,
@@ -320,7 +329,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
                        FD_ZERO(&rfds);
                        FD_SET(socketfd, &rfds);
 
-                       switch (select(FD_SETSIZE, &rfds, NULL, NULL, &tv)) {
+                       switch (select(socketfd + 1, &rfds, NULL, NULL, &tv)) {
                        case 1:
                                len = recvfrom(socketfd, buf, tftp_bufsize, 0,
                                                (struct sockaddr *) &from, &fromlen);
@@ -375,15 +384,15 @@ static inline int tftp(const int cmd, const struct hostent *host,
 #endif
 
                if (opcode == TFTP_ERROR) {
-                       char *msg = NULL;
+                       const char *msg = NULL;
 
                        if (buf[4] != '\0') {
                                msg = &buf[4];
                                buf[tftp_bufsize - 1] = '\0';
-                       } else if (tmp < (sizeof(tftp_bb_error_msg) 
+                       } else if (tmp < (sizeof(tftp_bb_error_msg)
                                          / sizeof(char *))) {
 
-                               msg = (char *) tftp_bb_error_msg[tmp];
+                               msg = tftp_bb_error_msg[tmp];
                        }
 
                        if (msg) {
@@ -404,12 +413,12 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
                                 char *res;
 
-                                res = tftp_option_get(&buf[2], len-2, 
+                                res = tftp_option_get(&buf[2], len-2,
                                                       "blksize");
 
                                 if (res) {
                                         int blksize = atoi(res);
-                            
+
                                         if (tftp_blocksize_check(blksize,
                                                           tftp_bufsize - 4)) {
 
@@ -443,8 +452,8 @@ static inline int tftp(const int cmd, const struct hostent *host,
                if (cmd_get && (opcode == TFTP_DATA)) {
 
                        if (tmp == block_nr) {
-                           
-                               len = write(localfd, &buf[4], len - 4);
+
+                               len = bb_full_write(localfd, &buf[4], len - 4);
 
                                if (len < 0) {
                                        bb_perror_msg("write");
@@ -458,6 +467,17 @@ static inline int tftp(const int cmd, const struct hostent *host,
                                opcode = TFTP_ACK;
                                continue;
                        }
+                       /* in case the last ack disappeared into the ether */
+                       if ( tmp == (block_nr - 1) ) {
+                               --block_nr;
+                               opcode = TFTP_ACK;
+                               continue;
+                       } else if (tmp + 1 == block_nr) {
+                               /* Server lost our TFTP_ACK.  Resend it */
+                               block_nr = tmp;
+                               opcode = TFTP_ACK;
+                               continue;
+                       }
                }
 
                if (cmd_put && (opcode == TFTP_ACK)) {
@@ -476,7 +496,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
 #ifdef CONFIG_FEATURE_CLEAN_UP
        close(socketfd);
 
-        free(buf);
+       free(buf);
 #endif
 
        return finished ? EXIT_SUCCESS : EXIT_FAILURE;
@@ -485,84 +505,87 @@ static inline int tftp(const int cmd, const struct hostent *host,
 int tftp_main(int argc, char **argv)
 {
        struct hostent *host = NULL;
-       char *localfile = NULL;
-       char *remotefile = NULL;
+       const char *localfile = NULL;
+       const char *remotefile = NULL;
        int port;
        int cmd = 0;
        int fd = -1;
        int flags = 0;
-       int opt;
        int result;
        int blocksize = TFTP_BLOCKSIZE_DEFAULT;
 
        /* figure out what to pass to getopt */
 
 #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
+       char *sblocksize = NULL;
 #define BS "b:"
+#define BS_ARG , &sblocksize
 #else
 #define BS
+#define BS_ARG
 #endif
 
 #ifdef CONFIG_FEATURE_TFTP_GET
 #define GET "g"
+#define GET_COMPL ":g"
 #else
-#define GET 
+#define GET
+#define GET_COMP
 #endif
 
 #ifdef CONFIG_FEATURE_TFTP_PUT
 #define PUT "p"
+#define PUT_COMPL ":p"
 #else
-#define PUT 
+#define PUT
+#define PUT_COMPL
 #endif
 
-       while ((opt = getopt(argc, argv, BS GET PUT "l:r:")) != -1) {
-               switch (opt) {
+#if defined(CONFIG_FEATURE_TFTP_GET) && defined(CONFIG_FEATURE_TFTP_PUT)
+       bb_opt_complementally = GET_COMPL PUT_COMPL ":?g--p:p--g";
+#elif defined(CONFIG_FEATURE_TFTP_GET) || defined(CONFIG_FEATURE_TFTP_PUT)
+       bb_opt_complementally = GET_COMPL PUT_COMPL;
+#else
+       /* XXX: may be should #error ? */
+#endif
+
+
+       cmd = bb_getopt_ulflags(argc, argv, GET PUT "l:r:" BS,
+                               &localfile, &remotefile BS_ARG);
 #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
-               case 'b':
-                       blocksize = atoi(optarg);
-                       if (!tftp_blocksize_check(blocksize, 0)) {
-                                return EXIT_FAILURE;
-                       }
-                       break;
+       if(sblocksize) {
+               blocksize = atoi(sblocksize);
+               if (!tftp_blocksize_check(blocksize, 0)) {
+                       return EXIT_FAILURE;
+               }
+       }
 #endif
+
+       cmd &= (tftp_cmd_get | tftp_cmd_put);
 #ifdef CONFIG_FEATURE_TFTP_GET
-               case 'g':
-                       cmd = tftp_cmd_get;
-                       flags = O_WRONLY | O_CREAT;
-                       break;
+       if(cmd == tftp_cmd_get)
+               flags = O_WRONLY | O_CREAT | O_TRUNC;
 #endif
 #ifdef CONFIG_FEATURE_TFTP_PUT
-               case 'p':
-                       cmd = tftp_cmd_put;
-                       flags = O_RDONLY;
-                       break;
+       if(cmd == tftp_cmd_put)
+               flags = O_RDONLY;
 #endif
-               case 'l': 
-                       localfile = bb_xstrdup(optarg);
-                       break;
-               case 'r':
-                       remotefile = bb_xstrdup(optarg);
-                       break;
-               }
-       }
 
-       if ((cmd == 0) || (optind == argc)) {
-               bb_show_usage();
-       }
-       if(localfile && strcmp(localfile, "-") == 0) {
-           fd = fileno((cmd==tftp_cmd_get)? stdout : stdin);
-       }
        if(localfile == NULL)
            localfile = remotefile;
        if(remotefile == NULL)
            remotefile = localfile;
-       if (fd==-1) {
+       /* XXX: I corrected this, but may be wrong too. vodz */
+       if(localfile==NULL || strcmp(localfile, "-") == 0) {
+           fd = fileno((cmd==tftp_cmd_get)? stdout : stdin);
+       } else if (fd==-1) {
            fd = open(localfile, flags, 0644);
        }
        if (fd < 0) {
                bb_perror_msg_and_die("local file");
        }
 
+       /* XXX: argv[optind] and/or argv[optind + 1] may be NULL! */
        host = xgethostbyname(argv[optind]);
        port = bb_lookup_port(argv[optind + 1], "udp", 69);
 
@@ -576,7 +599,7 @@ int tftp_main(int argc, char **argv)
        result = tftp(cmd, host, remotefile, fd, port, blocksize);
 
 #ifdef CONFIG_FEATURE_CLEAN_UP
-       if (!(fd == fileno(stdout) || fd == fileno(stdin))) {
+       if (!(fd == STDOUT_FILENO || fd == STDIN_FILENO)) {
            close(fd);
        }
 #endif