emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display the port number number correctly, other minor optimisations

Browse Source
This commit is contained in:
Glenn L McGrath 2003-12-20 03:19:27 +00:00
parent ffccf6eb5d
commit 266c1f5eff
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
networking/ftpgetput.c
View File

@ -49,34 +49,14 @@
#include "busybox.h" #include "busybox.h"
typedef struct ftp_host_info_s { typedef struct ftp_host_info_s {
char *host;
char *port;
char *user; char *user;
char *password; char *password;
struct sockaddr_in *s_in; struct sockaddr_in *s_in;
} ftp_host_info_t; } ftp_host_info_t;
static char verbose_flag; static char verbose_flag = 0;
static char do_continue = 0; static char do_continue = 0;
static ftp_host_info_t *ftp_init(void)
{
ftp_host_info_t *host;
host = xcalloc(1, sizeof(ftp_host_info_t));
/* Set the default port */
if (getservbyname("ftp", "tcp")) {
host->port = "ftp";
} else {
host->port = "21";
}
host->user = "anonymous";
host->password = "busybox@";
return(host);
}
static int ftpcmd(const char *s1, const char *s2, FILE *stream, char *buf) static int ftpcmd(const char *s1, const char *s2, FILE *stream, char *buf)
{ {
if (verbose_flag) { if (verbose_flag) {
@ -306,6 +286,7 @@ int ftpgetput_main(int argc, char **argv)
{ {
/* content-length of the file */ /* content-length of the file */
unsigned long opt; unsigned long opt;
char *port = "ftp";
/* socket to ftp server */ /* socket to ftp server */
FILE *control_stream; FILE *control_stream;
@ -316,27 +297,37 @@ int ftpgetput_main(int argc, char **argv)
int (*ftp_action)(ftp_host_info_t *, FILE *, const char *, char *) = NULL; int (*ftp_action)(ftp_host_info_t *, FILE *, const char *, char *) = NULL;
/* Check to see if the command is ftpget or ftput */
#ifdef CONFIG_FTPPUT #ifdef CONFIG_FTPPUT
# ifdef CONFIG_FTPGET
if (bb_applet_name[3] == 'p') { if (bb_applet_name[3] == 'p') {
ftp_action = ftp_send; ftp_action = ftp_send;
} }
# else
ftp_action = ftp_send;
# endif
#endif #endif
#ifdef CONFIG_FTPGET #ifdef CONFIG_FTPGET
# ifdef CONFIG_FTPPUT
if (bb_applet_name[3] == 'g') { if (bb_applet_name[3] == 'g') {
ftp_action = ftp_recieve; ftp_action = ftp_recieve;
} }
# else
ftp_action = ftp_recieve;
# endif
#endif #endif
/* Set default values */ /* Set default values */
server = ftp_init(); server = xmalloc(sizeof(ftp_host_info_t));
server->user = "anonymous";
server->password = "busybox@";
verbose_flag = 0; verbose_flag = 0;
/* /*
* Decipher the command line * Decipher the command line
*/ */
server->port = "21";
bb_applet_long_options = ftpgetput_long_options; bb_applet_long_options = ftpgetput_long_options;
opt = bb_getopt_ulflags(argc, argv, "cvu:p:P:", &server->user, &server->password, &server->port); opt = bb_getopt_ulflags(argc, argv, "cvu:p:P:", &server->user, &server->password, &port);
if (opt & FTPGETPUT_OPT_CONTINUE) { if (opt & FTPGETPUT_OPT_CONTINUE) {
do_continue = 1; do_continue = 1;
} }
@ -355,12 +346,11 @@ int ftpgetput_main(int argc, char **argv)
* sites (i.e. ftp.us.debian.org) use round-robin DNS * sites (i.e. ftp.us.debian.org) use round-robin DNS
* and we want to connect to only one IP... */ * and we want to connect to only one IP... */
server->s_in = &s_in; server->s_in = &s_in;
server->host = argv[optind]; bb_lookup_host(&s_in, argv[optind]);
bb_lookup_host(&s_in, server->host); s_in.sin_port = bb_lookup_port(port, 21);
s_in.sin_port = bb_lookup_port(server->port, 21);
if (verbose_flag) { if (verbose_flag) {
fprintf(stdout, "Connecting to %s[%s]:%s\n", printf("Connecting to %s[%s]:%d\n",
server->host, inet_ntoa(s_in.sin_addr), server->port); argv[optind], inet_ntoa(s_in.sin_addr), ntohs(s_in.sin_port));
} }
/* Connect/Setup/Configure the FTP session */ /* Connect/Setup/Configure the FTP session */