mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#16306: Fix multiple error messages when unknown command line parameters where passed to the interpreter. Patch by Hieu Nguyen.

Browse source
This commit is contained in:
Ezio Melotti 2012-11-18 13:46:38 +02:00
parent 9e94972eed
commit db5947f0f3
4 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Python/getopt.c
View file

@ -41,7 +41,7 @@ static char *opt_ptr = "";
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 = "";
@ -86,17 +86,19 @@ int _PyOS_GetOpt(int argc, char **argv, char *optstring)
opt_ptr = &argv[_PyOS_optind++][1];
}
if ( (option = *opt_ptr++) == '\0')
if ((option = *opt_ptr++) == '\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 (option == 'X') {
fprintf(stderr,
"-X is reserved for implementation-specific arguments\n");
if (_PyOS_opterr)
fprintf(stderr,
"-X is reserved for implementation-specific arguments\n");
return '_';
}
@ -117,7 +119,7 @@ int _PyOS_GetOpt(int argc, char **argv, char *optstring)
if (_PyOS_optind >= argc) {
if (_PyOS_opterr)
fprintf(stderr,
"Argument expected for the -%c option\n", option);
"Argument expected for the -%c option\n", option);
return '_';
}