Changeset 364 for trunk/zoo-project/zoo-kernel/service_internal_js.c

Timestamp:

Sep 29, 2012, 3:59:06 PM (12 years ago)

Author:

djay

Message:

Update to make ZOO-Kernel able to compile and run from Windows Platforms. A special thanks to Espen Messel, Knut Landmark and Benrd Härtwig for providing many patches that I can successfully apply on the SVN source tree and to Farkas for continuing requesting for ZOO-Kernel to run on Windows platforms privately and through the ZOO-Discuss mailing list.

File:

• trunk/zoo-project/zoo-kernel/service_internal_js.c (modified) (15 diffs)

trunk/zoo-project/zoo-kernel/service_internal_js.c

@@ -45 +45 @@
 JSLoadScripts(JSContext *cx, uintN argc, jsval *argv1)
 {
-  map* request = JS_GetContextPrivate(cx);
-  map* tmpm1=getMap(request,"metapath");
+  //map* request = JS_GetContextPrivate(cx);
+  //map* tmpm1=getMap(request,"metapath");
   JS_MaybeGC(cx);
 
@@ -58 +58 @@
     JSString* jsmsg = JS_ValueToString(cx,argv[i]);
     char *filename = JSValToChar(cx,&argv[i]);
-    char api0[strlen(tmpm1->value)+strlen(ntmp)+strlen(filename)+2];
-    sprintf(api0,"%s/%s/%s",ntmp,tmpm1->value,filename);
+    char *api0=(char*)malloc((strlen(ntmp)+strlen(filename)+2)*sizeof(char));
+    sprintf(api0,"%s/%s",ntmp,filename);
 #ifdef JS_DEBUG
     fprintf(stderr,"Trying to load %s\n",api0);
+    fflush(stderr);
 #endif
     JSObject *api_script1=loadZooApiFile(cx,JS_GetGlobalObject(cx),api0);
-    fflush(stderr);
   }
   JS_MaybeGC(cx);
@@ -83 +83 @@
   JSClass global_class = {
     "global", JSCLASS_GLOBAL_FLAGS,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
     JSCLASS_NO_OPTIONAL_MEMBERS
@@ -142 +142 @@
    * Load the first part of the ZOO-API
    */
-  char api0[strlen(tmpm1->value)+strlen(ntmp)+16];
+  char *api0=(char*)malloc(strlen(tmpm1->value)+strlen(ntmp)+16);
   sprintf(api0,"%s/%s/ZOO-proj4js.js",ntmp,tmpm1->value);
 #ifdef JS_DEBUG
@@ -150 +150 @@
   fflush(stderr);
 
-  char api1[strlen(tmpm1->value)+strlen(ntmp)+11];
+  char *api1=(char*)malloc(strlen(tmpm1->value)+strlen(ntmp)+11);
   sprintf(api1,"%s/%s/ZOO-api.js",ntmp,tmpm1->value);
 #ifdef JS_DEBUG
@@ -165 +165 @@
   map* tmpm2=getMap(s->content,"serviceProvider");
 
-  char filename[strlen(tmpm1->value)+strlen(tmpm2->value)+strlen(ntmp)+3];
+  char *filename=(char*)malloc(strlen(tmpm1->value)+strlen(tmpm2->value)+strlen(ntmp)+3);
   sprintf(filename,"%s/%s/%s",ntmp,tmpm1->value,tmpm2->value);
   filename[strlen(tmpm1->value)+strlen(tmpm2->value)+strlen(ntmp)+2]=0;
@@ -173 +173 @@
   struct stat file_status;
   stat(filename, &file_status);
-  char source[file_status.st_size];
+  char *source=(char*)malloc(file_status.st_size);
   uint16 lineno;
   jsval rval;
@@ -244 +244 @@
     fprintf(stderr,"An array was returned !\n");
 #endif
-    jsint len;
+    jsuint       len;
     if((JS_GetArrayLength(cx, d, &len)==JS_FALSE)){
 #ifdef JS_DEBUG
@@ -259 +259 @@
     JSBool hasElement=JS_GetElement(cx,d,1,&tmp2);
     if(hasElement==JS_TRUE){
+          freeMaps(outputs);
+          free(*outputs);
       *outputs=mapsFromJSObject(cx,tmp2);
     }
@@ -285 +287 @@
     *outputs=mapsFromJSObject(cx,tmp2);
 #ifdef JS_DEBUG
-    dumpMaps(outputs);
-#endif
-  }
-
+    dumpMaps(*outputs);
+#endif
+  }
   /* Cleanup. */
   JS_DestroyContext(cx);
@@ -355 +356 @@
   map* isBinary=getMap(t,"size");
   map* tmap=getMapType(t);
+#ifdef DEBUG
   if(tmap==NULL)
     fprintf(stderr,"tmap is null !\n");
   else
     fprintf(stderr,"tmap is not null ! (%s = %s)\n",tmap->name,tmap->value);
-
+#endif
   /* Avoid gesture of binary content which failed due to strlen function use */
   if(isBinary!=NULL){
@@ -441 +443 @@
 
         jsval nvp=JSVAL_NULL;
-        if((JS_GetProperty(cx, JSVAL_TO_OBJECT(tt), JS_EncodeString(cx,jsmsg), &nvp)==JS_FALSE)){
+        if((JS_GetProperty(cx, tt, JS_EncodeString(cx,jsmsg), &nvp)==JS_FALSE)){
 #ifdef JS_DEBUG
           fprintf(stderr,"Enumerate id : %d => %s => No more value\n",oi,JS_EncodeString(cx,jsmsg));
@@ -447 +449 @@
         }
         
-        JSObject *nvp1=JSVAL_NULL;
+        JSObject *nvp1=JSVAL_TO_OBJECT(JSVAL_NULL);
         JS_ValueToObject(cx,nvp,&nvp1);
         jsval nvp1j=OBJECT_TO_JSVAL(nvp1);
@@ -467 +469 @@
   }
 
-  jsint len;
+  jsuint len;
   JSBool hasLen=JS_GetArrayLength(cx, tt, &len);
   if(hasLen==JS_FALSE){
@@ -522 +524 @@
         }
 
-        JSObject *nvp1=JSVAL_NULL;
+        JSObject *nvp1=JSVAL_TO_OBJECT(JSVAL_NULL);
         JS_ValueToObject(cx,nvp,&nvp1);
         jsval nvp1j=OBJECT_TO_JSVAL(nvp1);
         if(JSVAL_IS_OBJECT(nvp1j)){
           JSString *jsmsg1;
-          JSObject *nvp2=JSVAL_NULL;
+          JSObject *nvp2=JSVAL_TO_OBJECT(JSVAL_NULL);
           jsmsg1 = JS_ValueToString(cx,nvp1j);
           len1 = JS_GetStringLength(jsmsg1);