From a8914b9494ffb32e0e464706bee3a5cebd692fd5 Mon Sep 17 00:00:00 2001
From: Jason Edmeades <us@edmeades.me.uk>
Date: Fri, 30 Mar 2007 19:20:22 +0100
Subject: [PATCH] xcopy: Add help.

---
 programs/xcopy/En.rc   | 34 ++++++++++++++++++++++++++++++++++
 programs/xcopy/xcopy.c |  3 ++-
 programs/xcopy/xcopy.h |  1 +
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/programs/xcopy/En.rc b/programs/xcopy/En.rc
index dd02352509e..d7d4344e06a 100644
--- a/programs/xcopy/En.rc
+++ b/programs/xcopy/En.rc
@@ -42,4 +42,38 @@ STRINGTABLE
     STRING_ALL_CHAR, "A"
     STRING_FILE_CHAR,"F"
     STRING_DIR_CHAR, "D"
+
+    STRING_HELP,
+"XCOPY - Copies source files or directory trees to a destination\n\
+\n\
+Syntax:\n\
+XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+Where:\n\
+\n\
+[/I]  Assume directory if destination does not exist and copying 2 or \n\
+\tmore files\n\
+[/S]  Copy directories and subdirectories\n\
+[/E]  Copy directories and subdirectories, including any empty ones\n\
+[/Q]  Do not list names during copy, ie quiet.\n\
+[/F]  Show full source and destination names during copy\n\
+[/L]  Simulate operation, showing names which would be copied\n\
+[/W]  Prompts before beginning the copy operation\n\
+[/T]  Creates empty directory structure but does not copy files\n\
+[/Y]  Suppress prompting when overwriting files\n\
+[/-Y] Enable prompting when overwriting files\n\
+[/P]  Prompts on each source file before copying\n\
+[/N]  Copy using short names\n\
+[/U]  Copy only files which already exist in destination\n\
+[/R]  Overwrite any read only files\n\
+[/H]  Include hidden and system files in the copy\n\
+[/C]  Continue even if an error occurs during the copy\n\
+[/A]  Only copy files with archive attribute set\n\
+[/M]  Only copy files with archive attribute set, removes \n\
+\tarchive attribute\n\
+[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\
+\t\tIf no date is supplied, only copy if destination is older\n\
+\t\tthan source\n\n"
+
 }
diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c
index 3f6a7c64056..0de0b6fb8d1 100644
--- a/programs/xcopy/xcopy.c
+++ b/programs/xcopy/xcopy.c
@@ -27,7 +27,6 @@
  *  /O - Copy file ownership + ACL info
  *  /G - Copy encrypted files to unencrypted destination
  *  /V - Verifies files
- *  /? (or no parms) - List Help
  */
 
 /*
@@ -235,6 +234,8 @@ int main (int argc, char *argv[])
 
             case '-': if (toupper(argvW[0][2])=='Y')
                           flags &= ~OPT_NOPROMPT; break;
+            case '?': wprintf(XCOPY_LoadMessage(STRING_HELP));
+                      return RC_OK;
             default:
                 WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW));
                 wprintf(XCOPY_LoadMessage(STRING_INVPARM), *argvW);
diff --git a/programs/xcopy/xcopy.h b/programs/xcopy/xcopy.h
index 750e0539db2..ee4bd910cde 100644
--- a/programs/xcopy/xcopy.h
+++ b/programs/xcopy/xcopy.h
@@ -65,3 +65,4 @@
 #define STRING_ALL_CHAR         114
 #define STRING_FILE_CHAR        115
 #define STRING_DIR_CHAR         116
+#define STRING_HELP             117