From 96d34939f68df47e7dafc73a853d5ab0f3be0019 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Wed, 30 Jul 2014 16:29:16 -0400 Subject: [PATCH] Bug 1046342 - bring xpcshell's usage message a little closer to reality; r=bsmedberg The -n, -j, and -P options appear to be no longer supported. I rearranged the options list so that the options appear in the order of processing in ProcessArgs. I also took the opportunity to move the -m' option out of the options claimed to be handled in ProcessArgsForCompartment, since it no longer is. --- js/xpconnect/src/XPCShellImpl.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp index c0a25e2776bd..8e5faf3acc4b 100644 --- a/js/xpconnect/src/XPCShellImpl.cpp +++ b/js/xpconnect/src/XPCShellImpl.cpp @@ -1004,7 +1004,7 @@ static int usage(void) { fprintf(gErrFile, "%s\n", JS_GetImplementationVersion()); - fprintf(gErrFile, "usage: xpcshell [-g gredir] [-a appdir] [-r manifest]... [-PsSwWCijmIn] [-v version] [-f scriptfile] [-e script] [scriptfile] [scriptarg...]\n"); + fprintf(gErrFile, "usage: xpcshell [-g gredir] [-a appdir] [-r manifest]... [-WwxiCSsmIp] [-v version] [-f scriptfile] [-e script] [scriptfile] [scriptarg...]\n"); return 2; } @@ -1117,6 +1117,8 @@ ProcessArgs(JSContext *cx, JS::Handle obj, char **argv, int argc, XPC case 'd': /* This used to try to turn on the debugger. */ break; + case 'm': + break; case 'f': if (++i == argc) { return usage(); @@ -1151,7 +1153,6 @@ ProcessArgs(JSContext *cx, JS::Handle obj, char **argv, int argc, XPC break; case 'S': case 's': - case 'm': case 'I': // These options are processed in ProcessArgsForCompartment. break;