/* 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 <jeff@theptrgroup.com>
- * Copyright (C) 2002 Glenn McGrath <bug1@optushome.com.au>
+ * Copyright (C) 2002 Glenn McGrath <bug1@iinet.net.au>
*
* Based on wget.c by Chip Rosenthal Covad Communications
* <chip@laserlink.net>
*
- * 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 <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-
#include "busybox.h"
+#include <getopt.h>
typedef struct ftp_host_info_s {
char *user;
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);
+ return xatou(buf);
}
static int xconnect_ftpdata(ftp_host_info_t *server, const char *buf)
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));
+ server->s_in->sin_port = htons(port_num);
+ return xconnect_tcp_v4(server->s_in);
}
static FILE *ftp_login(ftp_host_info_t *server)
char buf[512];
/* Connect to the command socket */
- control_stream = fdopen(xconnect(server->s_in), "r+");
+ control_stream = fdopen(xconnect_tcp_v4(server->s_in), "r+");
if (control_stream == NULL) {
- bb_perror_msg_and_die("Couldnt open control stream");
+ bb_perror_msg_and_die("cannot open control stream");
}
if (ftpcmd(NULL, NULL, control_stream, buf) != 220) {
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 buf[512];
fd_data = xconnect_ftpdata(server, buf);
if (ftpcmd("SIZE ", server_path, control_stream, buf) == 213) {
- filesize = atol(buf + 4);
+ if (SAFE_STRTOOFF(buf + 4, &filesize))
+ bb_error_msg_and_die("SIZE error: %s", buf + 4);
+ } else {
+ filesize = -1;
+ do_continue = 0;
}
if ((local_path[0] == '-') && (local_path[1] == '\0')) {
- fd_local = fileno(stdout);
+ fd_local = STDOUT_FILENO;
do_continue = 0;
}
if (do_continue) {
struct stat sbuf;
if (lstat(local_path, &sbuf) < 0) {
- bb_perror_msg_and_die("fstat()");
+ bb_perror_msg_and_die("lstat");
}
if (sbuf.st_size > 0) {
beg_range = sbuf.st_size;
}
if (do_continue) {
- sprintf(buf, "REST %ld", (long)beg_range);
+ sprintf(buf, "REST %"OFF_FMT, beg_range);
if (ftpcmd(buf, NULL, control_stream, buf) != 350) {
do_continue = 0;
} else {
/* only make a local file if we know that one exists on the remote server */
if (fd_local == -1) {
if (do_continue) {
- fd_local = bb_xopen(local_path, O_APPEND | O_WRONLY);
+ fd_local = xopen(local_path, O_APPEND | O_WRONLY);
} else {
- fd_local = bb_xopen(local_path, O_CREAT | O_TRUNC | O_WRONLY);
+ fd_local = xopen3(local_path, O_CREAT | O_TRUNC | O_WRONLY, 0666);
}
}
/* Copy the file */
- if (bb_copyfd_size(fd_data, fd_local, filesize) == -1) {
- exit(EXIT_FAILURE);
+ if (filesize != -1) {
+ if (-1 == bb_copyfd_size(fd_data, fd_local, filesize))
+ exit(EXIT_FAILURE);
+ } else {
+ if (-1 == bb_copyfd_eof(fd_data, fd_local))
+ exit(EXIT_FAILURE);
}
/* close it all down */
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,
+#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;
}
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 */
if ((local_path[0] == '-') && (local_path[1] == '\0')) {
- fd_local = fileno(stdin);
+ fd_local = STDIN_FILENO;
} else {
- fd_local = bb_xopen(local_path, O_RDONLY);
+ fd_local = xopen(local_path, O_RDONLY);
fstat(fd_local, &sbuf);
sprintf(buf, "ALLO %lu", (unsigned long)sbuf.st_size);
break;
}
}
- response = ftpcmd("STOR ", local_path, control_stream, buf);
+ response = ftpcmd("STOR ", server_path, control_stream, buf);
switch (response) {
case 125:
case 150:
#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'},
{"port", 1, NULL, 'P'},
{0, 0, 0, 0}
};
+#else
+#define ftpgetput_long_options 0
+#endif
int ftpgetput_main(int argc, char **argv)
{
/* content-length of the file */
- unsigned long opt;
+ unsigned opt;
char *port = "ftp";
/* socket to ftp server */
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') {
+ if (ENABLE_FTPPUT && (!ENABLE_FTPGET || 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;
+ if (ENABLE_FTPGET && (!ENABLE_FTPPUT || applet_name[3] == 'g')) {
+ ftp_action = ftp_receive;
}
-# else
- ftp_action = ftp_recieve;
-# endif
-#endif
/* Set default values */
server = xmalloc(sizeof(ftp_host_info_t));
server->password = "busybox@";
verbose_flag = 0;
- /*
- * Decipher the command line
+ /*
+ * Decipher the command line
*/
- bb_applet_long_options = ftpgetput_long_options;
- opt = bb_getopt_ulflags(argc, argv, "cvu:p:P:", &server->user, &server->password, &port);
+ if (ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS)
+ applet_long_options = ftpgetput_long_options;
+
+ opt = getopt32(argc, argv, "cvu:p:P:", &server->user, &server->password, &port);
/* Process the non-option command line arguments */
if (argc - optind != 3) {
return(ftp_action(server, control_stream, argv[optind + 1], argv[optind + 2]));
}
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
projects / oweals / busybox.git / blobdiff