Changes in trunk/src/sh_extern.c [1:29]

File:

• trunk/src/sh_extern.c (modified) (28 diffs)

trunk/src/sh_extern.c

@@ -115 +115 @@
   FILE * outf = NULL;
   char * envp[1];
-  char * argp[1];
+  char * argp[2];
 
   char * errfile;
@@ -133 +133 @@
    *         needs a valid *envp[] with envp[0] = NULL;
    *         and similarly for argp
+   * OpenBSD finally needs non-null argp[0] ...
    */
+  argp[0] = task->command;
+  argp[1] = NULL;
   envp[0] = NULL;
-  argp[0] = NULL;
 
   /* 
@@ -364 +366 @@
               
               PDBGC(5);
-              sprintf(pname, _("/proc/self/fd/%d"),      /* known to fit  */
-                           pfd);
-              if (access(pname, R_OK|X_OK) == 0) 
+              sl_snprintf(pname, sizeof(pname), _("/proc/self/fd/%d"), pfd);
+              if (access(pname, R_OK|X_OK) == 0) /* flawfinder: ignore */
                 {
                   PDBGC(6);
@@ -402 +403 @@
            * --  execute path if executable
            */
-          if (0 == access(task->command, R_OK|X_OK))
+          if (0 == access(task->command, R_OK|X_OK)) /* flawfinder: ignore */
             {
               PDBGC(5);
@@ -544 +545 @@
               task->exit_status = WEXITSTATUS(task->exit_status);
               if ((flag_err_debug == SL_TRUE) || (task->exit_status != 0))
-                sprintf(infomsg,                         /* known to fit  */
-                        _("Subprocess exited normally with status %d"),
-                        task->exit_status);
+                sl_snprintf(infomsg, sizeof(infomsg),
+                            _("Subprocess exited normally with status %d"),
+                            task->exit_status);
             }
           else if (WIFSIGNALED(task->exit_status) != 0)
             {
-              sprintf(infomsg,                           /* known to fit  */
-                      _("Subprocess terminated by signal %d"),
-                      WTERMSIG(task->exit_status));
+              sl_snprintf(infomsg, sizeof(infomsg),
+                          _("Subprocess terminated by signal %d"),
+                          WTERMSIG(task->exit_status));
               task->exit_status = EXIT_FAILURE;
             }
           else if (WIFSTOPPED(task->exit_status) != 0)
             {
-              sprintf(infomsg,                           /* known to fit  */
-                      _("Subprocess stopped by signal %d, killing"),
-                      WSTOPSIG(task->exit_status));
+              sl_snprintf(infomsg, sizeof(infomsg),
+                          _("Subprocess stopped by signal %d, killing"),
+                          WSTOPSIG(task->exit_status));
               task->exit_status = EXIT_FAILURE;
               (void) aud_kill (FIL__, __LINE__, task->pid, 9);
@@ -567 +568 @@
           else
             {
-              sprintf(infomsg,                           /* known to fit  */
-                      _("Subprocess exit status unknown"));
+              sl_snprintf(infomsg, sizeof(infomsg),
+                          _("Subprocess exit status unknown"));
               task->exit_status = EXIT_FAILURE;
             }
@@ -581 +582 @@
             }
           (void) aud_kill (FIL__, __LINE__, task->pid, 9);
-          sprintf(infomsg,                               /* known to fit  */
-                  _("Subprocess not yet exited, killing"));
+          sl_snprintf(infomsg, sizeof(infomsg),
+                      _("Subprocess not yet exited, killing"));
           task->exit_status = EXIT_FAILURE;
           (void) waitpid (task->pid, NULL, 0);
@@ -588 +589 @@
       else
         {
-          sprintf(infomsg,                               /* known to fit  */
-                  _("Waitpid returned error %d\n"), errno);
+          sl_snprintf(infomsg, sizeof(infomsg),
+                      _("Waitpid returned error %d\n"), errno);
           task->exit_status = EXIT_FAILURE;
         }
@@ -646 +647 @@
 
 
-int sh_ext_tas_add_envv(sh_tas_t * tas, char * key, char * val)
+int sh_ext_tas_add_envv(sh_tas_t * tas, const char * key, const char * val)
 {
   size_t sk = 0, sv = 0;
@@ -697 +698 @@
 }
 
-int sh_ext_tas_add_argv(sh_tas_t * tas, char * val)
+int sh_ext_tas_add_argv(sh_tas_t * tas, const char * val)
 {
   size_t sv = 0;
@@ -722 +723 @@
 }
 
-void sh_ext_tas_command(sh_tas_t * tas, char * command)
+void sh_ext_tas_command(sh_tas_t * tas, const char * command)
 {
   size_t len = sl_strlen(command);
@@ -842 +843 @@
 
 static
-int sh_ext_add_envv(char * key, char * val)
+int sh_ext_add_envv(const char * key, const char * val)
 {
   SL_ENTER(_("sh_ext_add_envv"));
@@ -861 +862 @@
 
 static 
-int sh_ext_init(char * command)
+int sh_ext_init(const char * command)
 {
   sh_com_t * retval;
@@ -896 +897 @@
 
 static
-int sh_ext_uid (char * user, /*@out@*/uid_t * uid, /*@out@*/gid_t * gid)
+int sh_ext_uid (const char * user, /*@out@*/uid_t * uid, /*@out@*/gid_t * gid)
 {
   struct passwd * tempres;
@@ -922 +923 @@
 
 static
-int sh_ext_add (char * argstring, int * ntok, char * stok[])
+int sh_ext_add (const char * argstring, int * ntok, char * stok[])
 {
   int    i = 0;
   size_t s;
   char * p;
+  char * new;
+  size_t len;
 
   SL_ENTER(_("sh_ext_add"));
@@ -935 +938 @@
     }
 
+  len = strlen(argstring) + 1;
+  new = SH_ALLOC(len);
+  sl_strlcpy(new, argstring, len); 
+
   do
     {
       if (i == 0)
-        p = strtok (argstring, ", \t");
+        p = strtok (new, ", \t");
       else
         p = strtok (NULL, ", \t");
@@ -957 +964 @@
 
   *ntok = i;
+  SH_FREE(new);
 
   SL_RETURN (0, _("sh_ext_add"));
@@ -971 +979 @@
  * -- start a new external command, and add it to the list
  */ 
-int sh_ext_setcommand(char * cmd)
+int sh_ext_setcommand(const char * cmd)
 {
   int i;
@@ -1018 +1026 @@
  * -- add keywords to the OR filter
  */
-int sh_ext_add_or (char * str)
+int sh_ext_add_or (const char * str)
 {
   if (ext_coms == NULL || ext_failed == (-1))
@@ -1028 +1036 @@
  * -- add keywords to the AND filter
  */
-int sh_ext_add_and (char * str)
+int sh_ext_add_and (const char * str)
 {
   if (ext_coms == NULL || ext_failed == (-1))
@@ -1038 +1046 @@
  * -- add keywords to the NOT filter
  */
-int sh_ext_add_not (char * str)
+int sh_ext_add_not (const char * str)
 {
   if (ext_coms == NULL || ext_failed == (-1))
@@ -1048 +1056 @@
  * -- add keywords to the CL argument list
  */
-int sh_ext_add_argv (char * str)
+int sh_ext_add_argv (const char * str)
 {
   if (ext_coms == NULL || ext_failed == (-1))
@@ -1058 +1066 @@
  * -- add a path to the environment
  */
-int sh_ext_add_default (char * dummy)
-{
-  /* while this assignment looks ridiculous, it is here to avoid
-   * an 'unused parameter' warning
-   */
-  char * p = (dummy == NULL ? dummy : NULL);
+int sh_ext_add_default (const char * dummy)
+{
+  (void) dummy;
+  char * p = NULL;
   int    i;
 
@@ -1084 +1090 @@
  * -- add an environment variable
  */
-int sh_ext_add_environ (char * str)
+int sh_ext_add_environ (const char * str)
 {
   int i;
@@ -1095 +1101 @@
  * -- set deadtime
  */
-int sh_ext_deadtime (char * str)
+int sh_ext_deadtime (const char * str)
 {
   long    deadtime = 0;
@@ -1119 +1125 @@
  * -- define type
  */
-int sh_ext_type (char * str)
+int sh_ext_type (const char * str)
 {
   SL_ENTER(_("sh_ext_type"));
@@ -1154 +1160 @@
  * -- define checksum
  */
-int sh_ext_checksum (char * str)
+int sh_ext_checksum (const char * str)
 {
   SL_ENTER(_("sh_ext_checksum"));
@@ -1175 +1181 @@
  * -- choose privileges
  */
-int sh_ext_priv (char * c)
+int sh_ext_priv (const char * c)
 {