Remove 'optimization' to skip resolve_symlinks() when the found

tglsfdc · tglsfdc · commit f0c08ae7c95b · 2004-12-24T16:55:43.000Z
executable file isn't itself a symlink.  We still need to run the
algorithm so that any directory symlinks in the path to the
executable are replaced by a true path.  Noticed this on seeing
pg_config give me a completely wrong answer for --pkglibdir when
I called it through a symlink to the installation bindir.
diff --git a/src/port/exec.c b/src/port/exec.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/exec.c,v 1.34 2004/12/20 17:40:59 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/port/exec.c,v 1.35 2004/12/24 16:55:43 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -272,8 +272,7 @@ find_my_exec(const char *argv0, char *retpath)
 /*
  * resolve_symlinks - resolve symlinks to the underlying file
  *
- * If path does not point to a symlink, leave it alone.  If it does,
- * replace it by the absolute path to the referenced file.
+ * Replace "path" by the absolute path to the referenced file.
  *
  * Returns 0 if OK, -1 if error.
  *
@@ -290,17 +289,17 @@ resolve_symlinks(char *path)
 				link_buf[MAXPGPATH];
 	char	   *fname;
 
-	/* Quick out if it's not a symlink */
-	if (lstat(path, &buf) < 0 ||
-		(buf.st_mode & S_IFMT) != S_IFLNK)
-		return 0;
-
 	/*
 	 * To resolve a symlink properly, we have to chdir into its directory
 	 * and then chdir to where the symlink points; otherwise we may fail to
 	 * resolve relative links correctly (consider cases involving mount
 	 * points, for example).  After following the final symlink, we use
 	 * getcwd() to figure out where the heck we're at.
+	 *
+	 * One might think we could skip all this if path doesn't point to a
+	 * symlink to start with, but that's wrong.  We also want to get rid
+	 * of any directory symlinks that are present in the given path.
+	 * We expect getcwd() to give us an accurate, symlink-free path.
 	 */
 	if (!getcwd(orig_wd, MAXPGPATH))
 	{

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/port/exec.c,v 1.34 2004/12/20 17:40:59 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/port/exec.c,v 1.35 2004/12/24 16:55:43 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -272,8 +272,7 @@ find_my_exec(const char argv0, char retpath)`
`272`	`272`	`/*`
`273`	`273`	`* resolve_symlinks - resolve symlinks to the underlying file`
`274`	`274`	`*`
`275`		`- * If path does not point to a symlink, leave it alone. If it does,`
`276`		`- * replace it by the absolute path to the referenced file.`
	`275`	`+ * Replace "path" by the absolute path to the referenced file.`
`277`	`276`	`*`
`278`	`277`	`* Returns 0 if OK, -1 if error.`
`279`	`278`	`*`
`@@ -290,17 +289,17 @@ resolve_symlinks(char *path)`
`290`	`289`	`link_buf[MAXPGPATH];`
`291`	`290`	`char *fname;`
`292`	`291`
`293`		`- /* Quick out if it's not a symlink */`
`294`		`- if (lstat(path, &buf) < 0 \|\|`
`295`		`- (buf.st_mode & S_IFMT) != S_IFLNK)`
`296`		`- return 0;`
`297`		`-`
`298`	`292`	`/*`
`299`	`293`	`* To resolve a symlink properly, we have to chdir into its directory`
`300`	`294`	`* and then chdir to where the symlink points; otherwise we may fail to`
`301`	`295`	`* resolve relative links correctly (consider cases involving mount`
`302`	`296`	`* points, for example). After following the final symlink, we use`
`303`	`297`	`* getcwd() to figure out where the heck we're at.`
	`298`	`+ *`
	`299`	`+ * One might think we could skip all this if path doesn't point to a`
	`300`	`+ * symlink to start with, but that's wrong. We also want to get rid`
	`301`	`+ * of any directory symlinks that are present in the given path.`
	`302`	`+ * We expect getcwd() to give us an accurate, symlink-free path.`
`304`	`303`	`*/`
`305`	`304`	`if (!getcwd(orig_wd, MAXPGPATH))`
`306`	`305`	`{`