Changeset 255

Timestamp:

Jul 14, 2011, 2:46:27 PM (13 years ago)

Author:

djay

Message:

Bug fix in shared memory gesture. Add test.sh shell script to run tests for the utils/status services (both longProcess and GetStatus?).

Location:

trunk

Files:

• zoo-kernel/service_internal.c (modified) (3 diffs)
• zoo-services/utils/status/Makefile (modified) (1 diff)
• zoo-services/utils/status/service.c (modified) (1 diff)
• zoo-services/utils/status/test.sh (added)

trunk/zoo-kernel/service_internal.c

@@ -173 +173 @@
 }
 #else
+
 void unhandleStatus(maps *conf){
   int shmid,i;
@@ -209 +210 @@
     if ((shmid = shmget(key, SHMSZ, IPC_CREAT | 0666)) < 0) {
 #ifdef DEBUG
-      fprintf(stderr,"shmget failed to update value\n");
+      fprintf(stderr,"shmget failed to create new Shared memory segment\n");
 #endif
     }else{
@@ -220 +221 @@
         tmpMap=getMapFromMaps(conf,"lenv","status");
         s1=shm;
-        for(s=tmpMap->value;s!=NULL;s++)
+        for(s=tmpMap->value;*s!=NULL && *s!=0;s++){
           *s1++=*s;
+        }
+        *s1=NULL;
         shmdt((void *)shm);
       }

trunk/zoo-services/utils/status/Makefile

@@ -1 @@
-CFLAGS=-I../../../zoo-kernel/ -I./ `xslt-config --cflags` `xml2-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
+CFLAGS=-I../../../thirds/cgic206/ -I../../../zoo-kernel/ -I./ `xslt-config --cflags` `xml2-config --cflags` -lintl -lfcgi -lcrypto -DLINUX_FREE_ISSUE #-DDEBUG
 # if JS_ENABLED flag is set to true in your ZOO-Kernel Makefile then you'll have
 # uncomment the following line

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

@@ -72 +72 @@
       char tmp[128];
       sprintf(tmp,"_%s.xml",tmpMap->value);
-      while ((dp = readdir(dirp)) != NULL)
+      while ((dp = readdir(dirp)) != NULL){
+#ifdef DEBUG
+        fprintf(stderr,"File : %s searched : %s\n",dp->d_name,tmp);
+#endif
         if(strstr(dp->d_name,tmp)!=0){
           sprintf(fileName,"%s/%s",tmpTmap->value,dp->d_name);
           hasFile=1;
         }
+      }
     }else{
       char tmp[1024];