fix verbose output; remove commented-out includes.

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 9086cb1264526a3102a79a816418d5d5f05f2328..e9ba5435a0d656dc1ecbc5127c19c1bebb10bd5f 100644 (file)
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -22,8 +22,8 @@ typedef struct ftp_host_info_s {
        struct len_and_sockaddr *lsa;
 } ftp_host_info_t;
 
-static char verbose_flag;
-static char do_continue;
+static smallint verbose_flag;
+static smallint do_continue;
 
 static void ftp_die(const char *msg, const char *remote) ATTRIBUTE_NORETURN;
 static void ftp_die(const char *msg, const char *remote)
@@ -41,7 +41,7 @@ static int ftpcmd(const char *s1, const char *s2, FILE *stream, char *buf)
 {
        unsigned n;
        if (verbose_flag) {
-               bb_error_msg("cmd %s%s", s1, s2);
+               bb_error_msg("cmd %s %s", s1, s2);
        }
 
        if (s1) {
@@ -320,10 +320,9 @@ int ftpgetput_main(int argc, char **argv)
 #endif
 
        /* Set default values */
-       server = xmalloc(sizeof(ftp_host_info_t));
+       server = xmalloc(*server);
        server->user = "anonymous";
        server->password = "busybox@";
-       verbose_flag = 0;
 
        /*
         * Decipher the command line

diff --git a/networking/ping.c b/networking/ping.c
index de97d7e7fa9794f3d2ac3cd76e82a6acac34ccac..12730bec5b440482264472740112e4c9ea744b61 100644 (file)
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -12,11 +12,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-//#include <netinet/in.h>
-//#include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
-//#include <arpa/inet.h>
-//#include <netdb.h>
 #include "busybox.h"
 
 enum {

diff --git a/networking/ping6.c b/networking/ping6.c
index 81e16e2f024f4def396cabed6e6e2e21846cd213..fd18cc877f8b5ac502a3b913072e626d4b38aa43 100644 (file)
--- a/networking/ping6.c
+++ b/networking/ping6.c
@@ -22,12 +22,8 @@
  * The code was modified by Bart Visscher <magick@linux-fan.com>
  */
 
-//#include <netinet/in.h>
-//#include <netinet/ip6.h>
 #include <netinet/icmp6.h>
-//#include <arpa/inet.h>
 #include <net/if.h>
-//#include <netdb.h>
 #include "busybox.h"
 
 /* I see RENUMBERED constants in bits/in.h - !!?

diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index ccbf969666773107a49d2899a154f91006cdb373..d6d1384f72e8c5e47681f005759c0c691677efc6 100644 (file)
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -8,14 +8,8 @@
  * Licensed under GPL v2 or later, see file License for details.
 */
 
-//#include <sys/socket.h>
-//#include <netinet/in.h>
-//#include <netdb.h>
-//#include <signal.h>
-
 #include "busybox.h"
 
-
 enum { RFC_868_BIAS = 2208988800UL };
 
 static void socket_timeout(int sig)