From 7c66319edcbeb3d1590e1c2397efea3171623be2 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sun, 18 Nov 2012 13:55:52 +0200 Subject: #16306: Fix multiple error messages when unknown command line parameters where passed to the interpreter. Patch by Hieu Nguyen. --- Python/getopt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Python/getopt.c') diff --git a/Python/getopt.c b/Python/getopt.c index cc424312fe9..037aa5db51f 100644 --- a/Python/getopt.c +++ b/Python/getopt.c @@ -45,7 +45,7 @@ static wchar_t *opt_ptr = L""; void _PyOS_ResetGetOpt(void) { - _PyOS_opterr = 1; + _PyOS_opterr = 0; /* prevent printing the error in 2nd loop in main.c */ _PyOS_optind = 1; _PyOS_optarg = NULL; opt_ptr = L""; @@ -90,18 +90,18 @@ int _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring) opt_ptr = &argv[_PyOS_optind++][1]; } - if ( (option = *opt_ptr++) == L'\0') + if ((option = *opt_ptr++) == L'\0') return -1; if (option == 'J') { - fprintf(stderr, "-J is reserved for Jython\n"); + if (_PyOS_opterr) + fprintf(stderr, "-J is reserved for Jython\n"); return '_'; } if ((ptr = wcschr(optstring, option)) == NULL) { if (_PyOS_opterr) - fprintf(stderr, "Unknown option: -%c\n", (char)option); - + fprintf(stderr, "Unknown option: -%c\n", (char)option); return '_'; } -- cgit v1.2.3