More changes to use argsplit() for helper programs.

diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index c1416a6..671ecc7 100644 (file)
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -24,7 +24,7 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook)
 {
     pid_t pid;
     int msgnum, vecp, retval = 0;
 {
     pid_t pid;
     int msgnum, vecp, retval = 0;

-    char buf[100], *dp, **vec;
+    char buf[100], *dp, **vec, *prog;

     char       msgpath[BUFSIZ];
 
     /*
     char       msgpath[BUFSIZ];
 
     /*


@@ -40,10 +40,18 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook)
        /* Mark that the sequence information has changed */
        mp->msgflags |= SEQMOD;
 
        /* Mark that the sequence information has changed */
        mp->msgflags |= SEQMOD;
 

-       vec = (char **) calloc ((size_t) (mp->numsel + 2), sizeof(*vec));
+       vec = argsplit(rmmproc, &prog, &vecp);
+
+       /*
+        * argsplit allocates a MAXARGS vector by default,  If we need
+        * something bigger, allocate it ourselves
+        */
+
+       if (mp->numsel + vecp + 1 > MAXARGS)
+           vec = (char **) realloc (vec, (size_t) ((mp->numsel + vecp + 1) *
+                                                    sizeof(*vec)));

        if (vec == NULL)
            adios (NULL, "unable to allocate exec vector");
        if (vec == NULL)
            adios (NULL, "unable to allocate exec vector");

-       vecp = 1;

        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
            if (is_selected (mp, msgnum) &&
                !(vec[vecp++] = strdup (m_name (msgnum))))
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
            if (is_selected (mp, msgnum) &&
                !(vec[vecp++] = strdup (m_name (msgnum))))


@@ -52,7 +60,6 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook)
        vec[vecp] = NULL;
 
        fflush (stdout);
        vec[vecp] = NULL;
 
        fflush (stdout);

-       vec[0] = r1bindex (rmmproc, '/');

 
        switch (pid = vfork()) {
        case -1:
 
        switch (pid = vfork()) {
        case -1:


@@ -60,12 +67,13 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook)
            return -1;
 
        case 0:
            return -1;
 
        case 0:

-           execvp (rmmproc, vec);
+           execvp (prog, vec);

            fprintf (stderr, "unable to exec ");
            perror (rmmproc);
            _exit (-1);
 
        default:
            fprintf (stderr, "unable to exec ");
            perror (rmmproc);
            _exit (-1);
 
        default:

+           arglist_free(prog, vec);

            return (pidwait (pid, -1));
        }
     }
            return (pidwait (pid, -1));
        }
     }

diff --git a/uip/post.c b/uip/post.c
index 59a8c8b..7bed6f8 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -1787,8 +1787,9 @@ static void
 fcc (char *file, char *folder)
 {
     pid_t child_id;
 fcc (char *file, char *folder)
 {
     pid_t child_id;

-    int i, status;
+    int i, status, argp;

     char fold[BUFSIZ];
     char fold[BUFSIZ];

+    char **arglist, *program;

 
     if (verbose)
        printf ("  %sFcc %s: ", msgstate == RESENT ? "Resent-" : "", folder);
 
     if (verbose)
        printf ("  %sFcc %s: ", msgstate == RESENT ? "Resent-" : "", folder);


@@ -1811,8 +1812,14 @@ fcc (char *file, char *folder)
                    *folder == '+' || *folder == '@' ? "" : "+", folder);
 
            /* now exec the fileproc */
                    *folder == '+' || *folder == '@' ? "" : "+", folder);
 
            /* now exec the fileproc */

-           execlp (fileproc, r1bindex (fileproc, '/'),
-                   "-link", "-file", file, fold, NULL);
+
+           arglist = argsplit(fileproc, &program, &argp);
+           arglist[argp++] = "-link";
+           arglist[argp++] = "-file";
+           arglist[argp++] = file;
+           arglist[argp++] = fold;
+           arglist[argp] = NULL;
+           execvp (program, arglist);

            _exit (-1);
 
        default: 
            _exit (-1);
 
        default: 

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 06358fd..2350ccf 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -908,8 +908,10 @@ static void
 alert (char *file, int out)
 {
     pid_t child_id;
 alert (char *file, int out)
 {
     pid_t child_id;

-    int i, in;
+    int i, in, argp;

     char buf[BUFSIZ];
     char buf[BUFSIZ];

+    char *program;
+    char **arglist;

 
     for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
        sleep (5);
 
     for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
        sleep (5);


@@ -949,8 +951,14 @@ alert (char *file, int out)
            snprintf (buf, sizeof(buf), "send failed on %s",
                        forwsw ? "enclosed draft" : file);
 
            snprintf (buf, sizeof(buf), "send failed on %s",
                        forwsw ? "enclosed draft" : file);
 

-           execlp (mailproc, r1bindex (mailproc, '/'), getusername (),
-                   "-subject", buf, NULL);
+           arglist = argsplit(mailproc, &program, &argp);
+
+           arglist[argp++] = getusername();
+           arglist[argp++] = "-subject";
+           arglist[argp++] = buf;
+           arglist[argp] = NULL;
+
+           execvp (program, arglist);

            fprintf (stderr, "unable to exec ");
            perror (mailproc);
            _exit (-1);
            fprintf (stderr, "unable to exec ");
            perror (mailproc);
            _exit (-1);