bug 132949: fix some of the more egregious bugs in jsfile.c, this also cleans up some of the style nits, but is nowhere a complete patch. Use jsfile.c at your own risk! rs=shaver

js/src/jsapi.c

@@ -1205,7 +1205,7 @@ JS_InitStandardClasses(JSContext *cx, JSObject *obj)
            js_InitXMLClasses(cx, obj) &&
 #endif
 #if JS_HAS_FILE_OBJECT
-           js_InitFileClass(cx, obj, JS_TRUE) &&
+           js_InitFileClass(cx, obj) &&
 #endif
            js_InitDateClass(cx, obj);
 }
@@ -1245,6 +1245,9 @@ static struct {
     {js_InitXMLClass,               ATOM_OFFSET(XML)},
     {js_InitNamespaceClass,         ATOM_OFFSET(Namespace)},
     {js_InitQNameClass,             ATOM_OFFSET(QName)},
+#endif
+#if JS_HAS_FILE_OBJECT
+    {js_InitFileClass,              ATOM_OFFSET(File)},
 #endif
     {NULL,                          0}
 };

js/src/jsatom.c

@@ -102,6 +102,7 @@ const char js_RegExp_str[]          = "RegExp";
 const char js_Script_str[]          = "Script";
 const char js_String_str[]          = "String";
 const char js_XML_str[]             = "XML";
+const char js_File_str[]            = "File";
 const char js_anonymous_str[]       = "anonymous";
 const char js_arguments_str[]       = "arguments";
 const char js_arity_str[]           = "arity";
@@ -319,6 +320,7 @@ js_InitPinnedAtoms(JSContext *cx, JSAtomState *state)
     FROB(ScriptAtom,              js_Script_str);
     FROB(StringAtom,              js_String_str);
     FROB(XMLAtom,                 js_XML_str);
+    FROB(FileAtom,                js_File_str);
     FROB(anonymousAtom,           js_anonymous_str);
     FROB(argumentsAtom,           js_arguments_str);
     FROB(arityAtom,               js_arity_str);

js/src/jsatom.h

@@ -180,6 +180,7 @@ struct JSAtomState {
     JSAtom              *ScriptAtom;
     JSAtom              *StringAtom;
     JSAtom              *XMLAtom;
+    JSAtom              *FileAtom;
     JSAtom              *anonymousAtom;
     JSAtom              *argumentsAtom;
     JSAtom              *arityAtom;
@@ -286,6 +287,7 @@ extern const char   js_RegExp_str[];
 extern const char   js_Script_str[];
 extern const char   js_String_str[];
 extern const char   js_XML_str[];
+extern const char   js_File_str[];
 extern const char   js_anonymous_str[];
 extern const char   js_arguments_str[];
 extern const char   js_arity_str[];

js/src/jsfile.h

@@ -42,7 +42,7 @@
 
 #if JS_HAS_FILE_OBJECT
 extern JS_PUBLIC_API(JSObject*)
-js_InitFileClass(JSContext *cx, JSObject* obj, JSBool initStandardStreams);
+js_InitFileClass(JSContext *cx, JSObject* obj);
 
 extern JS_PUBLIC_API(JSObject*)
 js_NewFileObject(JSContext *cx, char *bytes);

js/src/jsfile.msg

@@ -55,6 +55,7 @@ MSG_DEF(JSFILEMSG_CANNOT_FLUSH_CLOSE_FILE_ERROR,                  10, 1, JSEXN_N
 MSG_DEF(JSFILEMSG_CANNOT_OPEN_WRITING_ERROR,                      11, 1, JSEXN_NONE, "Cannot open file {0} for writing")
 MSG_DEF(JSFILEMSG_WRITEALL_EXPECTS_ONE_ARG_ERROR,                 12, 0, JSEXN_NONE, "writeAll expects one argument")
 MSG_DEF(JSFILEMSG_FIRST_ARGUMENT_WRITEALL_NOT_ARRAY_ERROR,        13, 0, JSEXN_NONE, "writeAll expects an array as an argument")
+MSG_DEF(JSFILEMSG_UNUSED0,                                        14, 0, JSEXN_NONE, "Unused error message slot")
 MSG_DEF(JSFILEMSG_CANNOT_OPEN_FILE_ERROR,                         15, 1, JSEXN_NONE, "Cannot open file {0}")
 MSG_DEF(JSFILEMSG_FIRST_ARGUMENT_CONSTRUCTOR_NOT_STRING_ERROR,    16, 1, JSEXN_NONE, "The argument to the File constructor {0} must be a string")
 MSG_DEF(JSFILEMSG_BIDIRECTIONAL_PIPE_NOT_SUPPORTED,               17, 0, JSEXN_NONE, "Bidirectional pipes are not supported")