new.c: Order two return statements to match comment.

[nmh] / sbr / refile.c

diff --git a/sbr/refile.c b/sbr/refile.c
index dc068fe0ed1c2f1f5340e86c5ba11cf13daaec42..ade07f6e775415de3542aadf193a921538f71597 100644 (file)
--- a/sbr/refile.c
+++ b/sbr/refile.c
@@ -1,53 +1,52 @@
-
-/*
- * refile.c -- call the "fileproc" to refile the
+/* refile.c -- call the "fileproc" to refile the
  *          -- msg or draft into another folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 
 int
 refile (char **arg, char *file)
 {
     pid_t pid;
-    register int vecp;
-    char *vec[MAXARGS];
+    int vecp;
+    char **vec;
+    char *program;
+
+    vec = argsplit(fileproc, &program, &vecp);
 
-    vecp = 0;
-    vec[vecp++] = r1bindex (fileproc, '/');
-    vec[vecp++] = "-nolink";   /* override bad .mh_profile defaults */
-    vec[vecp++] = "-nopreserve";
-    vec[vecp++] = "-file";
-    vec[vecp++] = file;
+    vec[vecp++] = mh_xstrdup("-nolink"); /* override bad .mh_profile defaults */
+    vec[vecp++] = mh_xstrdup("-nopreserve");
+    vec[vecp++] = mh_xstrdup("-file");
+    vec[vecp++] = getcpy(file);
 
     if (arg) {
        while (*arg)
-           vec[vecp++] = *arg++;
+           vec[vecp++] = mh_xstrdup(*arg++);
     }
     vec[vecp] = NULL;
 
     context_save();    /* save the context file */
     fflush(stdout);
 
-    switch (pid = vfork()) {
+    switch (pid = fork()) {
        case -1: 
            advise ("fork", "unable to");
            return -1;
 
        case 0: 
-           execvp (fileproc, vec);
+           execvp (program, vec);
            fprintf (stderr, "unable to exec ");
            perror (fileproc);
            _exit (-1);
 
        default: 
-           return (pidwait (pid, -1));
+           arglist_free(program, vec);
+           return pidwait(pid, -1);
     }
 }