From e03920aed1d2d9118d2ff59b9e2186b2f5b5acca Mon Sep 17 00:00:00 2001
From: landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Thu, 15 Dec 2005 05:42:55 +0000
Subject: Fix -g and -p options. Patch from Traceman. (I don't know who that
is, it's the darn bug generator again.)
git-svn-id: svn://busybox.net/trunk/busybox@12889 69ca8d6d-28ef-0310-b511-8ec308f3f277
---
networking/tftp.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/networking/tftp.c b/networking/tftp.c
index 96d8f3b79..cad0dcc45 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -511,7 +511,6 @@ 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;
@@ -551,7 +550,7 @@ int tftp_main(int argc, char **argv)
#endif
- opt = bb_getopt_ulflags(argc, argv, GET PUT "l:r:" BS,
+ cmd = bb_getopt_ulflags(argc, argv, GET PUT "l:r:" BS,
&localfile, &remotefile BS_ARG);
#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
if(sblocksize) {
@@ -562,7 +561,7 @@ int tftp_main(int argc, char **argv)
}
#endif
- cmd &= (tftp_cmd_get & tftp_cmd_put);
+ cmd &= (tftp_cmd_get | tftp_cmd_put);
#ifdef CONFIG_FEATURE_TFTP_GET
if(cmd == tftp_cmd_get)
flags = O_WRONLY | O_CREAT | O_TRUNC;
--
cgit v1.2.3-55-g6feb