Bustage fix following bug 541594 - revert NS_strtok change that appears to be causing hangs and fix ini parser to work as intended. rs=dolske

xpcom/glue/nsCRTGlue.cpp

@@ -91,7 +91,7 @@ NS_strtok(const char *delims, char **str)
   } while (*i);
 
   *str = NULL;
-  return NULL;
+  return ret;
 }
 
 PRUint32

xpcom/glue/nsINIParser.cpp

@@ -197,7 +197,7 @@ nsINIParser::InitFromFILE(FILE *fd)
 
         char *key = token;
         char *e = NS_strtok(kEquals, &token);
-        if (!e)
+        if (!e || !token)
             continue;
 
         INIValue *v;