emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tftp: code shrink

Browse Source 
function                                             old     new   delta
tftp_protocol                                       1949    1947      -2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-02-13 13:01:43 +01:00
parent 260bd21169
commit 779df9f228
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
networking/tftp.c
View File

@ -459,16 +459,14 @@ static int tftp_protocol(
} }
/* add filename and mode */ /* add filename and mode */
/* fill in packet if the filename fits into xbuf */ /* fill in packet if the filename fits into xbuf */
len = strlen(remote_file) + 1; len = strlen(remote_file);
if (2 + len + sizeof("octet") >= io_bufsize) { if (len + 3 + sizeof("octet") >= io_bufsize) {
bb_simple_error_msg("remote filename is too long"); bb_simple_error_msg("remote filename is too long");
goto ret; goto ret;
} }
strcpy(cp, remote_file); cp = stpcpy(cp, remote_file) + 1;
cp += len;
/* add "mode" part of the packet */ /* add "mode" part of the packet */
strcpy(cp, "octet"); cp = stpcpy(cp, "octet");
cp += sizeof("octet");
# if ENABLE_FEATURE_TFTP_BLOCKSIZE # if ENABLE_FEATURE_TFTP_BLOCKSIZE
if (blksize == TFTP_BLKSIZE_DEFAULT && !want_transfer_size) if (blksize == TFTP_BLKSIZE_DEFAULT && !want_transfer_size)
@ -757,7 +755,6 @@ static int tftp_protocol(
} }
#if ENABLE_TFTP #if ENABLE_TFTP
int tftp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int tftp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int tftp_main(int argc UNUSED_PARAM, char **argv) int tftp_main(int argc UNUSED_PARAM, char **argv)
{ {
@ -873,7 +870,6 @@ int tftp_main(int argc UNUSED_PARAM, char **argv)
} }
return result; return result;
} }
#endif /* ENABLE_TFTP */ #endif /* ENABLE_TFTP */
#if ENABLE_TFTPD #if ENABLE_TFTPD
@ -1010,7 +1006,6 @@ int tftpd_main(int argc UNUSED_PARAM, char **argv)
strcpy(G_error_pkt_str, error_msg); strcpy(G_error_pkt_str, error_msg);
goto do_proto; goto do_proto;
} }
#endif /* ENABLE_TFTPD */ #endif /* ENABLE_TFTPD */
#endif /* ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT */ #endif /* ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT */