Replace use of awk with sed in test-anno because it failed

[nmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index c9cbf50384096b5e6fe556d18cf893db8f7db2e7..85ba4b9029fbcbab67e0e013ceb4176d24a763da 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -40,7 +40,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
 
 #include <h/mh.h>
 #include <fcntl.h>

-#include <signal.h>

 #include <h/mime.h>
 #include <h/utils.h>
 
 #include <h/mime.h>
 #include <h/utils.h>
 


@@ -82,7 +81,7 @@ DEFINE_SWITCH_ARRAY(WHATNOW, whatnowswitches);
     X("pwd", 0, PWDCMDSW) \
     X("ls", 2, LSCMDSW) \
     X("attach", 0, ATTACHCMDSW) \
     X("pwd", 0, PWDCMDSW) \
     X("ls", 2, LSCMDSW) \
     X("attach", 0, ATTACHCMDSW) \

-    X("detach [-n]", 2, DETACHCMDSW) \
+    X("detach [-n]", 0, DETACHCMDSW) \

     X("alist [-ln] ", 2, ALISTCMDSW) \
 
 #define X(sw, minchars, id) id,
     X("alist [-ln] ", 2, ALISTCMDSW) \
 
 #define X(sw, minchars, id) id,


@@ -110,11 +109,7 @@ static void writelscmd(char *, int, char *, char **);
 static void writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp);
 static FILE* popen_in_dir(const char *dir, const char *cmd, const char *type);
 static int system_in_dir(const char *dir, const char *cmd);
 static void writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp);
 static FILE* popen_in_dir(const char *dir, const char *cmd, const char *type);
 static int system_in_dir(const char *dir, const char *cmd);

-
-
-#ifdef HAVE_LSTAT

 static int copyf (char *, char *);
 static int copyf (char *, char *);

-#endif

 
 
 int
 
 
 int


@@ -417,7 +412,7 @@ WhatNow (int argc, char **argv)
             *  Build a command line that causes the user's shell to list the file name
             *  arguments.  This handles and wildcard expansion, tilde expansion, etc.
             */
             *  Build a command line that causes the user's shell to list the file name
             *  arguments.  This handles and wildcard expansion, tilde expansion, etc.
             */

-           writelscmd(buf, sizeof(buf), "-d", argp);
+           writelscmd(buf, sizeof(buf), "-d --", argp);

 
            /*
             *  Read back the response from the shell, which contains a number of lines
 
            /*
             *  Read back the response from the shell, which contains a number of lines


@@ -506,7 +501,7 @@ WhatNow (int argc, char **argv)
             * We feed all the file names to the shell at once, otherwise you can't
             * provide a file name with a space in it.
             */
             * We feed all the file names to the shell at once, otherwise you can't
             * provide a file name with a space in it.
             */

