Fix -g and -p options. Patch from Traceman. (I don't know who that is,

it's the darn bug generator again.)

diff --git a/networking/tftp.c b/networking/tftp.c
index 96d8f3b7987f946bb98ba0efbe91748a85358bd3..cad0dcc456b6d36e402ff55f8bb24ba212e1c86a 100644 (file)
--- 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;