summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2007-01-11 16:51:21 +0000
committerDenis Vlasenko2007-01-11 16:51:21 +0000
commit3821fb13ea404d243115ff8ec161273b62826513 (patch)
tree89b3d79a1c900f270e4471a78cdd8859967dda01
parent8e9ccba371480fb1fb3da9235fabdbb7861523c3 (diff)
downloadbusybox-3821fb13ea404d243115ff8ec161273b62826513.zip
busybox-3821fb13ea404d243115ff8ec161273b62826513.tar.gz
fix verbose output; remove commented-out includes.
-rw-r--r--networking/ftpgetput.c9
-rw-r--r--networking/ping.c4
-rw-r--r--networking/ping6.c4
-rw-r--r--util-linux/rdate.c6
4 files changed, 4 insertions, 19 deletions
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 9086cb1..e9ba543 100644
--- 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 de97d7e..12730be 100644
--- 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 81e16e2..fd18cc8 100644
--- 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 ccbf969..d6d1384 100644
--- 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)