-           writelscmd(buf, sizeof(buf), "-d", argp);
+           writelscmd(buf, sizeof(buf), "-d --", argp);

            if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
                while (fgets(shell, sizeof (shell), f) != (char *)0) {
                    *(strchr(shell, '\n')) = '\0';
            if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
                while (fgets(shell, sizeof (shell), f) != (char *)0) {
                    *(strchr(shell, '\n')) = '\0';


@@ -552,10 +547,10 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
     int trailln = strlen(trailcmd) + 4;
     if (ln < 0 || ln + trailln > bufsz)
        adios((char *)0, "arguments too long");
     int trailln = strlen(trailcmd) + 4;
     if (ln < 0 || ln + trailln > bufsz)
        adios((char *)0, "arguments too long");

-    
+

     cp = buf + ln;
     cp = buf + ln;

-    
-    while (*++argp != (char *)0) {
+
+    while (*argp  &&  *++argp) {

        ln = strlen(*argp);
        /* +1 for leading space */
        if (ln + trailln + 1 > bufsz - (cp-buf))
        ln = strlen(*argp);
        /* +1 for leading space */
        if (ln + trailln + 1 > bufsz - (cp-buf))


@@ -580,7 +575,7 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
 static void
 writelscmd(char *buf, int bufsz, char *lsoptions, char **argp)
 {
 static void
 writelscmd(char *buf, int bufsz, char *lsoptions, char **argp)
 {

-  char *lscmd = concat ("ls ", lsoptions, " --", NULL);
+  char *lscmd = concat ("ls ", lsoptions, NULL);

   writesomecmd(buf, bufsz, lscmd, "", argp);
   free (lscmd);
 }
   writesomecmd(buf, bufsz, lscmd, "", argp);
   free (lscmd);
 }


@@ -618,7 +613,7 @@ popen_in_dir(const char *dir, const char *cmd, const char *type)
     /* ensure that $SHELL exists, as the cmd was written relying on
        a non-blank $SHELL... */
     setenv("SHELL","/bin/sh",0); /* don't overwrite */
     /* ensure that $SHELL exists, as the cmd was written relying on
        a non-blank $SHELL... */
     setenv("SHELL","/bin/sh",0); /* don't overwrite */

-    
+

     if (getcwd(olddir, sizeof(olddir)) == 0)
        adios("getcwd", "could not get working directory");
     if (chdir(dir) != 0)
     if (getcwd(olddir, sizeof(olddir)) == 0)
        adios("getcwd", "could not get working directory");
     if (chdir(dir) != 0)


@@ -647,9 +642,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
     char *cp, *prog, **vec;
     struct stat st;
 
     char *cp, *prog, **vec;
     struct stat st;
 

-#ifdef HAVE_LSTAT

     int        slinked = 0;
     int        slinked = 0;

-#endif /* HAVE_LSTAT */

 
     /* Was there a previous edit session? */
     if (reedit) {
 
     /* Was there a previous edit session? */
     if (reedit) {


@@ -681,23 +674,19 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 
        if (atfile) {
            unlink (linkpath);
 
        if (atfile) {
            unlink (linkpath);

-#ifdef HAVE_LSTAT

            if (link (altpath, linkpath) == NOTOK) {
                symlink (altpath, linkpath);
                slinked = 1;
            } else {
                slinked = 0;
            }
            if (link (altpath, linkpath) == NOTOK) {
                symlink (altpath, linkpath);
                slinked = 1;
            } else {
                slinked = 0;
            }

-#else /* not HAVE_LSTAT */
-           link (altpath, linkpath);
-#endif /* not HAVE_LSTAT */

        }
     }
 
     context_save ();   /* save the context file */
     fflush (stdout);
 
        }
     }
 
     context_save ();   /* save the context file */
     fflush (stdout);
 

-    switch (pid = vfork()) {
+    switch (pid = fork()) {

        case NOTOK:
            advise ("fork", "unable to");
            status = NOTOK;
        case NOTOK:
            advise ("fork", "unable to");
            status = NOTOK;


@@ -741,7 +730,6 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
            }
 
            reedit++;
            }
 
            reedit++;

-#ifdef HAVE_LSTAT

            if (altmsg
                    && mp
                    && !is_readonly(mp)
            if (altmsg
                    && mp
                    && !is_readonly(mp)


@@ -754,16 +742,6 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
                                && (unlink (altpath) == NOTOK
                                        || link (linkpath, altpath) == NOTOK)))
                advise (linkpath, "unable to update %s from", altmsg);
                                && (unlink (altpath) == NOTOK
                                        || link (linkpath, altpath) == NOTOK)))
                advise (linkpath, "unable to update %s from", altmsg);

-#else /* HAVE_LSTAT */
-           if (altmsg
-                   && mp
-                   && !is_readonly(mp)
-                   && stat (linkpath, &st) != NOTOK
-                   && st.st_nlink == 1
-                   && (unlink (altpath) == NOTOK
-                       || link (linkpath, altpath) == NOTOK))
-               advise (linkpath, "unable to update %s from", altmsg);
-#endif /* HAVE_LSTAT */

     }
 
     /* normally, we remember which editor we used */
     }
 
     /* normally, we remember which editor we used */


@@ -778,7 +756,6 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 }
 
 
 }
 
 

