Changeset 467

Timestamp:

Apr 25, 2014, 9:51:59 PM (11 years ago)

Author:

djay

Message:

Various fixes for tickets #93, #94, #95, #95, #96.

Location:

trunk/zoo-project

Files:

• zoo-kernel/makefile.vc (modified) (3 diffs)
• zoo-kernel/service_internal.c (modified) (2 diffs)
• zoo-kernel/service_internal.h (modified) (2 diffs)
• zoo-kernel/zcfg2yaml.c (modified) (2 diffs)
• zoo-kernel/zoo_service_loader.c (modified) (2 diffs)
• zoo-services/utils/status/service.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/makefile.vc

@@ -8 +8 @@
 !INCLUDE nmake.opt
 
-all:  zoo_loader.cgi
+all:  zoo_loader.cgi zcfg2yaml
 
 version.h:
-        svnversion -q -c -n . > version_0.h
-        set /p VERS=<version_0.h
-        rm version_0.h
-        echo #define ZOO_VERSION "%VERS%" > version.h
+        set VERS=`svnversion .`
+        echo #define ZOO_VERSION "$(VERS)" > version.h
 
 main_conf_read.tab.c: main_conf_read.y service.h
@@ -39 +37 @@
 lex.sr.obj: lex.sr.c service.h
         $(CPP) $(CFLAGS) /c lex.sr.c
+
+zcfg2yaml.obj: zcfg2yaml.c
+        $(CPP) $(CFLAGS) /c zcfg2yaml.c
 
 service_internal.obj: service_internal.c
@@ -70 +71 @@
         $(CPP) /EHsc /c $(CFLAGS) ..\..\thirds\dirent-win32\dirent.c
 
-zoo_loader.cgi: zoo_loader.obj zoo_service_loader.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj dirent.obj
+zoo_loader.cgi: version.h zoo_loader.obj zoo_service_loader.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj dirent.obj
         link zoo_loader.obj dirent.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj main_conf_read.tab.obj lex.cr.obj service_conf.tab.obj lex.sr.obj  zoo_service_loader.obj /out:zoo_loader.cgi $(LDFLAGS) $(LDFLAGSCGI)
+
+zcfg2yaml.exe: version.h zcfg2yaml.obj zoo_service_loader.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj dirent.obj
+        link zcfg2yaml.obj dirent.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj main_conf_read.tab.obj lex.cr.obj service_conf.tab.obj lex.sr.obj /out:zcfg2yaml.exe $(LDFLAGS) $(LDFLAGSCGI)
 
 clean:

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

@@ -35 +35 @@
 #endif
 
-int readServiceFile(maps* conf, char* file,service** service,char *name){
-  int t=getServiceFromFile(conf,file,service);
-#ifdef YAML
-  if(t<0){
-    t=getServiceFromYAML(conf,file,service,name);
-  }
-#endif
-  return t;
-}
-
 void printHeaders(maps* m){
   maps *_tmp=getMaps(m,"headers");
@@ -133 +123 @@
 
 char* getStatus(int pid){
-  char lpszBuf[SHMEMSIZE];
+  char *lpszBuf=(char*) malloc(SHMEMSIZE*sizeof(char));
   int i=0;
   LPWSTR lpszTmp=NULL;

trunk/zoo-project/zoo-kernel/service_internal.h

@@ -42 +42 @@
 #include <sys/shm.h>
 #else
+#include "cgic.h"
 #include <direct.h>
 #endif
@@ -65 +66 @@
 #include "ulinet.h"
 
-extern   int getServiceFromFile(maps*,const char*,service**);
 extern   int conf_read(const char*,maps*);
 

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

@@ -26 +26 @@
 #include "service_internal.h"
 
+extern   int getServiceFromFile(maps*,const char*,service**);
+
 int main(int argc, char** argv){
   service* s1=NULL;
@@ -35 +37 @@
     return errorException(m, _("Unable to allocate memory."),"InternalError",NULL);
   }
-  readServiceFile(m,argv[1],&s1,argv[2]);
-  dumpServiceAsYAML(s1);
+  int t=getServiceFromFile(conf,file,service);
+  if(t>=0)
+    dumpServiceAsYAML(s1);
   return 0;
 }

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

@@ -95 +95 @@
 #ifndef USE_MS
  { 
-  char *x=_zStrdup(a); 
-  char *y=_zStrdup(b); 
+  char *x=zStrdup(a); 
+  char *y=zStrdup(b); 
   
   x=_strlwr(x); 
@@ -115 +115 @@
 #define __(String) dgettext ("zoo-service",String)
 
+extern   int getServiceFromFile(maps*,const char*,service**);
+
+int readServiceFile(maps* conf, char* file,service** service,char *name){
+  int t=getServiceFromFile(conf,file,service);
+#ifdef YAML
+  if(t<0){
+    t=getServiceFromYAML(conf,file,service,name);
+  }
+#endif
+  return t;
+}
 
 void translateChar(char* str,char toReplace,char toReplaceBy){

trunk/zoo-project/zoo-services/utils/status/service.c

@@ -121 +121 @@
         setMapInMaps(outputs,"Result","value",(char*)xmlbuff);
         xmlFree(xmlbuff);
+        free(tmpStr);
         free(tmpStr1);
         free(tmpStr0);