From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 31 Mar 2008 01:33:13 +0000 (+0000)
Subject: Fix a number of places that were making file-type tests infelicitously.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=0de7cae63cfa5f4ab741f29b631c8ad8ffe0ce3e;p=users%2Fbernd%2Fpostgres.git

Fix a number of places that were making file-type tests infelicitously.
The places that did, eg,
	(statbuf.st_mode & S_IFMT) == S_IFDIR
were correct, but there is no good reason not to use S_ISDIR() instead,
especially when that's what the other 90% of our code does.  The places
that did, eg,
	(statbuf.st_mode & S_IFDIR)
were flat out *wrong* and would fail in various platform-specific ways,
eg a symlink could be mistaken for a regular file on most Unixen.

The actual impact of this is probably small, since the problem cases
seem to always involve symlinks or sockets, which are unlikely to be
found in the directories that PG code might be scanning.  But it's
clearly trouble waiting to happen, so patch all the way back anyway.
(There seem to be no occurrences of the mistake in 7.4.)
---

diff --git a/contrib/dbsize/dbsize.c b/contrib/dbsize/dbsize.c
index d0ed4394ba..d31635b49a 100644
--- a/contrib/dbsize/dbsize.c
+++ b/contrib/dbsize/dbsize.c
@@ -169,7 +169,7 @@ pg_tablespace_size(PG_FUNCTION_ARGS)
 					 errmsg("could not stat \"%s\": %m", pathname)));
 		totalsize += fst.st_size;
 
-		if (fst.st_mode & S_IFDIR)
+		if (S_ISDIR(fst.st_mode))
 		    totalsize += db_dir_size(pathname);
 	}
 
diff --git a/src/port/exec.c b/src/port/exec.c
index 750a12497a..a857b8ec06 100644
--- a/src/port/exec.c
+++ b/src/port/exec.c
@@ -79,8 +79,8 @@ validate_exec(const char *path)
 #else
 	char		path_exe[MAXPGPATH + sizeof(".exe") - 1];
 #endif
-	int			is_r = 0;
-	int			is_x = 0;
+	int			is_r;
+	int			is_x;
 
 #ifdef WIN32
 	/* Win32 requires a .exe suffix for stat() */
@@ -102,7 +102,7 @@ validate_exec(const char *path)
 	if (stat(path, &buf) < 0)
 		return -1;
 
-	if ((buf.st_mode & S_IFMT) != S_IFREG)
+	if (!S_ISREG(buf.st_mode))
 		return -1;
 
 	/*
@@ -330,7 +330,7 @@ resolve_symlinks(char *path)
 			fname = path;
 
 		if (lstat(fname, &buf) < 0 ||
-			(buf.st_mode & S_IFMT) != S_IFLNK)
+			!S_ISLNK(buf.st_mode))
 			break;
 
 		rllen = readlink(fname, link_buf, sizeof(link_buf));