Changeset 197 for trunk/src/sh_unix.c

Timestamp:

Nov 21, 2008, 10:33:04 PM (16 years ago)

Author:

katerina

Message:

Rewrite of code for conditionals in configuration file, supports more tests now (ticket #129).

File:

• trunk/src/sh_unix.c (modified) (1 diff)

trunk/src/sh_unix.c

@@ -2027 +2027 @@
 
   SL_RETURN((0),_("sh_unix_init"));
+}
+
+/* --- run a command, securely --- */
+
+int sh_unix_run_command (const char * str)
+{
+  pid_t  pid;
+  char * arg[4];
+  char * env[5];
+  char * path = sh_util_strdup(_("/bin/sh"));
+
+  int  status = -1;
+
+  arg[0] = sh_util_strdup(_("/bin/sh"));
+  arg[1] = sh_util_strdup(_("-c"));
+  arg[2] = sh_util_strdup(str);
+  arg[3] = NULL;
+
+  env[0] = sh_util_strdup(_("PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/ucb"));
+  env[1] = sh_util_strdup(_("SHELL=/bin/sh"));
+  env[2] = sh_util_strdup(_("IFS= \t\n"));
+  if (getenv("TZ")) {
+    char * tz = sh_util_strdup(getenv("TZ"));
+    if (SL_TRUE == sl_ok_adds (4, strlen(tz))) {
+        env[3] = SH_ALLOC(4+strlen(tz));
+        sl_strlcpy(env[3], "TZ=", 4);
+        sl_strlcat(env[3], tz   , 4+strlen(tz));
+    } else {
+      env[3] = NULL;
+    }
+  } else {
+    env[3] = NULL;
+  }
+  env[4] = NULL;
+
+  pid = fork();
+
+  if (pid == (pid_t)(-1))
+    {
+      return -1;
+    }
+
+  else if (pid == 0) /* child */
+    {
+      memset(skey, 0, sizeof(sh_key_t));
+      (void) umask(S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH);
+      sh_unix_closeall (3, -1, SL_TRUE); /* in child process */
+      execve(path, arg, env);
+      _exit(EXIT_FAILURE);
+    }
+
+  else /* parent */
+    {
+      int r;
+
+      while((r = waitpid(pid, &status, WCONTINUED|WUNTRACED)) != pid && r != -1) ;
+
+      if (r == -1 || !WIFEXITED(status)) 
+        {
+          status = -1;
+        }
+      else
+        {
+          status = WEXITSTATUS(status);
+        }
+     }
+
+  return status;
 }