From c301ab4a03e1316981003fdd6692631d468f1ef8 Mon Sep 17 00:00:00 2001 From: "ccarlen%netscape.com" Date: Wed, 21 Mar 2001 01:13:20 +0000 Subject: [PATCH] Bug 72129 - OpenANSIFIleDesc on Mac won't create new files. r=beard@netscape.com, sr=sfraser@netscape.com git-svn-id: svn://10.0.0.236/trunk@89948 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/io/nsLocalFileMac.cpp | 40 ++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/mozilla/xpcom/io/nsLocalFileMac.cpp b/mozilla/xpcom/io/nsLocalFileMac.cpp index 62df11de8f1..9ae0fefbe50 100644 --- a/mozilla/xpcom/io/nsLocalFileMac.cpp +++ b/mozilla/xpcom/io/nsLocalFileMac.cpp @@ -1093,19 +1093,35 @@ nsLocalFile::OpenNSPRFileDesc(PRInt32 flags, PRInt32 mode, PRFileDesc **_retval) NS_IMETHODIMP nsLocalFile::OpenANSIFileDesc(const char *mode, FILE * *_retval) { - nsresult rv = ResolveAndStat(PR_TRUE); - if (NS_FAILED(rv) && rv != NS_ERROR_FILE_NOT_FOUND) - return rv; + NS_ENSURE_ARG(mode); + NS_ENSURE_ARG_POINTER(_retval); + + nsresult rv; + FSSpec spec; - - // Resolve the alias to the original file. - FSSpec spec = mTargetSpec; - Boolean targetIsFolder; - Boolean wasAliased; - OSErr err = ::ResolveAliasFile(&spec, TRUE, &targetIsFolder, &wasAliased); - if (err != noErr) - return MacErrorMapper(err); - + if (mode[0] == 'w' || mode[0] == 'a') // Check if the file exists + { + PRBool exists; + rv = Exists(&exists); + if (NS_FAILED(rv)) + return rv; + if (!exists) { + mType = (mode[1] == 'b') ? 'BiNA' : 'TEXT'; + rv = Create(nsIFile::NORMAL_FILE_TYPE, 0); + if (NS_FAILED(rv)) + return rv; + spec = mResolvedSpec; + } + else + spec = mTargetSpec; + } + else + { + rv = ResolveAndStat(PR_TRUE); + if (NS_FAILED(rv) && rv != NS_ERROR_FILE_NOT_FOUND) + return rv; + spec = mTargetSpec; + } *_retval = FSp_fopen(&spec, mode);