Changeset 889 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c
- Timestamp:
- Jan 3, 2019, 12:44:57 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/zoo_service_loader.c
r844 r889 159 159 lockShm (lid); 160 160 #endif 161 FILE *f3 = fopen (fbkp, "wb+"); 162 free (fbkp); 161 FILE *f3 = fopen (fbkp, "wb+"); 162 free (fbkp); 163 163 fseek (f2, 0, SEEK_END); 164 164 long flen = ftell (f2); 165 165 fseek (f2, 0, SEEK_SET); 166 166 char *tmps1 = (char *) malloc ((flen + 1) * sizeof (char)); 167 fread (tmps1, flen, 1, f2); 167 fread (tmps1, flen, 1, f2); 168 168 #ifdef WIN32 169 char *pchr=strrchr(tmps1,'>'); 170 flen=strlen(tmps1)-strlen(pchr)+1; 171 tmps1[flen]=0; 172 #endif 169 /* knut: I think this block can be dropped; pchr may be NULL if result is not in XML format 170 char *pchr=strrchr(tmps1,'>'); 171 flen=strlen(tmps1)-strlen(pchr)+1; 172 tmps1[flen]=0; 173 */ 174 #endif 173 175 fwrite (tmps1, 1, flen, f3); 176 free(tmps1); 174 177 fclose (f2); 175 fclose (f3); 178 fclose (f3); 176 179 return 1; 177 180 } … … 2218 2221 addToMap(bmap->content,"sid",tmpm->value); 2219 2222 addIntToMap(bmap->content,"pid",getpid()); 2220 2223 2221 2224 // Create PID file referencing the OS process identifier 2222 2225 fbkpid = … … 2309 2312 if(dumpBackFinalFile(m,fbkp,fbkp1)<0) 2310 2313 return -1; 2311 unlink (fbkpid); 2314 unlink (fbkpid); 2312 2315 unhandleStatus (m); 2313 2316 freeMaps (&m); … … 2364 2367 signal (SIGABRT, donothing); 2365 2368 #endif 2366 2367 2369 if (((int) getpid ()) != cpid || cgiSid != NULL) 2368 { 2370 { 2369 2371 fclose (stdout); 2370 2372 fclose (stderr); … … 2372 2374 fclose (f0); 2373 2375 fclose (f1); 2374 2375 if(dumpBackFinalFile(m,fbkp,fbkp1)<0) 2376 return -1; 2377 unlink (fbkpid); 2376 2377 if (dumpBackFinalFile(m, fbkp, fbkp1) < 0) 2378 return -1; 2379 2380 unlink (fbkpid); 2378 2381 switch(eres){ 2379 2382 default: … … 2387 2390 break; 2388 2391 } 2389 #ifndef RELY_ON_DB 2392 #ifndef RELY_ON_DB 2390 2393 dumpMapsToFile(bmap,fbkpres,1); 2391 2394 removeShmLock (m, 1);
Note: See TracChangeset
for help on using the changeset viewer.