X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fftpgetput.c;h=51e230296fcbf5148899395b3f7b008e4a311821;hb=4fa5e8b455c732db3176c7dbd58dec63d38f4273;hp=2fd50e4c4aca0fc7851e38319f1bd1a4c4025dc3;hpb=7ffe1338647d2b890df3ae46e526410b21a90d18;p=oweals%2Fbusybox.git diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c index 2fd50e4c4..51e230296 100644 --- a/networking/ftpgetput.c +++ b/networking/ftpgetput.c @@ -1,186 +1,170 @@ /* 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 -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - #include "busybox.h" +#include typedef struct ftp_host_info_s { - char *host; - char *port; char *user; char *password; - struct sockaddr_in *s_in; + struct len_and_sockaddr *lsa; } ftp_host_info_t; -static char verbose_flag; -static char do_continue = 0; +static smallint verbose_flag; +static smallint do_continue; -static ftp_host_info_t *ftp_init(void) +static void ftp_die(const char *msg, const char *remote) ATTRIBUTE_NORETURN; +static void ftp_die(const char *msg, const char *remote) { - 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); + /* Guard against garbage from remote server */ + const char *cp = remote; + while (*cp >= ' ' && *cp < '\x7f') cp++; + bb_error_msg_and_die("unexpected server response%s%s: %.*s", + msg ? " to " : "", msg ? msg : "", + (int)(cp - remote), remote); } + 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) { 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()"); + bb_perror_msg_and_die("fgets"); + } + buf_ptr = strstr(buf, "\r\n"); + if (buf_ptr) { + *buf_ptr = '\0'; } - } while (! isdigit(buf[0]) || buf[3] != ' '); + } while (!isdigit(buf[0]) || buf[3] != ' '); - return atoi(buf); + buf[3] = '\0'; + n = xatou(buf); + buf[3] = ' '; + return n; } -static int xconnect_ftpdata(ftp_host_info_t *server, const char *buf) +static int xconnect_ftpdata(ftp_host_info_t *server, char *buf) { char *buf_ptr; unsigned short port_num; + /* Response is "NNN garbageN1,N2,N3,N4,P1,P2[)garbage] + * Server's IP is N1.N2.N3.N4 (we ignore it) + * Server's port for data connection is P1*256+P2 */ + buf_ptr = strrchr(buf, ')'); + if (buf_ptr) *buf_ptr = '\0'; + buf_ptr = strrchr(buf, ','); *buf_ptr = '\0'; - port_num = atoi(buf_ptr + 1); + port_num = xatoul_range(buf_ptr + 1, 0, 255); buf_ptr = strrchr(buf, ','); *buf_ptr = '\0'; - port_num += atoi(buf_ptr + 1) * 256; + port_num += xatoul_range(buf_ptr + 1, 0, 255) * 256; - server->s_in->sin_port=htons(port_num); - return(xconnect(server->s_in)); + set_port(server->lsa, htons(port_num)); + return xconnect_stream(server->lsa); } 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_stream(server->lsa), "r+"); if (control_stream == NULL) { - bb_perror_msg_and_die("Couldnt open control stream"); + /* fdopen failed - extremely unlikely */ + bb_perror_nomsg_and_die(); } if (ftpcmd(NULL, NULL, control_stream, buf) != 220) { - bb_error_msg_and_die("%s", buf + 4); + ftp_die(NULL, buf); } /* Login to the server */ - switch (ftpcmd("USER ", server->user, control_stream, buf)) { + switch (ftpcmd("USER", server->user, control_stream, buf)) { case 230: break; case 331: - if (ftpcmd("PASS ", server->password, control_stream, buf) != 230) { - bb_error_msg_and_die("PASS error: %s", buf + 4); + if (ftpcmd("PASS", server->password, control_stream, buf) != 230) { + ftp_die("PASS", buf); } break; default: - bb_error_msg_and_die("USER error: %s", buf + 4); + ftp_die("USER", buf); } ftpcmd("TYPE I", NULL, control_stream, buf); - return(control_stream); + return control_stream; } -#ifdef CONFIG_FTPGET -static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream, +#if !ENABLE_FTPGET +int ftp_receive(ftp_host_info_t *server, FILE *control_stream, + const char *local_path, char *server_path); +#else +static +int ftp_receive(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; +/* I think 'filesize' usage here is bogus. Let's see... */ + //off_t filesize = -1; +#define filesize ((off_t)-1) 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); + ftp_die("PASV", buf); } fd_data = xconnect_ftpdata(server, buf); - if (ftpcmd("SIZE ", server_path, control_stream, buf) == 213) { - filesize = atol(buf + 4); + if (ftpcmd("SIZE", server_path, control_stream, buf) == 213) { + //filesize = BB_STRTOOFF(buf + 4, NULL, 10); + //if (errno || filesize < 0) + // ftp_die("SIZE", buf); + } else { + do_continue = 0; + } + + if (LONE_DASH(local_path)) { + fd_local = STDOUT_FILENO; + do_continue = 0; } if (do_continue) { struct stat sbuf; - if (lstat(local_file, &sbuf) < 0) { - bb_perror_msg_and_die("fstat()"); + if (lstat(local_path, &sbuf) < 0) { + bb_perror_msg_and_die("lstat"); } if (sbuf.st_size > 0) { beg_range = sbuf.st_size; @@ -190,43 +174,54 @@ static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream, } if (do_continue) { - sprintf(buf, "REST %ld", (long)beg_range); + sprintf(buf, "REST %"OFF_FMT"d", beg_range); if (ftpcmd(buf, NULL, control_stream, buf) != 350) { do_continue = 0; } else { - filesize -= beg_range; + //if (filesize != -1) + // filesize -= beg_range; } } - if (ftpcmd("RETR ", server_path, control_stream, buf) > 150) { - bb_error_msg_and_die("RETR error: %s", buf + 4); + if (ftpcmd("RETR", server_path, control_stream, buf) > 150) { + ftp_die("RETR", buf); } /* 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 = xopen(local_path, O_APPEND | O_WRONLY); + } else { + fd_local = xopen(local_path, O_CREAT | O_TRUNC | O_WRONLY); + } } /* Copy the file */ - if (bb_copyfd_size(fd_data, fd_local, filesize) == -1) { - exit(EXIT_FAILURE); + if (filesize != -1) { + if (bb_copyfd_size(fd_data, fd_local, filesize) == -1) + return EXIT_FAILURE; + } else { + if (bb_copyfd_eof(fd_data, fd_local) == -1) + return EXIT_FAILURE; } /* close it all down */ close(fd_data); if (ftpcmd(NULL, NULL, control_stream, buf) != 226) { - bb_error_msg_and_die("ftp error: %s", buf + 4); + ftp_die(NULL, buf); } ftpcmd("QUIT", NULL, control_stream, buf); - - return(EXIT_SUCCESS); + + return EXIT_SUCCESS; } #endif -#ifdef CONFIG_FTPPUT -static int ftp_send(ftp_host_info_t *server, FILE *control_stream, +#if !ENABLE_FTPPUT +int ftp_send(ftp_host_info_t *server, FILE *control_stream, + const char *server_path, char *local_path); +#else +static +int ftp_send(ftp_host_info_t *server, FILE *control_stream, const char *server_path, char *local_path) { struct stat sbuf; @@ -237,38 +232,36 @@ static int ftp_send(ftp_host_info_t *server, FILE *control_stream, /* Connect to the data socket */ if (ftpcmd("PASV", NULL, control_stream, buf) != 227) { - bb_error_msg_and_die("PASV error: %s", buf + 4); + ftp_die("PASV", buf); } 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; + fd_local = STDIN_FILENO; + if (NOT_LONE_DASH(local_path)) { + fd_local = xopen(local_path, O_RDONLY); + fstat(fd_local, &sbuf); + + sprintf(buf, "ALLO %"OFF_FMT"u", sbuf.st_size); + response = ftpcmd(buf, NULL, control_stream, buf); + switch (response) { + case 200: + case 202: + break; + default: + close(fd_local); + ftp_die("ALLO", buf); + break; + } } - - response = ftpcmd("STOR ", local_path, control_stream, buf); + response = ftpcmd("STOR", server_path, control_stream, buf); switch (response) { case 125: case 150: break; default: close(fd_local); - bb_error_msg_and_die("STOR error: %s", buf + 4); + ftp_die("STOR", buf); } /* transfer the file */ @@ -279,107 +272,87 @@ static int ftp_send(ftp_host_info_t *server, FILE *control_stream, /* close it all down */ close(fd_data); if (ftpcmd(NULL, NULL, control_stream, buf) != 226) { - bb_error_msg_and_die("error: %s", buf + 4); + ftp_die("close", buf); } ftpcmd("QUIT", NULL, control_stream, buf); - return(EXIT_SUCCESS); + return EXIT_SUCCESS; } #endif +#define FTPGETPUT_OPT_CONTINUE 1 +#define FTPGETPUT_OPT_VERBOSE 2 +#define FTPGETPUT_OPT_USER 4 +#define FTPGETPUT_OPT_PASSWORD 8 +#define FTPGETPUT_OPT_PORT 16 + +#if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS +static const struct option ftpgetput_long_options[] = { + { "continue", 1, NULL, 'c' }, + { "verbose", 0, NULL, 'v' }, + { "username", 1, NULL, 'u' }, + { "password", 1, NULL, 'p' }, + { "port", 1, NULL, 'P' }, + { 0, 0, 0, 0 } +}; +#endif + int ftpgetput_main(int argc, char **argv) { /* content-length of the file */ - int option_index = -1; - int opt; - + unsigned opt; + const char *port = "ftp"; /* socket to ftp server */ FILE *control_stream; - struct sockaddr_in s_in; - - /* continue a prev transfer (-c) */ + /* continue previous transfer (-c) */ ftp_host_info_t *server; - int (*ftp_action)(ftp_host_info_t *, FILE *, const char *, char *) = NULL; - - struct option long_options[] = { - {"username", 1, NULL, 'u'}, - {"password", 1, NULL, 'p'}, - {"port", 1, NULL, 'P'}, - {"continue", 1, NULL, 'c'}, - {"verbose", 0, NULL, 'v'}, - {0, 0, 0, 0} - }; - -#ifdef CONFIG_FTPPUT - if (bb_applet_name[3] == 'p') { - ftp_action = ftp_send; - } -#endif -#ifdef CONFIG_FTPGET - if (bb_applet_name[3] == 'g') { - ftp_action = ftp_recieve; +#if ENABLE_FTPPUT && !ENABLE_FTPGET +# define ftp_action ftp_send +#elif ENABLE_FTPGET && !ENABLE_FTPPUT +# define ftp_action ftp_receive +#else + int (*ftp_action)(ftp_host_info_t *, FILE *, const char *, char *) = ftp_send; + /* Check to see if the command is ftpget or ftput */ + if (applet_name[3] == 'g') { + ftp_action = ftp_receive; } #endif /* Set default values */ - server = ftp_init(); - verbose_flag = 0; - - /* - * Decipher the command line - */ - server->port = "21"; - while ((opt = getopt_long(argc, argv, "u:p:P:cv", long_options, &option_index)) != EOF) { - switch(opt) { - case 'c': - do_continue = 1; - break; - case 'u': - server->user = optarg; - break; - case 'p': - server->password = optarg; - break; - case 'P': - server->port = optarg; - break; - case 'v': - verbose_flag = 1; - break; - default: - bb_show_usage(); - } - } + server = xmalloc(sizeof(*server)); + server->user = "anonymous"; + server->password = "busybox@"; /* - * Process the non-option command line arguments + * Decipher the command line */ - if (argc - optind != 3) { - bb_show_usage(); +#if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS + applet_long_options = ftpgetput_long_options; +#endif + opt_complementary = "=3"; /* must have 3 params */ + opt = getopt32(argc, argv, "cvu:p:P:", &server->user, &server->password, &port); + argv += optind; + + /* Process the non-option command line arguments */ + if (opt & FTPGETPUT_OPT_CONTINUE) { + do_continue = 1; + } + if (opt & FTPGETPUT_OPT_VERBOSE) { + verbose_flag = 1; } /* 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); + server->lsa = host2sockaddr(argv[0], 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]\n", argv[0], + xmalloc_sockaddr2dotted(&server->lsa->sa, server->lsa->len)); } /* Connect/Setup/Configure the FTP session */ control_stream = ftp_login(server); - return(ftp_action(server, control_stream, argv[optind + 1], argv[optind + 2])); + return ftp_action(server, control_stream, argv[1], argv[2]); } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/