From 0b9ca89dbb0329b07a844f5b4de46e50171705d1 Mon Sep 17 00:00:00 2001 From: Karl DeBisschop Date: Fri, 1 Aug 2003 06:01:50 +0000 Subject: [PATCH] set LC_ALL to C in execve environemnt git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@625 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/popen.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/popen.c b/plugins/popen.c index d4151e6..e41ae9a 100644 --- a/plugins/popen.c +++ b/plugins/popen.c @@ -67,7 +67,7 @@ static int maxfd; /* from our open_max(), {Prog openmax} */ FILE * spopen (const char *cmdstring) { - char *environ[] = { NULL }; + char *env[] = { "LC_ALL=C", (char*)0 }; char *cmd = NULL; char **argv = NULL; char *str; @@ -182,7 +182,7 @@ spopen (const char *cmdstring) if (childpid[i] > 0) close (i); - execve (argv[0], argv, environ); + execve (argv[0], argv, env); _exit (0); } @@ -199,7 +199,7 @@ spopen (const char *cmdstring) int spclose (FILE * fp) { - int fd, stat; + int fd, status; pid_t pid; if (childpid == NULL) @@ -213,12 +213,12 @@ spclose (FILE * fp) if (fclose (fp) == EOF) return (1); - while (waitpid (pid, &stat, 0) < 0) + while (waitpid (pid, &status, 0) < 0) if (errno != EINTR) return (1); /* error other than EINTR from waitpid() */ - if (WIFEXITED (stat)) - return (WEXITSTATUS (stat)); /* return child's termination status */ + if (WIFEXITED (status)) + return (WEXITSTATUS (status)); /* return child's termination status */ return (1); } -- 2.30.2