From 7e4d76ba50d008c4fa85054c12125847ba374701 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Thu, 20 Jun 2002 21:37:21 +0000 Subject: [PATCH] #149422 r=bnesse, sr=jst OS/2 only - skip over EOF character on JS files in prefs git-svn-id: svn://10.0.0.236/trunk@123720 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/libpref/src/nsPrefService.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mozilla/modules/libpref/src/nsPrefService.cpp b/mozilla/modules/libpref/src/nsPrefService.cpp index 4853e6da08e..a0f4ba5e6e3 100644 --- a/mozilla/modules/libpref/src/nsPrefService.cpp +++ b/mozilla/modules/libpref/src/nsPrefService.cpp @@ -447,6 +447,11 @@ static nsresult openPrefFile(nsIFile* aFile, PRBool aIsErrorFatal, PRUint32 amtRead = 0; rv = inStr->Read(readBuf, fileSize, &amtRead); NS_ASSERTION((amtRead == fileSize), "failed to read the entire prefs file!!"); + #ifdef XP_OS2 /* OS/2 workaround - our system editor adds an EOF character */ + if (readBuf[amtRead - 1] == 0x1A) { + amtRead--; + } + #endif if (NS_SUCCEEDED(rv)) { if (!PREF_EvaluateConfigScript(readBuf, amtRead, nsnull, aIsGlobalContext, PR_TRUE, aSkipFirstLine))