Work around ENOTEMPTY being an alias for EEXIST on some platforms.

tglsfdc · tglsfdc · commit b96e32ebf857 · 2003-09-03T15:49:42.000Z
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.121 2003/08/27 00:33:34 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.122 2003/09/03 15:49:42 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -543,7 +543,9 @@ errcode_for_file_access(void)
 			/* Wrong object type or state */
 		case ENOTDIR:			/* Not a directory */
 		case EISDIR:			/* Is a directory */
+#if defined(ENOTEMPTY) && (ENOTEMPTY != EEXIST)	/* same code on AIX */
 		case ENOTEMPTY:			/* Directory not empty */
+#endif
 			edata->sqlerrcode = ERRCODE_WRONG_OBJECT_TYPE;
 			break;
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.121 2003/08/27 00:33:34 petere Exp $`
	`40`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.122 2003/09/03 15:49:42 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`*-------------------------------------------------------------------------`
`43`	`43`	`*/`
`@@ -543,7 +543,9 @@ errcode_for_file_access(void)`
`543`	`543`	`/* Wrong object type or state */`
`544`	`544`	`case ENOTDIR: /* Not a directory */`
`545`	`545`	`case EISDIR: /* Is a directory */`
	`546`	`+#if defined(ENOTEMPTY) && (ENOTEMPTY != EEXIST) /* same code on AIX */`
`546`	`547`	`case ENOTEMPTY: /* Directory not empty */`
	`548`	`+#endif`
`547`	`549`	`edata->sqlerrcode = ERRCODE_WRONG_OBJECT_TYPE;`
`548`	`550`	`break;`
`549`	`551`