tftpd: code shrink

function                                             old     new   delta
tftp_get_option                                      102      93      -9

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko committed 2026-11-06 18:09:10 +01:00
1 parent 11edcd9eb0
commit 1d363c609f
2 files changed
+49 -30

No files matched your search

+20 -30
View File
@@ -92,17 +92,21 @@
//kbuild:lib-$(CONFIG_TFTPD) += tftp.o
//usage:#define tftp_trivial_usage
//usage: "[OPTIONS] HOST [PORT]"
//usage: "-"
//usage: IF_FEATURE_TFTP_GET("g")
//usage: IF_FEATURE_TFTP_GET(IF_FEATURE_TFTP_PUT("|"))
//usage: IF_FEATURE_TFTP_PUT("p")
//usage: " [OPTIONS] HOST [PORT]"
//usage:#define tftp_full_usage "\n\n"
//usage: "Transfer a file from/to tftp server\n"
//usage: "\n -l FILE Local FILE"
//usage: "\n -r FILE Remote FILE"
//usage: IF_FEATURE_TFTP_GET(
//usage: "\n -g Get file"
//usage: )
//usage: IF_FEATURE_TFTP_PUT(
//usage: "\n -p Put file"
//usage: )
//usage: "\n -l FILE Local FILE"
//usage: "\n -r FILE Remote FILE"
//usage: IF_FEATURE_TFTP_BLOCKSIZE(
//usage: "\n -b SIZE Transfer blocks in bytes"
//usage: )
@@ -266,37 +270,23 @@ static int tftp_blksize_check(const char *blksize_str, int maxsize)
static char *tftp_get_option(const char *option, char *buf, int len)
{
int opt_val = 0;
int opt_found = 0;
int k;
/* buf points to:
* "opt_name<NUL>opt_val<NUL>opt_name2<NUL>opt_val2<NUL>..." */
while (len > 0) {
/* Make sure options are terminated correctly */
for (k = 0; k < len; k++) {
if (buf[k] == '\0') {
goto nul_found;
}
}
return NULL;
nul_found:
if (opt_val == 0) { /* it's "name" part */
if (strcasecmp(buf, option) == 0) {
opt_found = 1;
}
} else if (opt_found) {
while (1) {
char *cur_opt = buf;
char *nul = memchr(buf, '\0', len);
if (!nul)
return NULL;
len -= (++nul) - buf;
buf = nul;
nul = memchr(buf, '\0', len);
if (!nul)
return NULL;
if (strcasecmp(cur_opt, option) == 0)
return buf;
}
k++;
buf += k;
len -= k;
opt_val ^= 1;
len -= (++nul) - buf;
buf = nul;
}
return NULL;
}
#endif
+29
View File
@@ -0,0 +1,29 @@
#!/bin/sh
# This needs containerization to be safely runnable automatically
PATH="$PWD/../runtest-tempdir-links:$PATH"
which tftpd
which tftp
rm -rf tftp.testdir
mkdir -p tftp.testdir
cd tftp.testdir || exit 1
dd bs=1 seek=$((400*1024*1024 - 1)) count=1 of=BIGFILE </dev/zero
(
udpsvd -vE 0.0.0.0 6969 tftpd . &
pid=$!
sleep 2
kill $pid
rm BIGFILE
) >server.log 2>&1 &
tftp -g -l /dev/null -r BIGFILE 127.0.0.1 6969
#tftp -g -l /dev/null -r BIGFILE -b $((14*1024)) 127.0.0.1 6969
echo "Waiting for server to exit"
wait
echo "Server exited"
cd .. || exit 1
rm -rf tftp.testdir