Changeset 364 for trunk/zoo-project/zoo-kernel/zoo_service_loader.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/zoo_service_loader.c (modified) (10 diffs)

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

@@ -78 +78 @@
 #include <windows.h>
 #include <direct.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#define pid_t int;
 #endif
 #include <fcntl.h>
 #include <time.h>
 #include <stdarg.h>
+
+#ifdef WIN32
+extern "C" {
+__declspec(dllexport) char *strcasestr(char const *a, char const *b) { 
+    char *x=_strdup(a); 
+    char *y=_strdup(b); 
+
+    x=_strlwr(x); 
+    y=_strlwr(y); 
+    char *pos = strstr(x, y); 
+    char *ret = pos == NULL ? NULL : (char *)(a + (pos-x)); 
+    free(x); 
+    free(y); 
+    return ret; 
+} 
+}
+#endif
 
 #define _(String) dgettext ("zoo-kernel",String)
@@ -218 +239 @@
   fflush(stderr);
 #endif
-  if(strncasecmp(r_inputs->value,"C",1)==0){
+  if(strlen(r_inputs->value)==1 && strncasecmp(r_inputs->value,"C",1)==0){
     r_inputs=getMap(request_inputs,"metapath");
     if(r_inputs!=NULL)
@@ -402 +423 @@
               }
   *myMap=m;
-#ifndef WIN32
   *ioutputs=request_output_real_format;
-#endif
 }
 
@@ -521 +540 @@
   bindtextdomain ("zoo-kernel","/usr/share/locale/");
   bindtextdomain ("zoo-services","/usr/share/locale/");
-  
+
+  /**
+   * Manage our own error log file (usefull to separate standard apache debug
+   * messages from the ZOO-Kernel ones but also for IIS users to avoid wrong 
+   * headers messages returned by the CGI due to wrong redirection of stderr)
+   */
+  FILE * fstde=NULL;
+  map* fstdem=getMapFromMaps(m,"main","logPath");
+  if(fstdem!=NULL)
+        fstde = freopen(fstdem->value, "a+", stderr) ;
+
   if((r_inputs=getMap(request_inputs,"language"))!=NULL){
     char *tmp=strdup(r_inputs->value);
@@ -1829 +1858 @@
     return 1;
   }
-
   maps* tmpReqI=request_input_real_format;
   while(tmpReqI!=NULL){
@@ -1842 +1870 @@
         char fileNameOnServer[64];
         char contentType[1024];
-        char buffer[BufferLen];
+        char buffer[1024];
         char *tmpStr=NULL;
         int size;
@@ -1866 +1894 @@
           fprintf(stderr,"fileNameOnServer: %s\n",fileNameOnServer);
           mode=S_IRWXU|S_IRGRP|S_IROTH;
-          targetFile = open (storageNameOnServer,O_RDWR|O_CREAT|O_TRUNC,mode);
+          targetFile = open (storageNameOnServer,O_RDWR|O_CREAT|O_TRUNC,S_IRWXU|S_IRGRP|S_IROTH);
           if(targetFile<0){
             fprintf(stderr,"could not create the new file,%s\n",fileNameOnServer);          
@@ -1912 +1940 @@
 #ifdef DEBUG
       fflush(stderr);
-      fprintf(stderr,"setting variable... %s\n",
+      fprintf(stderr,"setting variable... %s\n",(
 #endif
               SetEnvironmentVariable(mapcs->name,mapcs->value)
 #ifdef DEBUG
-              ? "OK" : "FAILED");
+              ==0)? "OK" : "FAILED");
 #else
       ;
 #endif
+          char* toto=(char*)malloc((strlen(mapcs->name)+strlen(mapcs->value)+2)*sizeof(char));
+      sprintf(toto,"%s=%s",mapcs->name,mapcs->value);
+          putenv(toto);
 #ifdef DEBUG
       fflush(stderr);
@@ -2036 +2067 @@
     addToMap(request_inputs,"status","true");
     status=getMap(request_inputs,"status");
-    fprintf(stderr,"cgiSID : %s",cgiSid);
+    //fprintf(stderr,"cgiSID : %s",cgiSid);
   }
 #endif
   if(status!=NULL)
     if(strcasecmp(status->value,"false")==0)
-      status=NULL;
+      status=NULLMAP;
   if(status==NULLMAP){
     loadServiceAndRun(&m,s1,request_inputs,&request_input_real_format,&request_output_real_format,&eres);
   }
   else{
-    pid_t   pid;
+    int   pid;
 #ifdef DEBUG
     fprintf(stderr,"\nPID : %d\n",cpid);
@@ -2171 +2202 @@
   return 0;
 }
+