Changeset 268 for branches/branch-1.2/zoo-services/utils/status

Timestamp:

Jul 16, 2011, 12:58:47 PM (13 years ago)

Author:

djay

Message:

Merge branch-1.2 to current rev. 267. Tag release-1.2.0-rc2.

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-services/utils/status/Makefile (modified) (1 diff)
• zoo-services/utils/status/service.c (modified) (1 diff)
• zoo-services/utils/status/test.sh (copied) (copied from trunk/zoo-services/utils/status/test.sh)

branches/branch-1.2/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

branches/branch-1.2/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];