- Timestamp:
- Jan 9, 2019, 4:11:59 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c
r882 r890 340 340 if (s1 == NULL) 341 341 { 342 dup2 (saved_stdout, fileno (stdout));342 zDup2 (saved_stdout, fileno (stdout)); 343 343 errorException (m, _("Unable to allocate memory"), 344 344 "InternalError", NULL); … … 361 361 sprintf (tmp01, _("Unable to parse the ZCFG file: %s."), 362 362 dp->d_name); 363 dup2 (saved_stdout, fileno (stdout));363 zDup2 (saved_stdout, fileno (stdout)); 364 364 errorException (m, tmp01, "InternalError", NULL); 365 365 return -1; … … 1101 1101 char tmp1[13]; 1102 1102 sprintf (tmp1, "LC_ALL=%s", tmp); 1103 putenv (tmp1);1103 _putenv (tmp1); 1104 1104 #endif 1105 1105 free (tmp); … … 1113 1113 char tmp1[13]; 1114 1114 sprintf (tmp1, "LC_ALL=en_US"); 1115 putenv (tmp1);1115 _putenv (tmp1); 1116 1116 #endif 1117 1117 setMapInMaps (m, "main", "language", "en-US"); … … 1123 1123 char tmp1[17]; 1124 1124 sprintf (tmp1, "LC_NUMERIC=C"); 1125 putenv (tmp1);1125 _putenv (tmp1); 1126 1126 #endif 1127 1127 bind_textdomain_codeset ("zoo-kernel", "UTF-8"); … … 1306 1306 registry* zooRegistry=NULL; 1307 1307 if(reg!=NULL){ 1308 int saved_stdout = dup (fileno (stdout));1309 dup2 (fileno (stderr), fileno (stdout));1308 int saved_stdout = zDup (fileno (stdout)); 1309 zDup2 (fileno (stderr), fileno (stdout)); 1310 1310 if(createRegistry (m,&zooRegistry,reg->value)<0){ 1311 1311 map *message=getMapFromMaps(m,"lenv","message"); 1312 1312 map *type=getMapFromMaps(m,"lenv","type"); 1313 dup2 (saved_stdout, fileno (stdout));1313 zDup2 (saved_stdout, fileno (stdout)); 1314 1314 errorException (m, message->value, 1315 1315 type->value, NULL); 1316 1316 return 0; 1317 1317 } 1318 dup2 (saved_stdout, fileno (stdout));1319 close(saved_stdout);1318 zDup2 (saved_stdout, fileno (stdout)); 1319 zClose(saved_stdout); 1320 1320 } 1321 1321 … … 1331 1331 * has been found in the zcfg and then printed on stdout 1332 1332 */ 1333 int saved_stdout = dup (fileno (stdout));1334 dup2 (fileno (stderr), fileno (stdout));1333 int saved_stdout = zDup (fileno (stdout)); 1334 zDup2 (fileno (stderr), fileno (stdout)); 1335 1335 1336 1336 maps* imports = getMaps(m, IMPORTSERVICE); … … 1371 1371 } 1372 1372 fflush (stdout); 1373 dup2 (saved_stdout, fileno (stdout));1373 zDup2 (saved_stdout, fileno (stdout)); 1374 1374 #ifdef META_DB 1375 1375 fetchServicesFromDb(zooRegistry,m,doc,n,printGetCapabilitiesForProcess,1); 1376 1376 close_sql(m,0); 1377 1377 #endif 1378 printDocument (m, doc, getpid ());1378 printDocument (m, doc, zGetpid ()); 1379 1379 freeMaps (&m); 1380 1380 free (m); … … 1466 1466 char *orig = zStrdup (r_inputs->value); 1467 1467 1468 int saved_stdout = dup (fileno (stdout));1469 dup2 (fileno (stderr), fileno (stdout));1468 int saved_stdout = zDup (fileno (stdout)); 1469 zDup2 (fileno (stderr), fileno (stdout)); 1470 1470 if (strcasecmp ("all", orig) == 0) 1471 1471 { … … 1535 1535 sprintf (tmp01, _("Unable to parse the ZCFG file: %s."), import->value); 1536 1536 1537 dup2 (saved_stdout, fileno (stdout));1537 zDup2 (saved_stdout, fileno (stdout)); 1538 1538 errorException (m, tmp01, "InternalError", NULL); 1539 1539 … … 1602 1602 ("Unable to parse the ZCFG file for the following ZOO-Service: %s."), 1603 1603 tmps); 1604 dup2 (saved_stdout, fileno (stdout));1604 zDup2 (saved_stdout, fileno (stdout)); 1605 1605 errorException (m, tmp01, "InvalidParameterValue", 1606 1606 "identifier"); … … 1674 1674 if (s1 == NULL) 1675 1675 { 1676 dup2 (saved_stdout, fileno (stdout));1676 zDup2 (saved_stdout, fileno (stdout)); 1677 1677 return errorException (m, 1678 1678 _ … … 1705 1705 ("Unable to parse the ZCFG file: %s."), 1706 1706 dp->d_name); 1707 dup2 (saved_stdout, fileno (stdout));1707 zDup2 (saved_stdout, fileno (stdout)); 1708 1708 errorException (m, tmp01, "InternalError", 1709 1709 NULL); … … 1757 1757 _("Unable to parse the ZCFG file: %s."), 1758 1758 buff); 1759 dup2 (saved_stdout, fileno (stdout));1759 zDup2 (saved_stdout, fileno (stdout)); 1760 1760 errorException (m, tmp01, "InvalidParameterValue", 1761 1761 "Identifier"); … … 1782 1782 closedir (dirp); 1783 1783 fflush (stdout); 1784 dup2 (saved_stdout, fileno (stdout));1784 zDup2 (saved_stdout, fileno (stdout)); 1785 1785 free (orig); 1786 printDocument (m, doc, getpid ());1786 printDocument (m, doc, zGetpid ()); 1787 1787 freeMaps (&m); 1788 1788 free (m); … … 1942 1942 } 1943 1943 1944 int saved_stdout = dup (fileno (stdout));1945 dup2 (fileno (stderr), fileno (stdout));1944 int saved_stdout = zDup (fileno (stdout)); 1945 zDup2 (fileno (stderr), fileno (stdout)); 1946 1946 t = readServiceFile (m, tmps1, &s1, r_inputs->value); 1947 1947 fprintf(stderr,"%d %s %d",t,__FILE__,__LINE__); … … 1958 1958 } 1959 1959 fflush (stdout); 1960 dup2 (saved_stdout, fileno (stdout));1960 zDup2 (saved_stdout, fileno (stdout)); 1961 1961 if (t < 0) 1962 1962 { … … 1975 1975 return 0; 1976 1976 } 1977 close (saved_stdout);1977 zClose (saved_stdout); 1978 1978 #ifdef META_DB 1979 1979 } … … 2058 2058 2) * sizeof (char)); 2059 2059 sprintf (toto, "%s=%s", mapcs->name, mapcs->value); 2060 putenv (toto);2060 _putenv (toto); 2061 2061 #ifdef DEBUG 2062 2062 fflush (stderr); … … 2155 2155 2156 2156 int eres = SERVICE_STARTED; 2157 int cpid = getpid ();2157 int cpid = zGetpid (); 2158 2158 2159 2159 // Create a map containing a copy of the request map … … 2241 2241 if (istat == 0 && file_status.st_size > 0) 2242 2242 { 2243 int saved_stdout = dup (fileno (stdout));2244 dup2 (fileno (stderr), fileno (stdout));2243 int saved_stdout = zDup (fileno (stdout)); 2244 zDup2 (fileno (stderr), fileno (stdout)); 2245 2245 conf_read (session_file_path, tmpSess); 2246 2246 addMapsToMaps (&m, tmpSess); 2247 2247 freeMaps (&tmpSess); 2248 2248 fflush(stdout); 2249 dup2 (saved_stdout, fileno (stdout));2250 close(saved_stdout);2249 zDup2 (saved_stdout, fileno (stdout)); 2250 zClose(saved_stdout); 2251 2251 } 2252 2252 free (tmpSess); … … 2271 2271 2272 2272 _tmpMaps = createMaps("renv"); 2273 for (; s; ei++) { 2273 if(orig!=NULL) 2274 for (; 2275 #ifdef WIN32 2276 *s; 2277 s++ 2278 #else 2279 s; 2280 ei++ 2281 #endif 2282 ) { 2274 2283 if(strstr(s,"=")!=NULL && strlen(strstr(s,"="))>1){ 2275 2284 int len=strlen(s); … … 2285 2294 free(tmpName); 2286 2295 } 2287 #ifdef WIN32 2288 s++; 2289 #else 2296 #ifndef WIN32 2290 2297 s = *(orig+ei); 2291 2298 #endif … … 2297 2304 freeMaps (&_tmpMaps); 2298 2305 free (_tmpMaps); 2299 2306 #ifdef WIN32 2307 FreeEnvironmentStrings((LPCH)orig); 2308 #endif 2300 2309 if(postRequest!=NULL) 2301 2310 setMapInMaps (m, "renv", "xrequest", postRequest->value); … … 2389 2398 #ifdef DEBUG 2390 2399 fprintf (stderr, "father pid continue (origin %d) %d ...\n", cpid, 2391 getpid ());2400 zGetpid ()); 2392 2401 #endif 2393 2402 eres = SERVICE_ACCEPTED; … … 2417 2426 bmap->content=createMap("usid",usid->value); 2418 2427 addToMap(bmap->content,"sid",tmpm->value); 2419 addIntToMap(bmap->content,"pid", getpid());2428 addIntToMap(bmap->content,"pid",zGetpid()); 2420 2429 2421 2430 // Create PID file referencing the OS process identifier … … 2428 2437 2429 2438 f0 = freopen (fbkpid, "w+",stdout); 2430 printf("%d", getpid());2439 printf("%d",zGetpid()); 2431 2440 fflush(stdout); 2432 2441 … … 2460 2469 fprintf (stderr, "RUN IN BACKGROUND MODE \n"); 2461 2470 fprintf (stderr, "son pid continue (origin %d) %d ...\n", cpid, 2462 getpid ());2471 zGetpid ()); 2463 2472 fprintf (stderr, "\nFILE TO STORE DATA %s\n", r_inputs->value); 2464 2473 #endif … … 2539 2548 #endif 2540 2549 #endif 2541 unlink (fbkpid);2550 zUnlink (fbkpid); 2542 2551 unhandleStatus (m); 2543 2552 #ifdef RELY_ON_DB … … 2617 2626 #endif 2618 2627 2619 if (((int) getpid ()) != cpid || cgiSid != NULL)2628 if (((int) zGetpid ()) != cpid || cgiSid != NULL) 2620 2629 { 2621 2630 if (eres == SERVICE_SUCCEEDED) … … 2633 2642 if(dumpBackFinalFile(m,fbkp,fbkp1)<0) 2634 2643 return -1; 2635 unlink (fbkpid);2644 zUnlink (fbkpid); 2636 2645 switch(eres){ 2637 2646 default: … … 2657 2666 freeMaps(&bmap); 2658 2667 free(bmap); 2659 unlink (fbkp1);2668 zUnlink (fbkp1); 2660 2669 unhandleStatus (m); 2661 2670 #ifdef RELY_ON_DB … … 2676 2685 fflush(stderr); 2677 2686 fclose (stderr); 2678 unlink (flog);2687 zUnlink (flog); 2679 2688 free (flog); 2680 2689 } … … 2705 2714 #endif 2706 2715 2707 if (((int) getpid ()) != cpid || cgiSid != NULL)2716 if (((int) zGetpid ()) != cpid || cgiSid != NULL) 2708 2717 { 2709 2718 exit (0);
Note: See TracChangeset
for help on using the changeset viewer.