FTP server, bugfix: not removing directories

2026-05-20 10:14:44 -07:00 · 2018-03-16 18:29:40 +01:00
parent 1f67e6e0ee
commit 651cb28544
19 changed files with 11 additions and 1 deletions
@@ -1018,10 +1018,20 @@ static void ftp_process_cmd (void) {
            }
            break;
        case E_FTP_CMD_DELE:
+            ftp_get_param_and_open_child(&bufptr);
+            if ((strlen(ftp_path) > 0) && (ftp_path[strlen(ftp_path)-1] != '/')) {
+				if (unlink(ftp_path) == 0) {
+					vTaskDelay(20 / portTICK_PERIOD_MS);
+					ftp_send_reply(250, NULL);
+				}
+				else ftp_send_reply(550, NULL);
+            }
+            else ftp_send_reply(250, NULL);
+            break;
        case E_FTP_CMD_RMD:
            ftp_get_param_and_open_child(&bufptr);
            if ((strlen(ftp_path) > 0) && (ftp_path[strlen(ftp_path)-1] != '/')) {
-				if (unlink(ftp_path) >= 0) {
+				if (rmdir(ftp_path) == 0) {
 					vTaskDelay(20 / portTICK_PERIOD_MS);
 					ftp_send_reply(250, NULL);
 				}