X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=networking%2Fftpgetput.c;h=1d5b186248867c5b452e72ebf36da6f9e7865c7e;hb=999af20d3e025741197b8aebea9aeb4e435c9ebf;hp=8724739b55fc0b3c4cd76b4e88efd196b04dd70e;hpb=b51eb265681de8723a34c923032d0e8df143b19a;p=oweals%2Fbusybox.git diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c index 8724739b5..1d5b18624 100644 --- a/networking/ftpgetput.c +++ b/networking/ftpgetput.c @@ -1,29 +1,16 @@ /* vi: set sw=4 ts=4: */ /* - * ftpget - * + * ftpget + * * Mini implementation of FTP to retrieve a remote file. * * Copyright (C) 2002 Jeff Angielski, The PTR Group - * Copyright (C) 2002 Glenn McGrath + * Copyright (C) 2002 Glenn McGrath * * Based on wget.c by Chip Rosenthal Covad Communications * * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -49,34 +36,14 @@ #include "busybox.h" typedef struct ftp_host_info_s { - char *host; - char *port; char *user; char *password; struct sockaddr_in *s_in; } ftp_host_info_t; -static char verbose_flag; +static char verbose_flag = 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) { if (verbose_flag) { @@ -85,16 +52,21 @@ static int ftpcmd(const char *s1, const char *s2, FILE *stream, char *buf) if (s1) { if (s2) { - fprintf(stream, "%s%s\n", s1, s2); + fprintf(stream, "%s%s\r\n", s1, s2); } else { - fprintf(stream, "%s\n", s1); + fprintf(stream, "%s\r\n", s1); } } - do { + char *buf_ptr; + if (fgets(buf, 510, stream) == NULL) { bb_perror_msg_and_die("fgets()"); } + buf_ptr = strstr(buf, "\r\n"); + if (buf_ptr) { + *buf_ptr = '\0'; + } } while (! isdigit(buf[0]) || buf[3] != ' '); return atoi(buf); @@ -121,11 +93,9 @@ static FILE *ftp_login(ftp_host_info_t *server) { FILE *control_stream; char buf[512]; - int control_fd; /* Connect to the command socket */ - control_fd = xconnect(server->s_in); - control_stream = fdopen(control_fd, "r+"); + control_stream = fdopen(xconnect(server->s_in), "r+"); if (control_stream == NULL) { bb_perror_msg_and_die("Couldnt open control stream"); } @@ -153,20 +123,15 @@ static FILE *ftp_login(ftp_host_info_t *server) } #ifdef CONFIG_FTPGET -static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream, +static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream, const char *local_path, char *server_path) { - char *filename; - char *local_file; char buf[512]; off_t filesize = 0; int fd_data; - int fd_local; + int fd_local = -1; off_t beg_range = 0; - filename = bb_get_last_path_component(server_path); - local_file = concat_path_file(local_path, filename); - /* Connect to the data socket */ if (ftpcmd("PASV", NULL, control_stream, buf) != 227) { bb_error_msg_and_die("PASV error: %s", buf + 4); @@ -174,12 +139,20 @@ static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream, fd_data = xconnect_ftpdata(server, buf); if (ftpcmd("SIZE ", server_path, control_stream, buf) == 213) { - filesize = atol(buf + 4); + unsigned long value=filesize; + if (safe_strtoul(buf + 4, &value)) + bb_error_msg_and_die("SIZE error: %s", buf + 4); + filesize = value; + } + + if ((local_path[0] == '-') && (local_path[1] == '\0')) { + fd_local = STDOUT_FILENO; + do_continue = 0; } if (do_continue) { struct stat sbuf; - if (lstat(local_file, &sbuf) < 0) { + if (lstat(local_path, &sbuf) < 0) { bb_perror_msg_and_die("fstat()"); } if (sbuf.st_size > 0) { @@ -203,10 +176,12 @@ static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream, } /* only make a local file if we know that one exists on the remote server */ - if (do_continue) { - fd_local = bb_xopen(local_file, O_APPEND | O_WRONLY); - } else { - fd_local = bb_xopen(local_file, O_CREAT | O_TRUNC | O_WRONLY); + if (fd_local == -1) { + if (do_continue) { + fd_local = bb_xopen(local_path, O_APPEND | O_WRONLY); + } else { + fd_local = bb_xopen(local_path, O_CREAT | O_TRUNC | O_WRONLY); + } } /* Copy the file */ @@ -220,13 +195,13 @@ static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream, bb_error_msg_and_die("ftp error: %s", buf + 4); } ftpcmd("QUIT", NULL, control_stream, buf); - + return(EXIT_SUCCESS); } #endif #ifdef CONFIG_FTPPUT -static int ftp_send(ftp_host_info_t *server, FILE *control_stream, +static int ftp_send(ftp_host_info_t *server, FILE *control_stream, const char *server_path, char *local_path) { struct stat sbuf; @@ -241,27 +216,26 @@ static int ftp_send(ftp_host_info_t *server, FILE *control_stream, } fd_data = xconnect_ftpdata(server, buf); - if (ftpcmd("CWD ", server_path, control_stream, buf) != 250) { - bb_error_msg_and_die("CWD error: %s", buf + 4); - } - /* get the local file */ - fd_local = bb_xopen(local_path, O_RDONLY); - fstat(fd_local, &sbuf); - - sprintf(buf, "ALLO %lu", (unsigned long)sbuf.st_size); - response = ftpcmd(buf, NULL, control_stream, buf); - switch (response) { - case 200: - case 202: - break; - default: - close(fd_local); - bb_error_msg_and_die("ALLO error: %s", buf + 4); - break; + if ((local_path[0] == '-') && (local_path[1] == '\0')) { + fd_local = STDIN_FILENO; + } else { + fd_local = bb_xopen(local_path, O_RDONLY); + fstat(fd_local, &sbuf); + + sprintf(buf, "ALLO %lu", (unsigned long)sbuf.st_size); + response = ftpcmd(buf, NULL, control_stream, buf); + switch (response) { + case 200: + case 202: + break; + default: + close(fd_local); + bb_error_msg_and_die("ALLO error: %s", buf + 4); + break; + } } - - response = ftpcmd("STOR ", local_path, control_stream, buf); + response = ftpcmd("STOR ", server_path, control_stream, buf); switch (response) { case 125: case 150: @@ -306,6 +280,7 @@ int ftpgetput_main(int argc, char **argv) { /* content-length of the file */ unsigned long opt; + char *port = "ftp"; /* socket to ftp server */ FILE *control_stream; @@ -316,27 +291,43 @@ int ftpgetput_main(int argc, char **argv) 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_FTPGET if (bb_applet_name[3] == 'p') { ftp_action = ftp_send; - } + } +# else + ftp_action = ftp_send; +# endif #endif #ifdef CONFIG_FTPGET +# ifdef CONFIG_FTPPUT if (bb_applet_name[3] == 'g') { ftp_action = ftp_recieve; } +# else + ftp_action = ftp_recieve; +# endif #endif /* Set default values */ - server = ftp_init(); + server = xmalloc(sizeof(ftp_host_info_t)); + server->user = "anonymous"; + server->password = "busybox@"; verbose_flag = 0; - /* - * Decipher the command line + /* + * Decipher the command line */ - server->port = "21"; 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); + + /* Process the non-option command line arguments */ + if (argc - optind != 3) { + bb_show_usage(); + } + if (opt & FTPGETPUT_OPT_CONTINUE) { do_continue = 1; } @@ -344,22 +335,15 @@ int ftpgetput_main(int argc, char **argv) verbose_flag = 1; } - /* - * Process the non-option command line arguments - */ - if (argc - optind != 3) { - bb_show_usage(); - } - /* We want to do exactly _one_ DNS lookup, since some * sites (i.e. ftp.us.debian.org) use round-robin DNS * and we want to connect to only one IP... */ server->s_in = &s_in; - server->host = argv[optind]; - bb_lookup_host(&s_in, server->host, NULL); + bb_lookup_host(&s_in, argv[optind]); + s_in.sin_port = bb_lookup_port(port, "tcp", 21); if (verbose_flag) { - fprintf(stdout, "Connecting to %s[%s]:%s\n", - server->host, inet_ntoa(s_in.sin_addr), server->port); + printf("Connecting to %s[%s]:%d\n", + argv[optind], inet_ntoa(s_in.sin_addr), ntohs(s_in.sin_port)); } /* Connect/Setup/Configure the FTP session */