Mercurial > cpython-lru_cache-weakref

diff Modules/getpath.c @ 6121:df028bc54e6f legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Globally renamed join() to joinpath() to avoid compilation error on Cray.
author Guido van Rossum <guido@python.org>
date Wed, 20 Aug 1997 23:48:16 +0000
parents ba860dc0a585
children 4981fd2b3211
line wrap: on
line diff
--- a/Modules/getpath.c	Wed Aug 20 23:38:57 1997 +0000
+++ b/Modules/getpath.c	Wed Aug 20 23:48:16 1997 +0000
@@ -177,7 +177,7 @@
 
 
 static void
-join(buffer, stuff)
+joinpath(buffer, stuff)
 	char *buffer;
 	char *stuff;
 {
@@ -207,7 +207,7 @@
 
 	/* Check to see if argv[0] is in the build directory */
 	strcpy(prefix, argv0_path);
-	join(prefix, "Modules/Setup");
+	joinpath(prefix, "Modules/Setup");
 	if (exists(prefix)) {
 		/* Check VPATH to see if argv0_path is in the build directory.
 		 * Complication: the VPATH passed in is relative to the
@@ -222,10 +222,10 @@
 		if (vpath[0] == '.' && vpath[1] == '.' && vpath[2] == '/')
 			vpath += 3;
 		strcpy(prefix, argv0_path);
-		join(prefix, vpath);
+		joinpath(prefix, vpath);
 		reduce(prefix);
-		join(prefix, "Lib");
-		join(prefix, LANDMARK);
+		joinpath(prefix, "Lib");
+		joinpath(prefix, LANDMARK);
 		if (exists(prefix))
 			return -1;
 	}
@@ -237,8 +237,8 @@
 		delim = strchr(prefix, DELIM);
 		if (delim)
 			*delim = '\0';
-		join(prefix, lib_python);
-		join(prefix, LANDMARK);
+		joinpath(prefix, lib_python);
+		joinpath(prefix, LANDMARK);
 		if (exists(prefix))
 			return 1;
 	}
@@ -247,8 +247,8 @@
 	strcpy(prefix, argv0_path);
 	do {
 		n = strlen(prefix);
-		join(prefix, lib_python);
-		join(prefix, LANDMARK);
+		joinpath(prefix, lib_python);
+		joinpath(prefix, LANDMARK);
 		if (exists(prefix))
 			return 1;
 		prefix[n] = '\0';
@@ -257,8 +257,8 @@
 
 	/* Look at configure's PREFIX */
 	strcpy(prefix, PREFIX);
-	join(prefix, lib_python);
-	join(prefix, LANDMARK);
+	joinpath(prefix, lib_python);
+	joinpath(prefix, LANDMARK);
 	if (exists(prefix))
 		return 1;
 
@@ -276,7 +276,7 @@
 
 	/* Check to see if argv[0] is in the build directory */
 	strcpy(exec_prefix, argv0_path);
-	join(exec_prefix, "Modules/Setup");
+	joinpath(exec_prefix, "Modules/Setup");
 	if (exists(exec_prefix)) {
 		reduce(exec_prefix);
 		return -1;
@@ -290,8 +290,8 @@
 			strcpy(exec_prefix, delim+1);
 		else
 			strcpy(exec_prefix, home);
-		join(exec_prefix, lib_python);
-		join(exec_prefix, "sharedmodules");
+		joinpath(exec_prefix, lib_python);
+		joinpath(exec_prefix, "sharedmodules");
 		if (exists(exec_prefix))
 			return 1;
 	}
@@ -300,8 +300,8 @@
 	strcpy(exec_prefix, argv0_path);
 	do {
 		n = strlen(exec_prefix);
-		join(exec_prefix, lib_python);
-		join(exec_prefix, "sharedmodules");
+		joinpath(exec_prefix, lib_python);
+		joinpath(exec_prefix, "sharedmodules");
 		if (exists(exec_prefix))
 			return 1;
 		exec_prefix[n] = '\0';
@@ -310,8 +310,8 @@
 
 	/* Look at configure's EXEC_PREFIX */
 	strcpy(exec_prefix, EXEC_PREFIX);
-	join(exec_prefix, lib_python);
-	join(exec_prefix, "sharedmodules");
+	joinpath(exec_prefix, lib_python);
+	joinpath(exec_prefix, "sharedmodules");
 	if (exists(exec_prefix))
 		return 1;
 
@@ -361,7 +361,7 @@
 			else
 				strcpy(progpath, path);
 
-			join(progpath, prog);
+			joinpath(progpath, prog);
 			if (exists(progpath))
 				break;
 
@@ -389,7 +389,7 @@
 			else {
 				/* Interpret relative to progpath */
 				reduce(argv0_path);
-				join(argv0_path, tmpbuffer);
+				joinpath(argv0_path, tmpbuffer);
 			}
 		}
 	}
@@ -401,7 +401,7 @@
 		fprintf(stderr,
 		   "Could not find platform independent libraries <prefix>\n");
 		strcpy(prefix, PREFIX);
-		join(prefix, lib_python);
+		joinpath(prefix, lib_python);
 	}
 	else
 		reduce(prefix);
@@ -410,7 +410,7 @@
 		fprintf(stderr,
 		"Could not find platform dependent libraries <exec_prefix>\n");
 		strcpy(exec_prefix, EXEC_PREFIX);
-		join(exec_prefix, "lib/sharedmodules");
+		joinpath(exec_prefix, "lib/sharedmodules");
 	}
 	/* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */