Initialize vecp in send anno()

[mmh] / uip / send.c

diff --git a/uip/send.c b/uip/send.c
index c2c9f17..ed6b08d 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -237,8 +237,7 @@ main(int argc, char **argv)
 static int
 sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 {
-       int status;
-       char buffer[BUFSIZ];
+       int status, dupfd;
        char *original_draft;
 
        /*
@@ -295,12 +294,16 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
                status = sendaux(vec, vecp, drft, st) ? NOTOK : OK;
                if (status == OK) {
                        /* move original draft to +trash folder */
-                       snprintf(buffer, sizeof buffer,
-                                       "</dev/null refile -file %s +trash",
-                                       original_draft);
-                       if (system(buffer) != 0) {
+                       /* temporary close stdin, for refile not to ask */
+                       dupfd = dup(0);
+                       close(0);
+                       if (execprogl("refile", "refile", "-file",
+                                       original_draft, "+trash",
+                                       (char *)NULL) != 0) {
                                advise(NULL, "unable to trash the draft");
                        }
+                       dup2(dupfd, 0);
+                       close(dupfd);
                }
                break;
 
@@ -674,6 +677,9 @@ anno(struct stat *st)
        struct stat st2;
        char *msgs, *folder;
        char buf[BUFSIZ];
+       char *vec[MAXARGS];
+       int vecp = 0;
+       char *cp, *dp;
 
        if (altmsg && (stat(altmsg, &st2) == NOTOK ||
                        st->st_mtime != st2.st_mtime ||
@@ -701,9 +707,27 @@ anno(struct stat *st)
                advise(NULL, "annotate as `%s': %s %s", annotext,
                                folder, msgs);
        }
-       snprintf(buf, sizeof buf, "anno -comp '%s' '+%s' %s",
-                       annotext, folder, msgs);
-       if (system(buf) != 0) {
+       vec[vecp++] = "anno";
+       vec[vecp++] = "-comp";
+       vec[vecp++] = annotext;
+       snprintf(buf, sizeof buf, "+%s", folder);
+       vec[vecp++] = buf;
+
+       while (isspace(*msgs)) {
+               msgs++;
+       }
+       for (cp=dp=msgs; *cp; cp++) {
+               if (isspace(*cp)) {
+                       while (isspace(*cp)) {
+                               *cp++ = '\0';
+                       }
+                       vec[vecp++] = dp;
+                       dp = cp;
+               }
+       }
+       vec[vecp++] = dp;
+       vec[vecp] = NULL;
+       if (execprog(*vec, vec) != 0) {
                advise(NULL, "unable to annotate");
        }
 }