Changeset ff49ffe in rtems

Timestamp:

Apr 4, 2011, 5:08:34 PM (9 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.11, master

Children:

bd9baa81

Parents:

9c24c73

Message:

2011-04-04 Sebastien Bourdeauducq <sebastien.bourdeauducq@…>

PR 1722/networking

• ftpd/ftpd.c: FTPD fails to parse correctly FTP commands relating to filenames with spaces in them.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• ftpd/ftpd.c (modified) (7 diffs)

cpukit/ChangeLog

@@ +1 @@
+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>
 

cpukit/ftpd/ftpd.c

@@ -16 +16 @@
  *  Changes:
  *
+ *    2010-12-02        Sebastien Bourdeauducq <sebastien@milkymist.org>
+ *
+ *      * Support spaces in filenames
+ * 
  *    2001-01-31        Sergei Organov <osv@javad.ru>
  *
@@ -1681 +1685 @@
   else if (!strcmp("RETR", cmd))
   {
-    sscanf(args, "%254s", fname);
+    strncpy(fname, args, 254);
     command_retrieve(info, fname);
   }
   else if (!strcmp("STOR", cmd))
   {
-    sscanf(args, "%254s", fname);
+    strncpy(fname, args, 254);
     command_store(info, fname);
   }
   else if (!strcmp("LIST", cmd))
   {
-    sscanf(args, "%254s", fname);
+    strncpy(fname, args, 254);
     command_list(info, fname, 1);
   }
   else if (!strcmp("NLST", cmd))
   {
-    sscanf(args, "%254s", fname);
+    strncpy(fname, args, 254);
     command_list(info, fname, 0);
   }
   else if (!strcmp("MDTM", cmd))
   {
-    sscanf(args, "%254s", fname);
+    strncpy(fname, args, 254);
     command_mdtm(info, fname);
   }
@@ -1737 +1741 @@
     }
     else if (
-      1 == sscanf(args, "%254s", fname) &&
+      strncpy(fname, args, 254) &&
       unlink(fname) == 0)
     {
@@ -1759 +1763 @@
         send_reply(info, 550, "Access denied.");
       }
-      else if(
-        2 == sscanf(args, "%o %254s", &mask, fname) &&
-        chmod(fname, (mode_t)mask) == 0)
-      {
-        send_reply(info, 257, "CHMOD successful.");
-      }
-      else
-      {
-        send_reply(info, 550, "CHMOD failed.");
+      else {
+        char *c;
+        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.");
+        else
+          send_reply(info, 550, "CHMOD failed.");
       }
     }
@@ -1780 +1783 @@
     }
     else if (
-      1 == sscanf(args, "%254s", fname) &&
+      strncpy(fname, args, 254) &&
       rmdir(fname) == 0)
     {
@@ -1797 +1800 @@
     }
     else if (
-      1 == sscanf(args, "%254s", fname) &&
+      strncpy(fname, args, 254) &&
       mkdir(fname, S_IRWXU | S_IRWXG | S_IRWXO) == 0)
     {
@@ -1809 +1812 @@
   else if (!strcmp("CWD", cmd))
   {
-    sscanf(args, "%254s", fname);
+    strncpy(fname, args, 254);
     command_cwd(info, fname);
   }