1 files changed, 43 insertions, 3 deletions

diff --git a/networking/tftp.c b/networking/tftp.c
index 35cf0dbd9..648441016 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -18,7 +18,42 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define tftp_trivial_usage
+//usage:       "[OPTIONS] HOST [PORT]"
+//usage:#define tftp_full_usage "\n\n"
+//usage:       "Transfer a file from/to tftp server\n"
+//usage:     "\nOptions:"
+//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:        IF_FEATURE_TFTP_BLOCKSIZE(
+//usage:     "\n        -b SIZE Transfer blocks of SIZE octets"
+//usage:        )
+//usage:
+//usage:#define tftpd_trivial_usage
+//usage:       "[-cr] [-u USER] [DIR]"
+//usage:#define tftpd_full_usage "\n\n"
+//usage:       "Transfer a file on tftp client's request\n"
+//usage:       "\n"
+//usage:       "tftpd should be used as an inetd service.\n"
+//usage:       "tftpd's line for inetd.conf:\n"
+//usage:       "        69 dgram udp nowait root tftpd tftpd -l /files/to/serve\n"
+//usage:       "It also can be ran from udpsvd:\n"
+//usage:       "        udpsvd -vE 0.0.0.0 69 tftpd /files/to/serve\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -r      Prohibit upload"
+//usage:     "\n        -c      Allow file creation via upload"
+//usage:     "\n        -u      Access files as USER"
+//usage:     "\n        -l      Log to syslog (inetd mode requires this)"
+
 #include "libbb.h"
+#include <syslog.h>
 
 #if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
 
@@ -59,6 +94,7 @@ enum {
         TFTPD_OPT_r = (1 << 8) * ENABLE_TFTPD,
         TFTPD_OPT_c = (1 << 9) * ENABLE_TFTPD,
         TFTPD_OPT_u = (1 << 10) * ENABLE_TFTPD,
+        TFTPD_OPT_l = (1 << 11) * ENABLE_TFTPD,
 };
 
 #if ENABLE_FEATURE_TFTP_GET && !ENABLE_FEATURE_TFTP_PUT
@@ -422,6 +458,7 @@ static int tftp_protocol(
                                 finished = 1;
                         }
                         cp += len;
+                        IF_FEATURE_TFTP_PROGRESS_BAR(G.pos += len;)
                 }
  send_pkt:
                 /* Send packet */
@@ -443,8 +480,6 @@ static int tftp_protocol(
                 xsendto(socket_fd, xbuf, send_len, &peer_lsa->u.sa, peer_lsa->len);
 
 #if ENABLE_FEATURE_TFTP_PROGRESS_BAR
-                if (ENABLE_TFTP && remote_file) /* tftp */
-                        G.pos = (block_nr - 1) * (uoff_t)blksize;
                 if (is_bb_progress_inited(&G.pmt))
                         tftp_progress_update();
 #endif
@@ -588,6 +623,7 @@ static int tftp_protocol(
                                 if (sz != blksize) {
                                         finished = 1;
                                 }
+                                IF_FEATURE_TFTP_PROGRESS_BAR(G.pos += sz;)
                                 continue; /* send ACK */
                         }
 /* Disabled to cope with servers with Sorcerer's Apprentice Syndrome */
@@ -749,8 +785,12 @@ int tftpd_main(int argc UNUSED_PARAM, char **argv)
         peer_lsa->len = our_lsa->len;
 
         /* Shifting to not collide with TFTP_OPTs */
-        opt = option_mask32 = TFTPD_OPT | (getopt32(argv, "rcu:", &user_opt) << 8);
+        opt = option_mask32 = TFTPD_OPT | (getopt32(argv, "rcu:l", &user_opt) << 8);
         argv += optind;
+        if (opt & TFTPD_OPT_l) {
+                openlog(applet_name, LOG_PID, LOG_DAEMON);
+                logmode = LOGMODE_SYSLOG;
+        }
         if (argv[0])
                 xchdir(argv[0]);