Install a hopefully-temporary workaround for Snow Leopard readdir() bug.

tglsfdc · tglsfdc · commit 325aeb4a6544 · 2009-09-12T15:51:52.000Z
If Apple doesn't fix that reasonably soon, we'll have to consider
back-patching a workaround; but for now, just hack it in HEAD so that
we can get buildfarm reports on HEAD from OS X machines.
Per Jan Otto.
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.61 2009/01/22 20:16:02 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.62 2009/09/12 15:51:52 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -612,6 +612,17 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo)
 							subfile)));
 
 		pfree(subfile);
+
+		/*
+		 * OS X 10.6 and 10.6.1 have a bug in readdir() that causes the
+		 * next call to fail after deleting the current element.  Hopefully
+		 * that will be fixed real soon, but for the moment we have this
+		 * ugly kluge to restart the directory scan.
+		 */
+#ifdef __darwin__
+		FreeDir(dirdesc);
+		dirdesc = AllocateDir(location);
+#endif
 	}
 
 	FreeDir(dirdesc);

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.61 2009/01/22 20:16:02 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.62 2009/09/12 15:51:52 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`*-------------------------------------------------------------------------`
`43`	`43`	`*/`
`@@ -612,6 +612,17 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo)`
`612`	`612`	`subfile)));`
`613`	`613`
`614`	`614`	`pfree(subfile);`
	`615`	`+`
	`616`	`+ /*`
	`617`	`+ * OS X 10.6 and 10.6.1 have a bug in readdir() that causes the`
	`618`	`+ * next call to fail after deleting the current element. Hopefully`
	`619`	`+ * that will be fixed real soon, but for the moment we have this`
	`620`	`+ * ugly kluge to restart the directory scan.`
	`621`	`+ */`
	`622`	`+#ifdef __darwin__`
	`623`	`+ FreeDir(dirdesc);`
	`624`	`+ dirdesc = AllocateDir(location);`
	`625`	`+#endif`
`615`	`626`	`}`
`616`	`627`
`617`	`628`	`FreeDir(dirdesc);`