mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-17 08:15:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#16306: merge with 3.3.

Browse source
This commit is contained in:
Ezio Melotti 2012-11-18 14:06:54 +02:00
commit 195ad6ce05
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Python/getopt.c
View file

@ -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 '_';
}