RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2011-04-04 Sebastien Bourdeauducq <sebastien.bourdeauducq@gmail.com>

Browse Source 
PR 1722/networking
	* ftpd/ftpd.c: FTPD fails to parse correctly FTP commands relating to
	filenames with spaces in them.
This commit is contained in:
Joel Sherrill
2011-04-04 17:08:34 +00:00
parent 9c24c7332c
commit ff49ffe396
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/ChangeLog
View File

@@ -1,3 +1,9 @@
2011-04-04 Sebastien Bourdeauducq <sebastien.bourdeauducq@gmail.com>
PR 1722/networking
* ftpd/ftpd.c: FTPD fails to parse correctly FTP commands relating to
filenames with spaces in them.
2011-04-04 Joel Sherrill <joel.sherrilL@OARcorp.com> 2011-04-04 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1773/cpukit PR 1773/cpukit

33
cpukit/ftpd/ftpd.c
View File

@@ -15,6 +15,10 @@
* *
* Changes: * Changes:
* *
* 2010-12-02 Sebastien Bourdeauducq <sebastien@milkymist.org>
*
* * Support spaces in filenames
*
* 2001-01-31 Sergei Organov <osv@javad.ru> * 2001-01-31 Sergei Organov <osv@javad.ru>
* *
* * Hacks with current dir and root dir removed in favor of new libio * * Hacks with current dir and root dir removed in favor of new libio
@@ -1680,27 +1684,27 @@ exec_command(FTPD_SessionInfo_t *info, char* cmd, char* args)
} }
else if (!strcmp("RETR", cmd)) else if (!strcmp("RETR", cmd))
{ {
sscanf(args, "%254s", fname); strncpy(fname, args, 254);
command_retrieve(info, fname); command_retrieve(info, fname);
} }
else if (!strcmp("STOR", cmd)) else if (!strcmp("STOR", cmd))
{ {
sscanf(args, "%254s", fname); strncpy(fname, args, 254);
command_store(info, fname); command_store(info, fname);
} }
else if (!strcmp("LIST", cmd)) else if (!strcmp("LIST", cmd))
{ {
sscanf(args, "%254s", fname); strncpy(fname, args, 254);
command_list(info, fname, 1); command_list(info, fname, 1);
} }
else if (!strcmp("NLST", cmd)) else if (!strcmp("NLST", cmd))
{ {
sscanf(args, "%254s", fname); strncpy(fname, args, 254);
command_list(info, fname, 0); command_list(info, fname, 0);
} }
else if (!strcmp("MDTM", cmd)) else if (!strcmp("MDTM", cmd))
{ {
sscanf(args, "%254s", fname); strncpy(fname, args, 254);
command_mdtm(info, fname); command_mdtm(info, fname);
} }
else if (!strcmp("SYST", cmd)) else if (!strcmp("SYST", cmd))
@@ -1736,7 +1740,7 @@ exec_command(FTPD_SessionInfo_t *info, char* cmd, char* args)
send_reply(info, 550, "Access denied."); send_reply(info, 550, "Access denied.");
} }
else if ( else if (
1 == sscanf(args, "%254s", fname) && strncpy(fname, args, 254) &&
unlink(fname) == 0) unlink(fname) == 0)
{ {
send_reply(info, 257, "DELE successful."); send_reply(info, 257, "DELE successful.");
@@ -1758,14 +1762,13 @@ exec_command(FTPD_SessionInfo_t *info, char* cmd, char* args)
{ {
send_reply(info, 550, "Access denied."); send_reply(info, 550, "Access denied.");
} }
else if( else {
2 == sscanf(args, "%o %254s", &mask, fname) && char *c;
chmod(fname, (mode_t)mask) == 0) c = strchr(args, ' ');
{ if((c != NULL) && (sscanf(args, "%o", &mask) == 1) && strncpy(fname, c+1, 254)
&& (chmod(fname, (mode_t)mask) == 0))
send_reply(info, 257, "CHMOD successful."); send_reply(info, 257, "CHMOD successful.");
}
else else
{
send_reply(info, 550, "CHMOD failed."); send_reply(info, 550, "CHMOD failed.");
} }
} }
@@ -1779,7 +1782,7 @@ exec_command(FTPD_SessionInfo_t *info, char* cmd, char* args)
send_reply(info, 550, "Access denied."); send_reply(info, 550, "Access denied.");
} }
else if ( else if (
1 == sscanf(args, "%254s", fname) && strncpy(fname, args, 254) &&
rmdir(fname) == 0) rmdir(fname) == 0)
{ {
send_reply(info, 257, "RMD successful."); send_reply(info, 257, "RMD successful.");
@@ -1796,7 +1799,7 @@ exec_command(FTPD_SessionInfo_t *info, char* cmd, char* args)
send_reply(info, 550, "Access denied."); send_reply(info, 550, "Access denied.");
} }
else if ( else if (
1 == sscanf(args, "%254s", fname) && strncpy(fname, args, 254) &&
mkdir(fname, S_IRWXU | S_IRWXG | S_IRWXO) == 0) mkdir(fname, S_IRWXU | S_IRWXG | S_IRWXO) == 0)
{ {
send_reply(info, 257, "MKD successful."); send_reply(info, 257, "MKD successful.");
@@ -1808,7 +1811,7 @@ exec_command(FTPD_SessionInfo_t *info, char* cmd, char* args)
} }
else if (!strcmp("CWD", cmd)) else if (!strcmp("CWD", cmd))
{ {
sscanf(args, "%254s", fname); strncpy(fname, args, 254);
command_cwd(info, fname); command_cwd(info, fname);
} }
else if (!strcmp("CDUP", cmd)) else if (!strcmp("CDUP", cmd))