Changeset 268 for branches/branch-1.2/zoo-kernel/service_internal.c

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-kernel/service_internal.c (modified) (4 diffs)

branches/branch-1.2/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);
       }
@@ -1722 +1725 @@
       else
         sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(_tmp->value,"=")+1);
-      FILE* file=fopen(session_file_path,"w");
-      dumpMapsToFile(tmpSess,file);
-      fclose(file);
+      dumpMapsToFile(tmpSess,session_file_path);
     }
   }