fix verbose output; remove commented-out includes.
This commit is contained in:
parent
8e9ccba371
commit
3821fb13ea
@ -22,8 +22,8 @@ typedef struct ftp_host_info_s {
|
|||||||
struct len_and_sockaddr *lsa;
|
struct len_and_sockaddr *lsa;
|
||||||
} ftp_host_info_t;
|
} ftp_host_info_t;
|
||||||
|
|
||||||
static char verbose_flag;
|
static smallint verbose_flag;
|
||||||
static char do_continue;
|
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) ATTRIBUTE_NORETURN;
|
||||||
static void ftp_die(const char *msg, const char *remote)
|
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;
|
unsigned n;
|
||||||
if (verbose_flag) {
|
if (verbose_flag) {
|
||||||
bb_error_msg("cmd %s%s", s1, s2);
|
bb_error_msg("cmd %s %s", s1, s2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s1) {
|
if (s1) {
|
||||||
@ -320,10 +320,9 @@ int ftpgetput_main(int argc, char **argv)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Set default values */
|
/* Set default values */
|
||||||
server = xmalloc(sizeof(ftp_host_info_t));
|
server = xmalloc(*server);
|
||||||
server->user = "anonymous";
|
server->user = "anonymous";
|
||||||
server->password = "busybox@";
|
server->password = "busybox@";
|
||||||
verbose_flag = 0;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Decipher the command line
|
* Decipher the command line
|
||||||
|
@ -12,11 +12,7 @@
|
|||||||
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
* 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 <netinet/ip_icmp.h>
|
||||||
//#include <arpa/inet.h>
|
|
||||||
//#include <netdb.h>
|
|
||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
@ -22,12 +22,8 @@
|
|||||||
* The code was modified by Bart Visscher <magick@linux-fan.com>
|
* The code was modified by Bart Visscher <magick@linux-fan.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//#include <netinet/in.h>
|
|
||||||
//#include <netinet/ip6.h>
|
|
||||||
#include <netinet/icmp6.h>
|
#include <netinet/icmp6.h>
|
||||||
//#include <arpa/inet.h>
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
//#include <netdb.h>
|
|
||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
|
|
||||||
/* I see RENUMBERED constants in bits/in.h - !!?
|
/* I see RENUMBERED constants in bits/in.h - !!?
|
||||||
|
@ -8,14 +8,8 @@
|
|||||||
* Licensed under GPL v2 or later, see file License for details.
|
* 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"
|
#include "busybox.h"
|
||||||
|
|
||||||
|
|
||||||
enum { RFC_868_BIAS = 2208988800UL };
|
enum { RFC_868_BIAS = 2208988800UL };
|
||||||
|
|
||||||
static void socket_timeout(int sig)
|
static void socket_timeout(int sig)
|
||||||
|
Loading…
Reference in New Issue
Block a user