[PATCH v2 1/6] xcopy: Exit after displaying help message.

[Piotr Caban]

From: Piotr Caban

---
 programs/xcopy/xcopy.c | 11 +++--------
 programs/xcopy/xcopy.h |  1 -
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c
index 1d003007c0b..57adf1d6b84 100644
--- a/programs/xcopy/xcopy.c
+++ b/programs/xcopy/xcopy.c
@@ -844,8 +844,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource,
                           }
                           break;
                 case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP));
-                          rc = RC_HELP;
-                          goto out;
+                          exit(RC_OK);
                 case 'V':
                     WINE_FIXME("ignoring /V\n");
                     break;
@@ -1098,12 +1097,8 @@ int __cdecl wmain (int argc, WCHAR *argvW[])
      * Parse the command line
      */
     if ((rc = XCOPY_ParseCommandLine(suppliedsource, supplieddestination,
-                                     &flags)) != RC_OK) {
-        if (rc == RC_HELP)
-            return RC_OK;
-        else
-            return rc;
-    }
+                                     &flags)) != RC_OK)
+        return rc;

/* Trace out the supplied information */
     WINE_TRACE("Supplied parameters:\n");
diff --git a/programs/xcopy/xcopy.h b/programs/xcopy/xcopy.h
index 9c6ee1176f5..1ed9e20c45b 100644
--- a/programs/xcopy/xcopy.h
+++ b/programs/xcopy/xcopy.h
@@ -26,7 +26,6 @@
 #define RC_CTRLC      2
 #define RC_INITERROR  4
 #define RC_WRITEERROR 5
-#define RC_HELP       6

#define OPT_ASSUMEDIR    0x00000001
 #define OPT_RECURSIVE    0x00000002