BugZilla 17558. PR_Open() gets PR_EXCL flag

1 files changed, 13 insertions, 5 deletions

diff --git a/pr/src/md/mac/macio.c b/pr/src/md/mac/macio.c
index 94ff4e81..0f7b7fab 100644
--- a/pr/src/md/mac/macio.c
+++ b/pr/src/md/mac/macio.c
@@ -401,13 +401,21 @@ PRInt32 _MD_Open(const char *path, PRIntn flags, int mode)
 	hpb.ioParam.ioPermssn 	= perm;
 
 	
-open:
-	err = PBHOpenDFSync(&hpb);
-	if ((err == fnfErr) && (flags & PR_CREATE_FILE)) {
+    if (flags & PR_CREATE_FILE) {
 		err = PBHCreateSync(&hpb);
-		if (err == noErr)
-			goto open;
+               
+       /* If opening with the PR_EXCL flag the existence of the file prior to opening is an error */
+       if ((flags & PR_EXCL) &&  (err == dupFNErr)) {
+           err = PR_FILE_EXISTS_ERROR;
+           goto ErrorExit;
+       }
+       if (err != noErr)
+          goto ErrorExit;
 	}
+ 
+open:
+    err = PBHOpenDFSync(&hpb);
+
 	if (err != noErr)
 		goto ErrorExit;