Rebase against 8179609faddee580621529f8b1fffba9a50fb650.

This commit is contained in:
Alistair Leslie-Hughes
2024-07-10 11:24:56 +10:00
parent f58c6016bd
commit d2c868d8c9
8 changed files with 24 additions and 245 deletions

View File

@@ -1,7 +1,7 @@
From 48cbd1c62bb0d2945334dfea222a7e19ea149c64 Mon Sep 17 00:00:00 2001
From 8ed97a5ccc82d6d55cca547d201bffee52094505 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Wed, 29 May 2019 16:01:45 -0600
Subject: wcmd: Add junction point support to mklink.
Subject: [PATCH] wcmd: Add junction point support to mklink.
Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
1 file changed, 47 insertions(+), 1 deletion(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index dd3ae5b509b..53734b1e940 100644
index 9b8cfd389b9..fd4b024d59a 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -31,6 +31,9 @@
@@ -22,8 +22,8 @@ index dd3ae5b509b..53734b1e940 100644
WINE_DEFAULT_DEBUG_CHANNEL(cmd);
@@ -4997,6 +5000,49 @@ void WCMD_color (void) {
}
@@ -4096,6 +4099,49 @@ RETURN_CODE WCMD_color(void)
return errorlevel = return_code;
}
+BOOL WCMD_create_junction(WCHAR *link, WCHAR *target) {
@@ -72,7 +72,7 @@ index dd3ae5b509b..53734b1e940 100644
/****************************************************************************
* WCMD_mklink
*/
@@ -5045,7 +5091,7 @@ void WCMD_mklink(WCHAR *args)
@@ -4144,7 +4190,7 @@ void WCMD_mklink(WCHAR *args)
else if(!junction)
ret = CreateSymbolicLinkW(file1, file2, isdir);
else
@@ -82,5 +82,5 @@ index dd3ae5b509b..53734b1e940 100644
if(!ret)
WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), file1);
--
2.17.1
2.43.0