-#ifdef HAVE_LSTAT

 static int
 copyf (char *ifile, char *ofile)
 {
 static int
 copyf (char *ifile, char *ofile)
 {


@@ -804,7 +781,6 @@ copyf (char *ifile, char *ofile)
     close (out);
     return i;
 }
     close (out);
     return i;
 }

-#endif /* HAVE_LSTAT */

 
 
 /*
 
 
 /*


@@ -816,7 +792,7 @@ sendfile (char **arg, char *file, int pushsw)
 {
     pid_t child_id;
     int i, vecp;
 {
     pid_t child_id;
     int i, vecp;

-    char *cp, *sp, *vec[MAXARGS];
+    char *cp, *sp, **vec, *program;

 
     /* Translate MIME composition file, if necessary */
     if ((cp = context_find ("automimeproc"))
 
     /* Translate MIME composition file, if necessary */
     if ((cp = context_find ("automimeproc"))


@@ -845,14 +821,13 @@ sendfile (char **arg, char *file, int pushsw)
     context_save ();   /* save the context file */
     fflush (stdout);
 
     context_save ();   /* save the context file */
     fflush (stdout);
 

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

        sleep (5);
     switch (child_id) {
        case NOTOK:
            advise (NULL, "unable to fork, so sending directly...");
        case OK:
        sleep (5);
     switch (child_id) {
        case NOTOK:
            advise (NULL, "unable to fork, so sending directly...");
        case OK:

-           vecp = 0;
-           vec[vecp++] = invo_name;
+           vec = argsplit(sendproc, &program, &vecp);

            if (pushsw)
                vec[vecp++] = "-push";
            if (arg)
            if (pushsw)
                vec[vecp++] = "-push";
            if (arg)


@@ -861,7 +836,7 @@ sendfile (char **arg, char *file, int pushsw)
            vec[vecp++] = file;
            vec[vecp] = NULL;
 
            vec[vecp++] = file;
            vec[vecp] = NULL;
 

-           execvp (sendproc, vec);
+           execvp (program, vec);

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


@@ -940,6 +915,7 @@ check_draft (char *msgnam)
                 */
                if (uprf (name, XXX_FIELD_PRF)) {
                    fclose (fp);
                 */
                if (uprf (name, XXX_FIELD_PRF)) {
                    fclose (fp);

+                   m_getfld_state_destroy (&gstate);

                    return 0;
                }
                while (state == FLDPLUS) {
                    return 0;
                }
                while (state == FLDPLUS) {


@@ -955,6 +931,7 @@ check_draft (char *msgnam)
                    for (bp = buf; *bp; bp++)
                        if (*bp != ' ' && *bp != '\t' && *bp != '\n') {
                            fclose (fp);
                    for (bp = buf; *bp; bp++)
                        if (*bp != ' ' && *bp != '\t' && *bp != '\n') {
                            fclose (fp);

+                           m_getfld_state_destroy (&gstate);

                            return 1;
                        }
 
                            return 1;
                        }
 


@@ -965,10 +942,10 @@ check_draft (char *msgnam)
 
            default:
                fclose (fp);
 
            default:
                fclose (fp);

+               m_getfld_state_destroy (&gstate);

                return 0;
        }
     }
                return 0;
        }
     }

-    m_getfld_state_destroy (&gstate);

 }
 
 
 }
 
 


@@ -1011,10 +988,6 @@ check_draft (char *msgnam)
     X("help", 0, SHELPSW) \
     X("dashstuffing", -12, BITSTUFFSW) \
     X("nodashstuffing", -14, NBITSTUFFSW) \
     X("help", 0, SHELPSW) \
     X("dashstuffing", -12, BITSTUFFSW) \
     X("nodashstuffing", -14, NBITSTUFFSW) \

-    X("mail", -4, MAILSW) \
-    X("saml", -4, SAMLSW) \
-    X("send", -4, SSNDSW) \
-    X("soml", -4, SOMLSW) \

     X("client host", -6, CLIESW) \
     X("server host", 6, SERVSW) \
     X("snoop", -5, SNOOPSW) \
     X("client host", -6, CLIESW) \
     X("server host", 6, SERVSW) \
     X("snoop", -5, SNOOPSW) \


