Ftpgetput.c mod
Mark Richards
mark.richards at massmicro.com
Sun Dec 25 01:03:46 UTC 2005
I can't take it anymore!! :)
Quite some time ago I fixed/changed ftpgetput.c so that ftpput will work
from a directory other than the source file.
ie:
ftpput -u name -p pass 192.191.91.6 /var/root/2
/var/tmp/upload/etc.tar.gz
will fail with:
ftpput: STOR error: /var/tmp/upload/etc.tar.gz: No such file or
directory
...if the command is not executed in /var/tmp/upload.
I think that I had submitted the change, but maybe I didn't do so in the
proper way.
At any rate, I just updated busybox in my general build and have since been
chasing down an ftpput problem which - you got it - is the old problem!
So, following, is the source code for the modified version.
Would someone please see to it that the change gets into production or tell
me how to make it so?
Many thanks,
/mark
/* vi: set sw=4 ts=4: */
// 4 February, 2005 1400 edt
// Richards
// Modified ftpput so that it will now accept a full path name to the source
file
// on the client side. Previously the FTP server would return an error
because the
// pathname was included with the source filename specification.
//
/*
* ftpget
*
* Mini implementation of FTP to retrieve a remote file.
*
* Copyright (C) 2002 Jeff Angielski, The PTR Group <jeff at theptrgroup.com>
* Copyright (C) 2002 Glenn McGrath <bug1 at iinet.net.au>
*
* Based on wget.c by Chip Rosenthal Covad Communications
* <chip at 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
*
*/
#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"
typedef struct ftp_host_info_s {
char *user;
char *password;
struct sockaddr_in *s_in;
} ftp_host_info_t;
static char verbose_flag = 0;
static char do_continue = 0;
static int ftpcmd(const char *s1, const char *s2, FILE *stream, char *buf)
{
if (verbose_flag) {
bb_error_msg("cmd %s%s", s1, s2);
}
if (s1)
{
if (s2)
{
// printf("sending %s %s into stream...\n", s1, s2);
fprintf(stream, "%s%s\n", s1, s2);
}
else
{
fprintf(stream, "%s\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);
}
static int xconnect_ftpdata(ftp_host_info_t *server, const char *buf)
{
char *buf_ptr;
unsigned short port_num;
buf_ptr = strrchr(buf, ',');
*buf_ptr = '\0';
port_num = atoi(buf_ptr + 1);
buf_ptr = strrchr(buf, ',');
*buf_ptr = '\0';
port_num += atoi(buf_ptr + 1) * 256;
server->s_in->sin_port=htons(port_num);
return(xconnect(server->s_in));
}
static FILE *ftp_login(ftp_host_info_t *server)
{
FILE *control_stream;
char buf[512];
/* Connect to the command socket */
control_stream = fdopen(xconnect(server->s_in), "r+");
if (control_stream == NULL) {
bb_perror_msg_and_die("Couldnt open control stream");
}
if (ftpcmd(NULL, NULL, control_stream, buf) != 220) {
bb_error_msg_and_die("%s", buf + 4);
}
/* Login to the server */
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);
}
break;
default:
bb_error_msg_and_die("USER error: %s", buf + 4);
}
ftpcmd("TYPE I", NULL, control_stream, buf);
return(control_stream);
}
#ifdef CONFIG_FTPGET
static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream,
const char *local_path, char *server_path)
{
char buf[512];
off_t filesize = 0;
int fd_data;
int fd_local = -1;
off_t beg_range = 0;
/* Connect to the data socket */
if (ftpcmd("PASV", NULL, control_stream, buf) != 227) {
bb_error_msg_and_die("PASV error: %s", buf + 4);
}
fd_data = xconnect_ftpdata(server, buf);
if (ftpcmd("SIZE ", server_path, control_stream, buf) == 213) {
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_path, &sbuf) < 0) {
bb_perror_msg_and_die("fstat()");
}
if (sbuf.st_size > 0) {
beg_range = sbuf.st_size;
} else {
do_continue = 0;
}
}
if (do_continue) {
sprintf(buf, "REST %ld", (long)beg_range);
if (ftpcmd(buf, NULL, control_stream, buf) != 350) {
do_continue = 0;
} else {
filesize -= beg_range;
}
}
if (ftpcmd("RETR ", server_path, control_stream, buf) > 150) {
bb_error_msg_and_die("RETR error: %s", buf + 4);
}
/* 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);
} else {
fd_local = bb_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);
}
/* 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);
}
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,
const char *server_path, char *local_path)
{
struct stat sbuf;
char buf[512];
char cFnBuff[32];
int fd_data;
int fd_local;
int response;
/* Connect to the data socket */
if (ftpcmd("PASV", NULL, control_stream, buf) != 227) {
bb_error_msg_and_die("PASV error: %s", buf + 4);
}
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 = STDIN_FILENO;
}
else
{
fd_local = bb_xopen(local_path, O_RDONLY);
fstat(fd_local, &sbuf);
// printf("ftpput has opened local file %s\n",local_path);
sprintf(buf, "ALLO %lu", (unsigned long)sbuf.st_size);
// printf("ftpput sending command %s\n",buf);
response = ftpcmd(buf, NULL, control_stream, buf);
// printf("ftpput received response code: %i\n",response);
switch (response) {
case 200:
case 202:
break;
default:
close(fd_local);
bb_error_msg_and_die("ALLO error: %s", buf + 4);
break;
}
}
// strip the full path off the file for STOR local_path
strcpy(cFnBuff,basename(local_path));
// printf("ftpput sending STOR command localpath=%s\n",cFnBuff);
// response = ftpcmd("STOR ", local_path, control_stream, buf);
response = ftpcmd("STOR ", cFnBuff, control_stream, buf);
// printf("ftpput received response code: %i\n",response);
switch (response) {
case 125:
case 150:
break;
default:
close(fd_local);
bb_error_msg_and_die("STOR error: %s", buf + 4);
}
/* transfer the file */
if (bb_copyfd_eof(fd_local, fd_data) == -1) {
exit(EXIT_FAILURE);
}
/* close it all down */
close(fd_data);
if (ftpcmd(NULL, NULL, control_stream, buf) != 226) {
bb_error_msg_and_die("error: %s", buf + 4);
}
ftpcmd("QUIT", NULL, control_stream, buf);
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
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}
};
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;
struct sockaddr_in s_in;
/* continue a prev transfer (-c) */
ftp_host_info_t *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') {
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 = xmalloc(sizeof(ftp_host_info_t));
server->user = "anonymous";
server->password = "busybox@";
verbose_flag = 0;
/*
* 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);
/* Process the non-option command line arguments */
if (argc - optind != 3) {
bb_show_usage();
}
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;
bb_lookup_host(&s_in, argv[optind]);
s_in.sin_port = bb_lookup_port(port, "tcp", 21);
if (verbose_flag) {
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 */
control_stream = ftp_login(server);
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:
*/
More information about the busybox
mailing list