DBCS: handle DBCS for "mkdir /p" and "rmdir /s"

(cherry picked from commit b231e93)

Author: lpproj

cmd/mkdir.c

@@ -9,6 +9,9 @@
 
 #include "suppl.h"
 #include "dfn.h"
+#ifdef DBCS
+# include "mbcs.h"
+#endif
 
 #include "../include/command.h"
 #include "../include/misc.h"
@@ -25,7 +28,11 @@ int recursive_mkdir(const char * path, int recursiveMode, int quiet)
 		dprintf(("fullpath = %s\n", fullname));
 		do {
 			while (*p && ((*p != '\\') && (*p != '/'))) {
+#ifdef DBCS
+				p += MbLen(p);
+#else
 				p++;
+#endif
 			}
 			flag_not_done = *p; /* == 0 when end of path found, nonzero if \ or / */
 			*p = '\0';

cmd/rmdir.c

@@ -13,6 +13,9 @@
 
 #include "suppl.h"
 #include "dfn.h"
+#ifdef DBCS
+# include "mbcs.h"
+#endif
 
 #include "../include/command.h"
 #include "../include/misc.h"
@@ -25,15 +28,23 @@
 #endif
 
 /* recursively delete subdirs and files */
+#ifdef DBCS
+int rmdir_withfiles(const char * fullname, char * path, int maxlen)
+#else
 int rmdir_withfiles(char * path, int maxlen)
+#endif
 {
 	struct dos_ffblk f;
 	int ret;
 	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 \ */
+#ifdef DBCS
+	if (*fullname && *(CharPrev(fullname, p)) != '\\')
+#else
 	if (p[-1] != '\\')
+#endif
 		*p++ = '\\';
 	*p = '\0';
 
@@ -60,7 +71,11 @@ int rmdir_withfiles(char * path, int maxlen)
 
 				strcpy(p, f.ff_name);       /* Make the full path */
 				/* recursively delete subdirectory */
+#ifdef DBCS
+				ret = rmdir_withfiles(fullname, path, maxlen);
+#else
 				ret = rmdir_withfiles(path, maxlen);
+#endif
 			}
 		} while (!ret && (dos_findnext(&f) == 0));
 		dos_findclose(&f);
@@ -128,7 +143,11 @@ int recursive_rmdir(const char * path, int recursiveMode, int quiet)
 		}
 
 		/* ensure ends with \ */
+#ifdef DBCS
+		if (len > 0 && *(CharPrev(fullname, p)) != '\\')
+#else
 		if (p[-1] != '\\')
+#endif
 			*p++ = '\\';
 		*p = 0;
 
@@ -141,8 +160,11 @@ int recursive_rmdir(const char * path, int recursiveMode, int quiet)
 				return E_Other;
 			}
 		}
-
+#ifdef DBCS
+		return rmdir_withfiles(fullname, fullname, sizeof(fullname));
+#else
 		return rmdir_withfiles(fullname, sizeof(fullname));
+#endif
 	} else {
 		return rmdir(path);
 	}