add /D option to FOR command to look for directories instead of files matching the "set" file specifiers

PerditionC · PerditionC · commit c78b0a9d4af6 · 2025-03-21T21:26:16.000-04:00
e.g. to list all directories: FOR /D %a in (*.*) DO ECHO %a
diff --git a/cmd/for.c b/cmd/for.c
@@ -46,8 +46,33 @@ static forErrors checkFOR(char * param	/* in: command line */
 	assert(flags);
 
 	*flags = 0;
-	/* Check that first element is % then an alpha char followed by space */
 
+    /* skip past and process any option flags
+	   /D filespec is for directories instead of files
+	   /F ??? - not currently supported, parse file instead of perform findfirst/next
+	   /R [basepath] - not currently supported, repeat for each subdir of basepath
+	 */
+	if (*param == '/' || *param == '-') {
+		param++;
+		switch(toupper(*param++)) {
+			case 'D':
+				*flags |= FLAG_OPT_DIRECTORY;
+				break;
+#if 0
+			case 'F':
+				*flags |= FLAG_OPT_FILEPARSE;
+				break;
+			case 'R':
+				*flags |= FLAG_OPT_RECURSE;
+				break;
+#endif
+			default:
+				return badVar;
+		}
+		param = ltrimcl(param + 1);   /* skip whitespaces */
+	}
+
+	/* Check that it starts with a % then an alpha char followed by space */
 	*varS = param;
 	if(*param == '%') { 	/* Check for FOR %%%%v IN syntax */
 		while(*++param == '%');
@@ -59,7 +84,7 @@ static forErrors checkFOR(char * param	/* in: command line */
 		}
 	}
 
-#if 1
+#if 0
 	/* the standard release does not support normal variables as
 		FOR variables */
 	return badVar;
@@ -131,7 +156,6 @@ static int doFOR (char * varname, char * varE, char * param, char * paramE,
 	int rv;
 #endif
 
-        (void)flags;
 	assert(varname);
 	assert(varE);
 	assert(param);
@@ -169,6 +193,7 @@ static int doFOR (char * varname, char * varE, char * param, char * paramE,
 		}
 
 		bc->shiftlevel = 1;     /* skip %0 <=> filename */
+		bc->forFlags = flags;
 	}
 	return 0;
 
diff --git a/include/batch.h b/include/batch.h
@@ -37,6 +37,7 @@ struct bcontext
   int bclose;					/* close batch file on exit */
   int brewind;					/* rewind batch file next time */
   int numParams;				/* number of parameters */
+  int forFlags; 				/* optional flags to FOR command */
 };
 
 /*  The stack of current batch contexts.
@@ -56,3 +57,9 @@ char *find_arg_bc(struct bcontext const * const b, int n);
 
 #define	find_arg(num)	find_arg_bc(activeBatchContext(), (num))
 #define getArgCur(num)	find_arg_bc(bc, (num))
+
+/* flags used by FOR */
+/* #define FLAG_HACKERY_FOR 1 */
+#define FLAG_OPT_DIRECTORY 2
+#define FLAG_OPT_FILEPARSE 4
+#define FLAG_OPT_RECURSE   8
diff --git a/shell/batch.c b/shell/batch.c
@@ -443,9 +443,9 @@ char *readbatchline(int *eflag, char *textline, int size)
 
          if(
 #ifdef FEATURE_LONG_FILENAMES
-             lfnfor ? lfnfindfirst( fv, bc->ffind, FA_NORMAL ) == 0 :
+             lfnfor ? lfnfindfirst( fv, bc->ffind, (bc->forFlags&FLAG_OPT_DIRECTORY? FA_DIREC:FA_NORMAL) ) == 0 :
 #endif
-                      sfnfindfirst( fv, ( struct ffblk * )bc->ffind, FA_NORMAL )
+                      sfnfindfirst( fv, ( struct ffblk * )bc->ffind, (bc->forFlags&FLAG_OPT_DIRECTORY? FA_DIREC:FA_NORMAL) )
                       == 0 ) {
          	/* found a file */
          	*dfnfilename(fv) = '\0';	/* extract path */
