u_short, ulong exterminated
[oweals/busybox.git] / networking / tftp.c
index 9b974778546fe4d8825997402dc16aa501ca11c1..2d28973dc6ed52419bc7bd997f8d36aff8ad6ef4 100644 (file)
@@ -1,58 +1,38 @@
-/* ------------------------------------------------------------------------- */
-/* 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:                                               */
-/*                                                                           */
-/* 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>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <fcntl.h>
+/* vi: set sw=4 ts=4: */
+/* -------------------------------------------------------------------------
+ * 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:
+ *
+ * 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>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * ------------------------------------------------------------------------- */
 
 #include "busybox.h"
 
-//#define CONFIG_FEATURE_TFTP_DEBUG
 
-#define TFTP_BLOCKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */
-#define TFTP_TIMEOUT 5             /* seconds */
+#define TFTP_BLOCKSIZE_DEFAULT 512     /* according to RFC 1350, don't change */
+#define TFTP_TIMEOUT 5 /* seconds */
+#define TFTP_NUM_RETRIES 5 /* number of retries */
 
-/* opcodes we support */
+static const char * const MODE_OCTET = "octet";
+#define MODE_OCTET_LEN 6 /* sizeof(MODE_OCTET)*/
+
+static const char * const OPTION_BLOCKSIZE = "blksize";
+#define OPTION_BLOCKSIZE_LEN 8 /* sizeof(OPTION_BLOCKSIZE) */
 
+/* opcodes we support */
 #define TFTP_RRQ   1
 #define TFTP_WRQ   2
 #define TFTP_DATA  3
@@ -60,7 +40,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,55 +51,60 @@ static const char *tftp_bb_error_msg[] = {
        "No such user"
 };
 
-static const int tftp_cmd_get = 1;
-static const int tftp_cmd_put = 2;
+#define tftp_cmd_get ENABLE_FEATURE_TFTP_GET
+
+#if ENABLE_FEATURE_TFTP_PUT
+# define tftp_cmd_put (tftp_cmd_get+ENABLE_FEATURE_TFTP_PUT)
+#else
+# define tftp_cmd_put 0
+#endif
+
 
-#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
+#if ENABLE_FEATURE_TFTP_BLOCKSIZE
 
 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)) ||
-           (blocksize < 8) || (blocksize > 65464)) {
-               bb_error_msg("bad blocksize");
-               return 0;
+       if ((bufsize && (blocksize > bufsize)) ||
+               (blocksize < 8) || (blocksize > 65564)) {
+               bb_error_msg("bad blocksize");
+               return 0;
        }
 
        return blocksize;
 }
 
