Mercurial > cpython-lru_cache-weakref
diff Python/getopt.c @ 61466:cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Sun, 09 May 2010 15:52:27 +0000 |
| parents | 981df13aab20 |
| children | 0b5bfba7a907 |
line wrap: on
line diff
--- a/Python/getopt.c Sun May 09 14:09:25 2010 +0000 +++ b/Python/getopt.c Sun May 09 15:52:27 2010 +0000 @@ -7,8 +7,8 @@ * * All Rights Reserved * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose and without fee is hereby granted, * provided that the above copyright notice, this permission notice and * the following disclaimer notice appear unmodified in all copies. * @@ -43,84 +43,84 @@ int _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring) { - static wchar_t *opt_ptr = L""; - wchar_t *ptr; - wchar_t option; + static wchar_t *opt_ptr = L""; + wchar_t *ptr; + wchar_t option; - if (*opt_ptr == '\0') { + if (*opt_ptr == '\0') { - if (_PyOS_optind >= argc) - return -1; + if (_PyOS_optind >= argc) + return -1; #ifdef MS_WINDOWS - else if (wcscmp(argv[_PyOS_optind], L"/?") == 0) { - ++_PyOS_optind; - return 'h'; - } + else if (wcscmp(argv[_PyOS_optind], L"/?") == 0) { + ++_PyOS_optind; + return 'h'; + } #endif - else if (argv[_PyOS_optind][0] != L'-' || - argv[_PyOS_optind][1] == L'\0' /* lone dash */ ) - return -1; + else if (argv[_PyOS_optind][0] != L'-' || + argv[_PyOS_optind][1] == L'\0' /* lone dash */ ) + return -1; - else if (wcscmp(argv[_PyOS_optind], L"--") == 0) { - ++_PyOS_optind; - return -1; - } + else if (wcscmp(argv[_PyOS_optind], L"--") == 0) { + ++_PyOS_optind; + return -1; + } - else if (wcscmp(argv[_PyOS_optind], L"--help") == 0) { - ++_PyOS_optind; - return 'h'; - } + else if (wcscmp(argv[_PyOS_optind], L"--help") == 0) { + ++_PyOS_optind; + return 'h'; + } - else if (wcscmp(argv[_PyOS_optind], L"--version") == 0) { - ++_PyOS_optind; - return 'V'; - } + else if (wcscmp(argv[_PyOS_optind], L"--version") == 0) { + ++_PyOS_optind; + return 'V'; + } - opt_ptr = &argv[_PyOS_optind++][1]; - } + opt_ptr = &argv[_PyOS_optind++][1]; + } - if ( (option = *opt_ptr++) == L'\0') - return -1; + if ( (option = *opt_ptr++) == L'\0') + return -1; - if (option == 'J') { - fprintf(stderr, "-J is reserved for Jython\n"); - return '_'; - } + if (option == 'J') { + fprintf(stderr, "-J is reserved for Jython\n"); + return '_'; + } - if (option == 'X') { - fprintf(stderr, - "-X is reserved for implementation-specific arguments\n"); - return '_'; - } + if (option == 'X') { + fprintf(stderr, + "-X is reserved for implementation-specific arguments\n"); + return '_'; + } - if ((ptr = wcschr(optstring, option)) == NULL) { - if (_PyOS_opterr) - fprintf(stderr, "Unknown option: -%c\n", (char)option); + if ((ptr = wcschr(optstring, option)) == NULL) { + if (_PyOS_opterr) + fprintf(stderr, "Unknown option: -%c\n", (char)option); - return '_'; - } + return '_'; + } - if (*(ptr + 1) == L':') { - if (*opt_ptr != L'\0') { - _PyOS_optarg = opt_ptr; - opt_ptr = L""; - } + if (*(ptr + 1) == L':') { + if (*opt_ptr != L'\0') { + _PyOS_optarg = opt_ptr; + opt_ptr = L""; + } - else { - if (_PyOS_optind >= argc) { - if (_PyOS_opterr) - fprintf(stderr, - "Argument expected for the -%c option\n", (char)option); - return '_'; - } + else { + if (_PyOS_optind >= argc) { + if (_PyOS_opterr) + fprintf(stderr, + "Argument expected for the -%c option\n", (char)option); + return '_'; + } - _PyOS_optarg = argv[_PyOS_optind++]; - } - } + _PyOS_optarg = argv[_PyOS_optind++]; + } + } - return option; + return option; } #ifdef __cplusplus
