Changeset 391 for python/trunk/Python/getopt.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Python/getopt.c (modified) (2 diffs)

python/trunk/Python/getopt.c

@@ -8 +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.
@@ -38 +38 @@
 int _PyOS_optind = 1;          /* index into argv array   */
 char *_PyOS_optarg = NULL;     /* optional argument       */
+static char *opt_ptr = "";
+
+void _PyOS_ResetGetOpt(void)
+{
+    _PyOS_opterr = 1;
+    _PyOS_optind = 1;
+    _PyOS_optarg = NULL;
+    opt_ptr = "";
+}
 
 int _PyOS_GetOpt(int argc, char **argv, char *optstring)
 {
-        static char *opt_ptr = "";
-        char *ptr;
-        int option;
+    char *ptr;
+    int 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 (strcmp(argv[_PyOS_optind], "/?") == 0) {
-                        ++_PyOS_optind;
-                        return 'h';
-                }
+        else if (strcmp(argv[_PyOS_optind], "/?") == 0) {
+            ++_PyOS_optind;
+            return 'h';
+        }
 #endif
 
-                else if (argv[_PyOS_optind][0] != '-' ||
-                         argv[_PyOS_optind][1] == '\0' /* lone dash */ )
-                        return -1;
+        else if (argv[_PyOS_optind][0] != '-' ||
+                 argv[_PyOS_optind][1] == '\0' /* lone dash */ )
+            return -1;
 
-                else if (strcmp(argv[_PyOS_optind], "--") == 0) {
-                        ++_PyOS_optind;
-                        return -1;
-                }
+        else if (strcmp(argv[_PyOS_optind], "--") == 0) {
+            ++_PyOS_optind;
+            return -1;
+        }
 
-                else if (strcmp(argv[_PyOS_optind], "--help") == 0) {
-                        ++_PyOS_optind;
-                        return 'h';
-                }
+        else if (strcmp(argv[_PyOS_optind], "--help") == 0) {
+            ++_PyOS_optind;
+            return 'h';
+        }
 
-                else if (strcmp(argv[_PyOS_optind], "--version") == 0) {
-                        ++_PyOS_optind;
-                        return 'V';
-                }
+        else if (strcmp(argv[_PyOS_optind], "--version") == 0) {
+            ++_PyOS_optind;
+            return 'V';
+        }
 
 
-                opt_ptr = &argv[_PyOS_optind++][1]; 
-        }
+        opt_ptr = &argv[_PyOS_optind++][1];
+    }
 
-        if ( (option = *opt_ptr++) == '\0')
-                return -1;
+    if ((option = *opt_ptr++) == '\0')
+        return -1;
 
-        if (option == 'J') {
-                fprintf(stderr, "-J is reserved for Jython\n");
-                return '_';
-        }
+    if (option == 'J') {
+        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");
-                return '_';
-        }
+    if (option == 'X') {
+        if (_PyOS_opterr)
+            fprintf(stderr,
+                "-X is reserved for implementation-specific arguments\n");
+        return '_';
+    }
 
-        if ((ptr = strchr(optstring, option)) == NULL) {
-                if (_PyOS_opterr)
-                        fprintf(stderr, "Unknown option: -%c\n", option);
+    if ((ptr = strchr(optstring, option)) == NULL) {
+        if (_PyOS_opterr)
+            fprintf(stderr, "Unknown option: -%c\n", option);
 
-                return '_';
-        }
+        return '_';
+    }
 
-        if (*(ptr + 1) == ':') {
-                if (*opt_ptr != '\0') {
-                        _PyOS_optarg  = opt_ptr;
-                        opt_ptr = "";
-                }
+    if (*(ptr + 1) == ':') {
+        if (*opt_ptr != '\0') {
+            _PyOS_optarg  = opt_ptr;
+            opt_ptr = "";
+        }
 
-                else {
-                        if (_PyOS_optind >= argc) {
-                                if (_PyOS_opterr)
-                                        fprintf(stderr,
-                            "Argument expected for the -%c option\n", option);
-                                return '_';
-                        }
+        else {
+            if (_PyOS_optind >= argc) {
+                if (_PyOS_opterr)
+                    fprintf(stderr,
+                        "Argument expected for the -%c option\n", option);
+                return '_';
+            }
 
-                        _PyOS_optarg = argv[_PyOS_optind++];
-                }
-        }
+            _PyOS_optarg = argv[_PyOS_optind++];
+        }
+    }
 
-        return option;
+    return option;
 }