-static char *tftp_option_get(char *buf, int len, char *option)
+static char *tftp_option_get(char *buf, int len, const char * const 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 */
+               /* Make sure the options are terminated correctly */
 
-               for (k = 0; k < len; k++) {
-                       if (buf[k] == '\0') {
-                               break;
+               for (k = 0; k < len; k++) {
+                       if (buf[k] == '\0') {
+                               break;
                        }
                }
 
                if (k >= len) {
-                       break;
+                       break;
                }
 
                if (opt_val == 0) {
                        if (strcasecmp(buf, option) == 0) {
-                               opt_found = 1;
+                               opt_found = 1;
                        }
-               }
-               else {
-                       if (opt_found) {
+               } else {
+                       if (opt_found) {
                                return buf;
                        }
                }
@@ -137,38 +122,35 @@ static char *tftp_option_get(char *buf, int len, char *option)
 
 #endif
 
-static inline int tftp(const int cmd, const struct hostent *host,
-       const char *remotefile, int localfd, const unsigned short port, int tftp_bufsize)
+static int tftp(const int cmd, const struct hostent *host,
+                  const char *remotefile, const int localfd,
+                  const unsigned short port, int tftp_bufsize)
 {
-       const int cmd_get = cmd & tftp_cmd_get;
-       const int cmd_put = cmd & tftp_cmd_put;
-       const int bb_tftp_num_retries = 5;
-
        struct sockaddr_in sa;
        struct sockaddr_in from;
        struct timeval tv;
        socklen_t fromlen;
        fd_set rfds;
-       char *cp;
-       unsigned short tmp;
        int socketfd;
        int len;
        int opcode = 0;
        int finished = 0;
-       int timeout = bb_tftp_num_retries;
+       int timeout = TFTP_NUM_RETRIES;
        unsigned short block_nr = 1;
+       unsigned short tmp;
+       char *cp;
 
-#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
-       int want_option_ack = 0;
-#endif
+       USE_FEATURE_TFTP_BLOCKSIZE(int want_option_ack = 0;)
 
        /* Can't use RESERVE_CONFIG_BUFFER here since the allocation
         * size varies meaning BUFFERS_GO_ON_STACK would fail */
-       char *buf=xmalloc(tftp_bufsize + 4);
-
-       tftp_bufsize += 4;
+       /* We must keep the transmit and receive buffers seperate */
+       /* In case we rcv a garbage pkt and we need to rexmit the last pkt */
+       char *xbuf = xmalloc(tftp_bufsize += 4);
+       char *rbuf = xmalloc(tftp_bufsize);
 
        if ((socketfd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) {
+               /* need to unlink the localfile, so don't use xsocket here. */
                bb_perror_msg("socket");
                return EXIT_FAILURE;
        }
@@ -176,7 +158,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
        len = sizeof(sa);
 
        memset(&sa, 0, len);
-       bind(socketfd, (struct sockaddr *)&sa, len);
+       xbind(socketfd, (struct sockaddr *)&sa, len);
 
        sa.sin_family = host->h_addrtype;
        sa.sin_port = port;
@@ -184,70 +166,61 @@ static inline int tftp(const int cmd, const struct hostent *host,
                   sizeof(sa.sin_addr));
 
        /* build opcode */
-
-       if (cmd_get) {
+       if (cmd & tftp_cmd_get) {
                opcode = TFTP_RRQ;
        }
-
-       if (cmd_put) {
+       if (cmd & tftp_cmd_put) {
                opcode = TFTP_WRQ;
        }
 
        while (1) {
 
-               cp = buf;
+               cp = xbuf;
 
                /* first create the opcode part */
-
                *((unsigned short *) cp) = htons(opcode);
-
                cp += 2;
 
                /* add filename and mode */
+               if (((cmd & tftp_cmd_get) && (opcode == TFTP_RRQ)) ||
+                       ((cmd & tftp_cmd_put) && (opcode == TFTP_WRQ)))
+               {
+                       int too_long = 0;
 
-               if ((cmd_get && (opcode == TFTP_RRQ)) ||
-                       (cmd_put && (opcode == TFTP_WRQ))) {
-                        int too_long = 0;
-
-                       /* see if the filename fits into buf */
-                       /* and fill in packet                */
-
+                       /* see if the filename fits into xbuf
+                        * and fill in packet.  */
                        len = strlen(remotefile) + 1;
 
-                       if ((cp + len) >= &buf[tftp_bufsize - 1]) {
-                               too_long = 1;
-                       }
-                       else {
-                               safe_strncpy(cp, remotefile, len);
+                       if ((cp + len) >= &xbuf[tftp_bufsize - 1]) {
+                               too_long = 1;
+                       } else {
+                               safe_strncpy(cp, remotefile, len);
                                cp += len;
                        }
 
-                       if (too_long || ((&buf[tftp_bufsize - 1] - cp) < 6)) {
-                               bb_error_msg("too long remote-filename");
+                       if (too_long || ((&xbuf[tftp_bufsize - 1] - cp) < MODE_OCTET_LEN)) {
+                               bb_error_msg("remote filename too long");
                                break;
                        }
 
                        /* add "mode" part of the package */
+                       memcpy(cp, MODE_OCTET, MODE_OCTET_LEN);
+                       cp += MODE_OCTET_LEN;
 
-                       memcpy(cp, "octet", 6);
-                       cp += 6;
+#if ENABLE_FEATURE_TFTP_BLOCKSIZE
 
-#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
-
-                       len = tftp_bufsize - 4; /* data block size */
+                       len = tftp_bufsize - 4; /* data block size */
 
                        if (len != TFTP_BLOCKSIZE_DEFAULT) {
 
-                               if ((&buf[tftp_bufsize - 1] - cp) < 15) {
-                                       bb_error_msg("too long remote-filename");
+                               if ((&xbuf[tftp_bufsize - 1] - cp) < 15) {
+                                       bb_error_msg("remote filename too long");
                                        break;
                                }
 
                                /* add "blksize" + number of blocks  */
-
-                               memcpy(cp, "blksize", 8);
-                               cp += 8;
-
+                               memcpy(cp, OPTION_BLOCKSIZE, OPTION_BLOCKSIZE_LEN);
+                               cp += OPTION_BLOCKSIZE_LEN;
                                cp += snprintf(cp, 6, "%d", len) + 1;
 
                                want_option_ack = 1;
@@ -257,8 +230,8 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
                /* add ack and data */
 
-               if ((cmd_get && (opcode == TFTP_ACK)) ||
-                       (cmd_put && (opcode == TFTP_DATA))) {
+               if (((cmd & tftp_cmd_get) && (opcode == TFTP_ACK)) ||
+                       ((cmd & tftp_cmd_put) && (opcode == TFTP_DATA))) {
 
                        *((unsigned short *) cp) = htons(block_nr);
 
@@ -266,11 +239,11 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
                        block_nr++;
 
-                       if (cmd_put && (opcode == TFTP_DATA)) {
-                               len = bb_full_read(localfd, cp, tftp_bufsize - 4);
+                       if ((cmd & tftp_cmd_put) && (opcode == TFTP_DATA)) {
+                               len = full_read(localfd, cp, tftp_bufsize - 4);
 
                                if (len < 0) {
-                                       bb_perror_msg("read");
+                                       bb_perror_msg(bb_msg_read_error);
                                        break;
                                }
 
@@ -286,19 +259,19 @@ static inline int tftp(const int cmd, const struct hostent *host,
                /* send packet */
 
 
-               timeout = bb_tftp_num_retries;  /* re-initialize */
+               timeout = TFTP_NUM_RETRIES;     /* re-initialize */
                do {
 
-                       len = cp - buf;
+                       len = cp - xbuf;
 
-#ifdef CONFIG_FEATURE_TFTP_DEBUG
+#if ENABLE_DEBUG_TFTP
                        fprintf(stderr, "sending %u bytes\n", len);
-                       for (cp = buf; cp < &buf[len]; cp++)
-                               fprintf(stderr, "%02x ", (unsigned char)*cp);
+                       for (cp = xbuf; cp < &xbuf[len]; cp++)
+                               fprintf(stderr, "%02x ", (unsigned char) *cp);
                        fprintf(stderr, "\n");
 #endif
-                       if (sendto(socketfd, buf, len, 0,
-                                       (struct sockaddr *) &sa, sizeof(sa)) < 0) {
+                       if (sendto(socketfd, xbuf, len, 0,
+                                          (struct sockaddr *) &sa, sizeof(sa)) < 0) {
                                bb_perror_msg("send");
                                len = -1;
                                break;
@@ -322,8 +295,8 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
                        switch (select(socketfd + 1, &rfds, NULL, NULL, &tv)) {
                        case 1:
-                               len = recvfrom(socketfd, buf, tftp_bufsize, 0,
-                                               (struct sockaddr *) &from, &fromlen);
+                               len = recvfrom(socketfd, rbuf, tftp_bufsize, 0,
+                                                          (struct sockaddr *) &from, &fromlen);
 
                                if (len < 0) {
                                        bb_perror_msg("recvfrom");
@@ -341,8 +314,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
                                /* fall-through for bad packets! */
                                /* discard the packet - treat as timeout */
-                               timeout = bb_tftp_num_retries;
-
+                               timeout = TFTP_NUM_RETRIES;
                        case 0:
                                bb_error_msg("timeout");
 
@@ -352,7 +324,6 @@ static inline int tftp(const int cmd, const struct hostent *host,
                                        bb_error_msg("last timeout");
                                }
                                break;
-
                        default:
                                bb_perror_msg("select");
                                len = -1;
@@ -366,24 +337,23 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
                /* process received packet */
 
+               opcode = ntohs(*((unsigned short *) rbuf));
+               tmp = ntohs(*((unsigned short *) &rbuf[2]));
 
-               opcode = ntohs(*((unsigned short *) buf));
-               tmp = ntohs(*((unsigned short *) &buf[2]));
-
-#ifdef CONFIG_FEATURE_TFTP_DEBUG
+#if ENABLE_DEBUG_TFTP
                fprintf(stderr, "received %d bytes: %04x %04x\n", len, opcode, tmp);
 #endif
 
                if (opcode == TFTP_ERROR) {
-                       char *msg = NULL;
+                       const char *msg = NULL;
 
-                       if (buf[4] != '\0') {
-                               msg = &buf[4];
-                               buf[tftp_bufsize - 1] = '\0';
+                       if (rbuf[4] != '\0') {
+                               msg = &rbuf[4];
+                               rbuf[tftp_bufsize - 1] = '\0';
                        } else if (tmp < (sizeof(tftp_bb_error_msg)
-                                         / sizeof(char *))) {
+                                                         / sizeof(char *))) {
 
-                               msg = (char *) tftp_bb_error_msg[tmp];
+                               msg = tftp_bb_error_msg[tmp];
                        }
 
                        if (msg) {
@@ -392,62 +362,59 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
                        break;
                }
-
-#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
+#if ENABLE_FEATURE_TFTP_BLOCKSIZE
                if (want_option_ack) {
 
-                        want_option_ack = 0;
+                       want_option_ack = 0;
 
-                        if (opcode == TFTP_OACK) {
+                       if (opcode == TFTP_OACK) {
 
-                                /* server seems to support options */
+                               /* server seems to support options */
 
-                                char *res;
+                               char *res;
 
-                                res = tftp_option_get(&buf[2], len-2,
-                                                      "blksize");
+                               res = tftp_option_get(&rbuf[2], len - 2, OPTION_BLOCKSIZE);
 
-                                if (res) {
-                                        int blksize = atoi(res);
-                       
-                                        if (tftp_blocksize_check(blksize,
-                                                          tftp_bufsize - 4)) {
+                               if (res) {
+                                       int blksize = xatoi_u(res);
 
-                                                if (cmd_put) {
-                                                        opcode = TFTP_DATA;
-                                                }
-                                                else {
-                                                        opcode = TFTP_ACK;
-                                                }
-#ifdef CONFIG_FEATURE_TFTP_DEBUG
-                                                fprintf(stderr, "using blksize %u\n", blksize);
+                                       if (tftp_blocksize_check(blksize, tftp_bufsize - 4)) {
+
+                                               if (cmd & tftp_cmd_put) {
+                                                       opcode = TFTP_DATA;
+                                               } else {
+                                                       opcode = TFTP_ACK;
+                                               }
+#if ENABLE_DEBUG_TFTP
+                                               fprintf(stderr, "using %s %u\n", OPTION_BLOCKSIZE,
+                                                               blksize);
 #endif
-                                                tftp_bufsize = blksize + 4;
-                                                block_nr = 0;
-                                                continue;
-                                        }
-                                }
-                                /* FIXME:
-                                 * we should send ERROR 8 */
-                                bb_error_msg("bad server option");
-                                break;
-                        }
-
-                        bb_error_msg("warning: blksize not supported by server"
-                                  " - reverting to 512");
-
-                        tftp_bufsize = TFTP_BLOCKSIZE_DEFAULT + 4;
+                                               tftp_bufsize = blksize + 4;
+                                               block_nr = 0;
+                                               continue;
+                                       }
+                               }
+                               /* FIXME:
+                                * we should send ERROR 8 */
+                               bb_error_msg("bad server option");
+                               break;
+                       }
+
+                       bb_error_msg("warning: blksize not supported by server"
+                                                " - reverting to 512");
+
+                       tftp_bufsize = TFTP_BLOCKSIZE_DEFAULT + 4;
                }
 #endif
 
-               if (cmd_get && (opcode == TFTP_DATA)) {
+               if ((cmd & tftp_cmd_get) && (opcode == TFTP_DATA)) {
 
                        if (tmp == block_nr) {
-                       
-                               len = bb_full_write(localfd, &buf[4], len - 4);
+
+                               len = full_write(localfd, &rbuf[4], len - 4);
 
                                if (len < 0) {
-                                       bb_perror_msg("write");
+                                       bb_perror_msg(bb_msg_write_error);
                                        break;
                                }
 
@@ -459,7 +426,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
                                continue;
                        }
                        /* in case the last ack disappeared into the ether */
-                       if ( tmp == (block_nr - 1) ) {
+                       if (tmp == (block_nr - 1)) {
                                --block_nr;
                                opcode = TFTP_ACK;
                                continue;
@@ -471,9 +438,9 @@ static inline int tftp(const int cmd, const struct hostent *host,
                        }
                }
 
-               if (cmd_put && (opcode == TFTP_ACK)) {
+               if ((cmd & tftp_cmd_put) && (opcode == TFTP_ACK)) {
 
-                       if (tmp == (unsigned short)(block_nr - 1)) {
+                       if (tmp == (unsigned short) (block_nr - 1)) {
                                if (finished) {
                                        break;
                                }
@@ -484,10 +451,10 @@ static inline int tftp(const int cmd, const struct hostent *host,
                }
        }
 
-#ifdef CONFIG_FEATURE_CLEAN_UP
+#if ENABLE_FEATURE_CLEAN_UP
        close(socketfd);
-
-        free(buf);
+       free(xbuf);
+       free(rbuf);
 #endif
 
        return finished ? EXIT_SUCCESS : EXIT_FAILURE;
@@ -502,73 +469,75 @@ int tftp_main(int argc, char **argv)
        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
+#if ENABLE_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
+#if ENABLE_FEATURE_TFTP_GET
 #define GET "g"
+#define GET_COMPL ":g"
 #else
 #define GET
+#define GET_COMPL
 #endif
 
-#ifdef CONFIG_FEATURE_TFTP_PUT
+#if ENABLE_FEATURE_TFTP_PUT
 #define PUT "p"
+#define PUT_COMPL ":p"
 #else
 #define PUT
+#define PUT_COMPL
 #endif
 
-       while ((opt = getopt(argc, argv, BS GET PUT "l:r:")) != -1) {
-               switch (opt) {
-#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
-               case 'b':
-                       blocksize = atoi(optarg);
-                       if (!tftp_blocksize_check(blocksize, 0)) {
-                                return EXIT_FAILURE;
-                       }
-                       break;
+#if defined(CONFIG_FEATURE_TFTP_GET) && defined(CONFIG_FEATURE_TFTP_PUT)
+       opt_complementary = GET_COMPL PUT_COMPL ":?g--p:p--g";
+#elif defined(CONFIG_FEATURE_TFTP_GET) || defined(CONFIG_FEATURE_TFTP_PUT)
+       opt_complementary = GET_COMPL PUT_COMPL;
 #endif
-#ifdef CONFIG_FEATURE_TFTP_GET
-               case 'g':
-                       cmd = tftp_cmd_get;
-                       flags = O_WRONLY | O_CREAT | O_TRUNC;
-                       break;
+
+       cmd = getopt32(argc, argv, GET PUT "l:r:" BS, &localfile, &remotefile BS_ARG);
+
+       cmd &= (tftp_cmd_get | tftp_cmd_put);
+#if ENABLE_FEATURE_TFTP_GET
+       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 ENABLE_FEATURE_TFTP_PUT
+       if (cmd == tftp_cmd_put)
+               flags = O_RDONLY;
 #endif
-               case 'l':
-                       localfile = optarg;
-                       break;
-               case 'r':
-                       remotefile = optarg;
-                       break;
+
+#if ENABLE_FEATURE_TFTP_BLOCKSIZE
+       if (sblocksize) {
+               blocksize = xatoi_u(sblocksize);
+               if (!tftp_blocksize_check(blocksize, 0)) {
+                       return EXIT_FAILURE;
                }
        }
+#endif
 
-       if ((cmd == 0) || (optind == argc)) {
+       if (localfile == NULL)
+               localfile = remotefile;
+       if (remotefile == NULL)
+               remotefile = localfile;
+       if ((localfile == NULL && remotefile == NULL) || (argv[optind] == NULL))
                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) {
-           fd = open(localfile, flags, 0644);
+
+       if (localfile == NULL || LONE_DASH(localfile)) {
+               fd = (cmd == tftp_cmd_get) ? STDOUT_FILENO : STDIN_FILENO;
+       } else {
+               fd = open(localfile, flags, 0644); /* fail below */
        }
        if (fd < 0) {
                bb_perror_msg_and_die("local file");
@@ -577,19 +546,20 @@ int tftp_main(int argc, char **argv)
        host = xgethostbyname(argv[optind]);
        port = bb_lookup_port(argv[optind + 1], "udp", 69);
 
-#ifdef CONFIG_FEATURE_TFTP_DEBUG
+#if ENABLE_DEBUG_TFTP
        fprintf(stderr, "using server \"%s\", remotefile \"%s\", "
-               "localfile \"%s\".\n",
-               inet_ntoa(*((struct in_addr *) host->h_addr)),
-               remotefile, localfile);
+                       "localfile \"%s\".\n",
+                       inet_ntoa(*((struct in_addr *) host->h_addr)),
+                       remotefile, localfile);
 #endif
 
        result = tftp(cmd, host, remotefile, fd, port, blocksize);
 
-#ifdef CONFIG_FEATURE_CLEAN_UP
        if (!(fd == STDOUT_FILENO || fd == STDIN_FILENO)) {
-           close(fd);
+               if (ENABLE_FEATURE_CLEAN_UP)
+                       close(fd);
+               if (cmd == tftp_cmd_get && result != EXIT_SUCCESS)
+                       unlink(localfile);
        }
-#endif
-       return(result);
+       return result;
 }