[PATCH 0/1] MR11079: cmd: Add wildcard expansion for arguments to the type program

[Barath Kannan (＠barath_kannan)]

Fixes https://bugs.winehq.org/show_bug.cgi?id=59816

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11079

[PATCH 1/1] cmd: Add wildcard expansion for arguments to the type program

[Barath Kannan]

From: Barath Kannan <[e-mail]>

Signed-off-by: Barath Kannan <[e-mail]>
---
 programs/cmd/builtins.c | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 1c9074b75d3..b5480eb0ca2 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -3439,6 +3439,10 @@ RETURN_CODE WCMD_type(WCHAR *args)
   int   argno         = 0;
   WCHAR *argN          = args;
   BOOL  writeHeaders  = FALSE;
+  WIN32_FIND_DATAW fd;
+  const WCHAR *srcname;
+  HANDLE hff = INVALID_HANDLE_VALUE;
+  BOOL havewildcards = FALSE;
 
   if (param1[0] == 0x00) {
     WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG));
@@ -3458,22 +3462,33 @@ RETURN_CODE WCMD_type(WCHAR *args)
     if (!argN) break;
 
     WINE_TRACE("type: Processing arg '%s'\n", wine_dbgstr_w(thisArg));
-    hIn = CreateFileW(thisArg, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING,
-            FILE_ATTRIBUTE_NORMAL, NULL);
-    if (hIn == INVALID_HANDLE_VALUE) {
-      WCMD_print_error ();
-      WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg);
-      return errorlevel = ERROR_INVALID_FUNCTION;
-    }
-    hOut = GetStdHandle(STD_OUTPUT_HANDLE);
 
-    if (writeHeaders) {
-      WCMD_output_stderr(L"\n%1\n\n\n", thisArg);
-    }
+    havewildcards = wcspbrk(thisArg, L"*?") ? TRUE : FALSE;
 
-    WCMD_copy_loop(hIn, hOut, GetConsoleMode(hIn, &console_mode) || GetConsoleMode(hOut, &console_mode));
+    hff = FindFirstFileW(thisArg, &fd);
+
+    if (hff != INVALID_HANDLE_VALUE) {
+      do {
+        srcname = fd.cFileName;
 
-    CloseHandle (hIn);
+        hIn = CreateFileW(srcname, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING,
+        FILE_ATTRIBUTE_NORMAL, NULL);
+        if (hIn == INVALID_HANDLE_VALUE) {
+          WCMD_print_error ();
+          WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), srcname);
+          return errorlevel = ERROR_INVALID_FUNCTION;
+        }
+        hOut = GetStdHandle(STD_OUTPUT_HANDLE);
+
+        if (writeHeaders || havewildcards) {
+          WCMD_output_stderr(L"\n%1\n\n\n", srcname);
+        }
+
+        WCMD_copy_loop(hIn, hOut, GetConsoleMode(hIn, &console_mode) || GetConsoleMode(hOut, &console_mode));
+
+        CloseHandle (hIn);
+      } while (FindNextFileW(hff, &fd) != 0);
+    }
   }
 
   return errorlevel = return_code;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/11079

[PATCH 0/1] MR11079: cmd: Add wildcard expansion for arguments to the type program - approved

[Barath Kannan (＠barath_kannan)]

This merge request was approved by Barath Kannan.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11079