[git commit] tftp: allow -lc and -cl options

Denys Vlasenko vda.linux at googlemail.com
Sun Jun 9 10:41:17 UTC 2019


commit: https://git.busybox.net/busybox/commit/?id=894f0a32351fe6c28fe86958e5f4e21422394183
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
tftp_main                                            394     396      +2

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/tftp.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/networking/tftp.c b/networking/tftp.c
index 848645552..d551c861f 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -776,7 +776,15 @@ int tftp_main(int argc UNUSED_PARAM, char **argv)
 		 */
 		unsigned i = 1;
 		while (argv[i]) {
-			if (strcmp(argv[i], "-c") == 0) {
+			/* Accept not only -c, but also
+			 * -lc, -cl, -llcclcllcc etc:
+			 * "-l Literal mode (do not recognize HOST:FILE)"
+			 * since we do not recognize that syntax anyway,
+			 * might as well allow the option.
+			 */
+			if (argv[i][0] == '-' && strchr(argv[i], 'c')
+			 /*&& argv[i][1+strspn(argv[i]+1, "lc")] == '\0'*/
+			) {
 				if (!argv[++i])
 					break;
 				if (strcmp(argv[i], "get") == 0) {


More information about the busybox-cvs mailing list