@@ -1026,11 +999,12 @@ check_draft (char *msgnam)
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
     X("saslmech", SASLminc(-5), SASLMECHSW) \
     X("user", SASLminc(-4), USERSW) \
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
     X("saslmech", SASLminc(-5), SASLMECHSW) \
     X("user", SASLminc(-4), USERSW) \

-    X("attach file", 6, SNDATTACHSW) \
+    X("attach fieldname", 6, SNDATTACHSW) \

     X("noattach", 0, SNDNOATTACHSW) \
     X("attachformat", 7, SNDATTACHFORMAT) \
     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("noattach", 0, SNDNOATTACHSW) \
     X("attachformat", 7, SNDATTACHFORMAT) \
     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \

+    X("initialtls", TLSminc(-10), INITTLSSW) \

     X("notls", TLSminc(-5), NTLSSW) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
     X("notls", TLSminc(-5), NTLSSW) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \


@@ -1061,8 +1035,8 @@ static void
 sendit (char *sp, char **arg, char *file, int pushed)
 {
     int        vecp, n = 1;
 sendit (char *sp, char **arg, char *file, int pushed)
 {
     int        vecp, n = 1;

-    char *cp, buf[BUFSIZ], **argp;
-    char **arguments, *vec[MAXARGS];
+    char *cp, buf[BUFSIZ], **argp, *program;
+    char **arguments, *savearg[MAXARGS], **vec;

     struct stat st;
     char       *attach = NMH_ATTACH_HEADER;/* attachment header field name */
     int                attachformat = 1;       /* mhbuild format specifier for
     struct stat st;
     char       *attach = NMH_ATTACH_HEADER;/* attachment header field name */
     int                attachformat = 1;       /* mhbuild format specifier for


@@ -1074,17 +1048,17 @@ sendit (char *sp, char **arg, char *file, int pushed)
 
     /*
      * Make sure these are defined.  In particular, we need
 
     /*
      * Make sure these are defined.  In particular, we need

-     * vec[1] to be NULL, in case "arg" is NULL below.  It
-     * doesn't matter what is the value of vec[0], but we
+     * savearg[1] to be NULL, in case "arg" is NULL below.  It
+     * doesn't matter what is the value of savearg[0], but we

      * set it to NULL, to help catch "off-by-one" errors.
      */
      * set it to NULL, to help catch "off-by-one" errors.
      */

-    vec[0] = NULL;
-    vec[1] = NULL;
+    savearg[0] = NULL;
+    savearg[1] = NULL;

 
     /*
 
     /*

-     * Temporarily copy arg to vec, since the brkstring() call in
+     * Temporarily copy arg to savearg, since the brkstring() call in

      * getarguments() will wipe it out before it is merged in.
      * getarguments() will wipe it out before it is merged in.

-     * Also, we skip the first element of vec, since getarguments()
+     * Also, we skip the first element of savearg, since getarguments()

      * skips it.  Then we count the number of arguments
      * copied.  The value of "n" will be one greater than
      * this in order to simulate the standard argc/argv.
      * skips it.  Then we count the number of arguments
      * copied.  The value of "n" will be one greater than
      * this in order to simulate the standard argc/argv.


@@ -1092,17 +1066,17 @@ sendit (char *sp, char **arg, char *file, int pushed)
     if (arg) {
        char **bp;
 
     if (arg) {
        char **bp;
 

-       copyip (arg, vec+1, MAXARGS-1);
-       bp = vec+1;
+       copyip (arg, savearg+1, MAXARGS-1);
+       bp = savearg+1;

        while (*bp++)
            n++;
     }
 
     /*
        while (*bp++)
            n++;
     }
 
     /*

-     * Merge any arguments from command line (now in vec)
+     * Merge any arguments from command line (now in savearg)

      * and arguments from profile.
      */
      * and arguments from profile.
      */

-    arguments = getarguments (sp, n, vec, 1);
+    arguments = getarguments (sp, n, savearg, 1);

     argp = arguments;
 
     debugsw = 0;
     argp = arguments;
 
     debugsw = 0;


@@ -1114,18 +1088,29 @@ sendit (char *sp, char **arg, char *file, int pushed)
     annotext = NULL;
     distfile = NULL;
 
     annotext = NULL;
     distfile = NULL;
 

-    vecp = 1;                  /* we'll get the zero'th element later */
+    /*
+     * Get our initial arguments for postproc now
+     */
+
+    vec = argsplit(postproc, &program, &vecp);
+

     vec[vecp++] = "-library";
     vec[vecp++] = getcpy (m_maildir (""));
 
     if ((cp = context_find ("fileproc"))) {
     vec[vecp++] = "-library";
     vec[vecp++] = getcpy (m_maildir (""));
 
     if ((cp = context_find ("fileproc"))) {

-      vec[vecp++] = "-fileproc";
-      vec[vecp++] = cp;
+       vec[vecp++] = "-fileproc";
+       vec[vecp++] = cp;

     }
 
     if ((cp = context_find ("mhlproc"))) {
     }
 
     if ((cp = context_find ("mhlproc"))) {

-      vec[vecp++] = "-mhlproc";
-      vec[vecp++] = cp;
+       vec[vecp++] = "-mhlproc";
+       vec[vecp++] = cp;
+    }
+
+    if ((cp = context_find ("credentials"))) {
+       /* post doesn't read context so need to pass credentials. */
+       vec[vecp++] = "-credentials";
+       vec[vecp++] = cp;

     }
 
     while ((cp = *argp++)) {
     }
 
     while ((cp = *argp++)) {


@@ -1195,14 +1180,11 @@ sendit (char *sp, char **arg, char *file, int pushed)
                case NMSGDSW:
                case WATCSW:
                case NWATCSW:
                case NMSGDSW:
                case WATCSW:
                case NWATCSW:

-               case MAILSW:
-               case SAMLSW:
-               case SSNDSW:
-               case SOMLSW:

                case SNOOPSW:
                case SASLSW:
                case NOSASLSW:
                case TLSSW:
                case SNOOPSW:
                case SASLSW:
                case NOSASLSW:
                case TLSSW:

+               case INITTLSSW:

                case NTLSSW:
                    vec[vecp++] = --cp;
                    continue;
                case NTLSSW:
                    vec[vecp++] = --cp;
                    continue;


@@ -1310,10 +1292,9 @@ sendit (char *sp, char **arg, char *file, int pushed)
     if ((pushsw = pushed))
        push ();
 
     if ((pushsw = pushed))
        push ();
 

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

     closefds (3);
 
     closefds (3);
 

-    if (sendsbr (vec, vecp, file, &st, 1, attach, attachformat) == OK)
+    if (sendsbr (vec, vecp, program, file, &st, 1, attach, attachformat) == OK)

        done (0);
 }
 
        done (0);
 }
 


@@ -1326,26 +1307,25 @@ whomfile (char **arg, char *file)
 {
     pid_t pid;
     int vecp;
 {
     pid_t pid;
     int vecp;

-    char *vec[MAXARGS];
+    char **vec, *program;

 
     context_save ();   /* save the context file */
     fflush (stdout);
 
 
     context_save ();   /* save the context file */
     fflush (stdout);
 

-    switch (pid = vfork()) {
+    switch (pid = fork()) {

        case NOTOK:
            advise ("fork", "unable to");
            return 1;
 
        case OK:
        case NOTOK:
            advise ("fork", "unable to");
            return 1;
 
        case OK:

-           vecp = 0;
-           vec[vecp++] = r1bindex (whomproc, '/');
+           vec = argsplit(whomproc, &program, &vecp);

            vec[vecp++] = file;
            if (arg)
                while (*arg)
                    vec[vecp++] = *arg++;
            vec[vecp] = NULL;
 
            vec[vecp++] = file;
            if (arg)
                while (*arg)
                    vec[vecp++] = *arg++;
            vec[vecp] = NULL;
 

-           execvp (whomproc, vec);
+           execvp (program, vec);

            fprintf (stderr, "unable to exec ");
            perror (whomproc);
            _exit (-1);         /* NOTREACHED */
            fprintf (stderr, "unable to exec ");
            perror (whomproc);
            _exit (-1);         /* NOTREACHED */