3821fb13e
Denis Vlasenko
2007-01-11
Subject
fix verbose output; remove commented-out includes.
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/ftpgetput.c+4 -5
| @@ -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 | |
networking/ping.c+0 -4
| @@ -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 { | |
networking/ping6.c+0 -4
| @@ -22,12 +22,8 @@ | |
| * The code was modified by Bart Visscher <[email protected]> | |
| */ | |
| - | //#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 - !!? | |
util-linux/rdate.c+0 -6
| @@ -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) | |