svn commit: trunk/busybox: networking util-linux

[vda at busybox.net]

Author: vda
Date: 2007-01-11 08:51:21 -0800 (Thu, 11 Jan 2007)
New Revision: 17251

Log:
fix verbose output; remove commented-out includes.


Modified:
   trunk/busybox/networking/ftpgetput.c
   trunk/busybox/networking/ping.c
   trunk/busybox/networking/ping6.c
   trunk/busybox/util-linux/rdate.c


Changeset:
Modified: trunk/busybox/networking/ftpgetput.c
===================================================================
--- trunk/busybox/networking/ftpgetput.c	2007-01-11 16:50:23 UTC (rev 17250)
+++ trunk/busybox/networking/ftpgetput.c	2007-01-11 16:51:21 UTC (rev 17251)
@@ -22,8 +22,8 @@
 	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 @@
 {
 	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 @@
 #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

Modified: trunk/busybox/networking/ping.c
===================================================================
--- trunk/busybox/networking/ping.c	2007-01-11 16:50:23 UTC (rev 17250)
+++ trunk/busybox/networking/ping.c	2007-01-11 16:51:21 UTC (rev 17251)
@@ -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 {

Modified: trunk/busybox/networking/ping6.c
===================================================================
--- trunk/busybox/networking/ping6.c	2007-01-11 16:50:23 UTC (rev 17250)
+++ trunk/busybox/networking/ping6.c	2007-01-11 16:51:21 UTC (rev 17251)
@@ -22,12 +22,8 @@
  * The code was modified by Bart Visscher <magick at 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 - !!?

Modified: trunk/busybox/util-linux/rdate.c
===================================================================
--- trunk/busybox/util-linux/rdate.c	2007-01-11 16:50:23 UTC (rev 17250)
+++ trunk/busybox/util-linux/rdate.c	2007-01-11 16:51:21 UTC (rev 17251)
@@ -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)