enable recursive remove dir (rd /s)

Author: PerditionC

cmd/rmdir.c

@@ -4,19 +4,139 @@
 
 #include "../config.h"
 
+#include <assert.h>
+#include <dos.h>
 #include <io.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "suppl.h"
+#include "dfn.h"
 
 #include "../include/command.h"
 #include "../include/misc.h"
 #include "../include/lfnfuncs.h"
+#include "../err_fcts.h"
+#include "../strings.h"
 
-int recursive_rmdir(const char * path, int optRecursiveMode, int optQuiet)
+#ifdef FEATURE_LONG_FILENAMES
+#define abspath( x, y ) abspath( getshortfilename( x ), y )
+#endif
+
+/* recursively delete subdirs and files */
+int rmdir_withfiles(char * path, int maxlen)
 {
-	/* optQuiet effects parsing showing errors, but no effect on recursive call */
-	(void) optQuiet;
+	struct dos_ffblk f;
+	int len = strlen(path);  /* Warning: we assume path is a buffer is large enough for longest file path */
+	char *p = path+len;
+
+	/* ensure ends with \ */
+	if (p[-1] != '\\')
+		*p++ = '\\';
+	*p = '\0';
 
+	dprintf(("rmdir(%s)\n", path));	
+
+	/* cycle through removing directories first */
+	stpcpy(p, "*.*");
+	if (!dos_findfirst(path, &f, FA_DIREC)) {
+		int ret = 0;
+		do {
+			/* skip . and .. directory entries */
+			if ((strcmp(f.ff_name, ".")==0) ||
+			    (strcmp(f.ff_name, "..")==0))
+				continue;
+
+			if (f.ff_attrib & FA_DIREC) {
+				dprintf(("name=%s\n", f.ff_name));
+				/* avoid overflowing our buffer */
+				if((len + strlen(f.ff_name)) > maxlen) {
+					error_filename_too_long(p);
+					return E_Other;
+				}
+
+				strcpy(p, f.ff_name);       /* Make the full path */
+				/* recursively delete subdirectory */
+				ret = rmdir_withfiles(path, maxlen);
+			}
+		} while (!ret && (dos_findnext(&f) == 0));
+		dos_findclose(&f);
+		/* return early on error */
+		if (ret) return ret;
+	}
+
+	/* remove any files in current directory */
+	stpcpy(p, "*.*");
+	if (!dos_findfirst(path, &f, FA_NORMAL)) {
+		do {
+			/* avoid overflowing our buffer */
+			if((len + strlen(f.ff_name)) > maxlen) {
+				error_filename_too_long(p);
+				return E_Other;
+			}
+
+			strcpy(p, f.ff_name);       /* Make the full path */
+			dprintf(("deleting [%s]\n", path));
+			/* try to delete the file */
+			if(unlink(path) != 0)
+				myperror(path);  /* notify the user */
+		} while (dos_findnext(&f) == 0);
+		dos_findclose(&f);
+	}
+
+	/* finally actually remove the directory */
+	*p = '\0';
+	return rmdir(path);
+}
+
+int recursive_rmdir(const char * path, int optRecursiveMode, int optQuiet)
+{
 	if (optRecursiveMode) {
-		return 0;
+		struct dos_ffblk f;
+		char fullname[MAXPATH + sizeof(f.ff_name) + 2], *p;
+		int len;
+		/* Get the pattern fully-qualified */
+			/* Note: An absolute path always contains:
+				A:\\
+				--> It's always three bytes long at minimum
+				and always contains a backslash */
+		p = abspath(path, 1);
+		if(!p)
+			return E_Other;
+		assert(strlen(p) >= 3);
+
+		if((len = strlen(p)) >= MAXPATH) {
+			error_filename_too_long(p);
+			free(p);
+			return E_Other;
+		}
+		strcpy(fullname, p);
+		free(p);
+		p = fullname + len;
+
+		/* validate path exists and is a directory */
+		if(!(dfnstat(fullname) & DFN_DIRECTORY)) {
+			/* not a directory */
+			return E_Other;
+		}
+		
+		/* ensure ends with \ */
+		if (p[-1] != '\\')
+			*p++ = '\\';
+		*p = 0;
+		
+		/* prompt user if they are sure, regardless if files or not */
+		if (!optQuiet) {
+			int r;
+			r = userprompt(PROMPT_DELETE_ALL, fullname);  /* Are you sure? TODO fix me */
+				
+			if (r != 1) {
+				return E_Other;
+			}
+		}
+
+		return rmdir_withfiles(fullname, sizeof(fullname));
 	} else {
 		return rmdir(path);
 	}

lib/mk_rddir.c

@@ -16,7 +16,7 @@
 
 static int optRecursiveMode, optQuiet;
 
-/*#define COMMAND_EXTENSIONS*/
+#define COMMAND_EXTENSIONS
 #ifdef COMMAND_EXTENSIONS
 optScanFct(opt_md_rd)
 {