File python-2.6b1-canonicalize2.patch of Package python3

Overview Repositories Revisions Requests Users Attributes Meta

File python-2.6b1-canonicalize2.patch of Package python3 (Revision c9eaf2aa0d0a1d71cab24fb3a5c6e679)

Currently displaying revision c9eaf2aa0d0a1d71cab24fb3a5c6e679 , Show latest

--- Python/sysmodule.c
+++ Python/sysmodule.c
@@ -1532,7 +1532,20 @@
 		char *p = NULL;
 		Py_ssize_t n = 0;
 		PyObject *a;
-#ifdef HAVE_READLINK
+#ifdef HAVE_CANONICALIZE_FILE_NAME
+		int errnum;
+
+		if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
+			argv0 = canonicalize_file_name(argv0);
+			if (argv0 == NULL) argv0 = strdup(argv[0]);
+		}
+#elif defined(HAVE_REALPATH)
+		if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
+			if (realpath(argv0, fullpath)) {
+				argv0 = fullpath;
+			}
+		}
+#elif defined(HAVE_READLINK)
 		char link[MAXPATHLEN+1];
 		char argv0copy[2*MAXPATHLEN+1];
 		int nr = 0;
@@ -1559,7 +1572,8 @@
 				}
 			}
 		}
-#endif /* HAVE_READLINK */
+#endif /* resolve method selection */
+		
 #if SEP == '\\' /* Special case for MS filename syntax */
 		if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
 			char *q;
@@ -1585,11 +1599,6 @@
 		}
 #else /* All other filename syntaxes */
 		if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
-#if defined(HAVE_REALPATH)
-			if (realpath(argv0, fullpath)) {
-				argv0 = fullpath;
-			}
-#endif
 			p = strrchr(argv0, SEP);
 		}
 		if (p != NULL) {
@@ -1607,6 +1616,9 @@
 		a = PyString_FromStringAndSize(argv0, n);
 		if (a == NULL)
 			Py_FatalError("no mem for sys.path insertion");
+#ifdef HAVE_CANONICALIZE_FILE_NAME
+		if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) free(argv0);
+#endif /* HAVE_CANONICALIZE_FILE_NAME */
 		if (PyList_Insert(path, 0, a) < 0)
 			Py_FatalError("sys.path.insert(0) failed");
 		Py_DECREF(a);
--- configure.in
+++ configure.in
@@ -2473,7 +2473,7 @@
  getpriority getpwent getspnam getspent getsid getwd \
  kill killpg lchmod lchown lstat mkfifo mknod mktime \
  mremap nice pathconf pause plock poll pthread_init \
- putenv readlink realpath \
+ putenv readlink realpath canonicalize_file_name \
  select setegid seteuid setgid \
  setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
  sigaction siginterrupt sigrelse strftime \
--- pyconfig.h.in
+++ pyconfig.h.in
@@ -79,6 +79,9 @@
 /* Define to 1 if you have the `chflags' function. */
 #undef HAVE_CHFLAGS
 
+/* Define to 1 if you have the `canonicalize_file_name' function. */
+#undef HAVE_CANONICALIZE_FILE_NAME
+
 /* Define to 1 if you have the `chown' function. */
 #undef HAVE_CHOWN

Places

File python-2.6b1-canonicalize2.patch of Package python3 (Revision c9eaf2aa0d0a1d71cab24fb3a5c6e679)

Places