X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=c19cf4fa880a6f573d364fe4bc4781a8fbeaa794;hp=45b5e2611aa0b290a46fdfa008a66bf06bc5d593;hb=869aa60129811d7b160f353892dc5956a8aaac22;hpb=337338b404931f06f0db2119c9e145e8ca5a9860 diff --git a/uip/send.c b/uip/send.c index 45b5e26..c19cf4f 100644 --- a/uip/send.c +++ b/uip/send.c @@ -1,10 +1,10 @@ /* - * send.c -- send a composed message - * - * 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. - */ +** send.c -- send a composed message +** +** 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 #include @@ -29,60 +29,26 @@ static struct swit switches[] = { { "forward", 0 }, #define NFORWSW 7 { "noforward", 0 }, -#define MIMESW 8 - { "mime", 0 }, -#define NMIMESW 9 - { "nomime", 0 }, -#define MSGDSW 10 - { "msgid", 0 }, -#define NMSGDSW 11 - { "nomsgid", 0 }, -#define PUSHSW 12 +#define PUSHSW 8 { "push", 0 }, -#define NPUSHSW 13 +#define NPUSHSW 9 { "nopush", 0 }, -#define UNIQSW 14 +#define UNIQSW 10 { "unique", -6 }, -#define NUNIQSW 15 +#define NUNIQSW 11 { "nounique", -8 }, -#define VERBSW 16 +#define VERBSW 12 { "verbose", 0 }, -#define NVERBSW 17 +#define NVERBSW 13 { "noverbose", 0 }, -#define WATCSW 18 +#define WATCSW 14 { "watch", 0 }, -#define NWATCSW 19 +#define NWATCSW 15 { "nowatch", 0 }, -#define WIDTHSW 20 - { "width columns", 0 }, -#define VERSIONSW 21 +#define VERSIONSW 16 { "version", 0 }, -#define HELPSW 22 +#define HELPSW 17 { "help", 0 }, -#define BITSTUFFSW 23 - { "dashstuffing", -12 }, -#define NBITSTUFFSW 24 - { "nodashstuffing", -14 }, -#define MAILSW 25 - { "mail", -4 }, -#define SAMLSW 26 - { "saml", -4 }, -#define SENDSW 27 - { "send", -4 }, -#define SOMLSW 28 - { "soml", -4 }, -#define CLIESW 29 - { "client host", -6 }, -#define SERVSW 30 - { "server host", 6 }, -#define SNOOPSW 31 - { "snoop", 5 }, -#define ATTACHSW 32 - { "attach", 6 }, -#define ATTACHFORMATSW 33 - { "attachformat", 7 }, -#define PORTSW 34 - { "port server-port-name/number" , 4 }, { NULL, 0 } }; @@ -99,142 +65,98 @@ extern char *distfile; int -main (int argc, char **argv) +main(int argc, char **argv) { int msgp = 0, distsw = 0, vecp = 1; - int mime = 0; int msgnum, status; char *cp, *maildir = NULL; char buf[BUFSIZ], **ap, **argp, **arguments; char *msgs[MAXARGS], *vec[MAXARGS]; struct msgs *mp; struct stat st; - char *attach = (char *)0; /* header field name for attachments */ - int attachformat = 0; /* mhbuild format specifier for attachments */ -#ifdef UCI - FILE *fp; -#endif /* UCI */ #ifdef LOCALE setlocale(LC_ALL, ""); #endif - invo_name = r1bindex (argv[0], '/'); + invo_name = mhbasename(argv[0]); /* read user profile/context */ context_read(); - arguments = getarguments (invo_name, argc, argv, 1); + arguments = getarguments(invo_name, argc, argv, 1); argp = arguments; vec[vecp++] = "-library"; - vec[vecp++] = getcpy (m_maildir ("")); + vec[vecp++] = getcpy(toabsdir("+")); while ((cp = *argp++)) { if (*cp == '-') { - switch (smatch (++cp, switches)) { - case AMBIGSW: - ambigsw (cp, switches); - done (1); - case UNKWNSW: - adios (NULL, "-%s unknown\n", cp); - - case HELPSW: - snprintf (buf, sizeof(buf), "%s [file] [switches]", invo_name); - print_help (buf, switches, 1); - done (1); - case VERSIONSW: - print_version(invo_name); - done (1); - - case PUSHSW: - pushsw++; - continue; - case NPUSHSW: - pushsw = 0; - continue; - - case UNIQSW: - unique++; - continue; - case NUNIQSW: - unique = 0; - continue; - - case FORWSW: - forwsw++; - continue; - case NFORWSW: - forwsw = 0; - continue; - - case VERBSW: - verbsw++; - vec[vecp++] = --cp; - continue; - case NVERBSW: - verbsw = 0; - vec[vecp++] = --cp; - continue; - - case MIMESW: - mime++; - vec[vecp++] = --cp; - continue; - case NMIMESW: - mime = 0; - vec[vecp++] = --cp; - continue; - - case DEBUGSW: - debugsw++; /* fall */ - case NFILTSW: - case FRMTSW: - case NFRMTSW: - case BITSTUFFSW: - case NBITSTUFFSW: - case MSGDSW: - case NMSGDSW: - case WATCSW: - case NWATCSW: - case MAILSW: - case SAMLSW: - case SENDSW: - case SOMLSW: - case SNOOPSW: - vec[vecp++] = --cp; - continue; - - case ALIASW: - case FILTSW: - case WIDTHSW: - case CLIESW: - case SERVSW: - case PORTSW: - vec[vecp++] = --cp; - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - vec[vecp++] = cp; - continue; - - case ATTACHSW: - if (!(attach = *argp++) || *attach == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - - case ATTACHFORMATSW: - if (! *argp || **argp == '-') - adios (NULL, "missing argument to %s", argp[-1]); - else { - attachformat = atoi (*argp); - if (attachformat < 0 || - attachformat > ATTACHFORMATS - 1) { - advise (NULL, "unsupported attachformat %d", - attachformat); - continue; - } - } - ++argp; - continue; + switch (smatch(++cp, switches)) { + case AMBIGSW: + ambigsw(cp, switches); + done(1); + case UNKWNSW: + adios(NULL, "-%s unknown\n", cp); + + case HELPSW: + snprintf(buf, sizeof(buf), + "%s [file] [switches]", + invo_name); + print_help(buf, switches, 1); + done(1); + case VERSIONSW: + print_version(invo_name); + done(1); + + case PUSHSW: + pushsw++; + continue; + case NPUSHSW: + pushsw = 0; + continue; + + case UNIQSW: + unique++; + continue; + case NUNIQSW: + unique = 0; + continue; + + case FORWSW: + forwsw++; + continue; + case NFORWSW: + forwsw = 0; + continue; + + case VERBSW: + verbsw++; + vec[vecp++] = --cp; + continue; + case NVERBSW: + verbsw = 0; + vec[vecp++] = --cp; + continue; + + case DEBUGSW: + debugsw++; /* fall */ + case NFILTSW: + case FRMTSW: + case NFRMTSW: + case WATCSW: + case NWATCSW: + vec[vecp++] = --cp; + continue; + + case ALIASW: + case FILTSW: + vec[vecp++] = --cp; + if (!(cp = *argp++) || *cp == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + vec[vecp++] = cp; + continue; + } } else { msgs[msgp++] = cp; @@ -242,136 +164,122 @@ main (int argc, char **argv) } /* - * check for "Aliasfile:" profile entry - */ - if ((cp = context_find ("Aliasfile"))) { + ** check for "Aliasfile:" profile entry + */ + if ((cp = context_find("Aliasfile"))) { char *dp = NULL; - for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++) { + for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; + ap++) { vec[vecp++] = "-alias"; vec[vecp++] = *ap; } } - if (!context_find ("path")) - free (path ("./", TFOLDER)); - if (!msgp) - msgs[msgp++] = "cur"; - maildir = m_maildir (draftfolder); + msgs[msgp++] = seq_cur; + maildir = toabsdir(draftfolder); - if (chdir (maildir) == NOTOK) - adios (maildir, "unable to change directory to"); + if (chdir(maildir) == NOTOK) + adios(maildir, "unable to change directory to"); /* read folder and create message structure */ - if (!(mp = folder_read (draftfolder))) - adios (NULL, "unable to read draft folder %s", draftfolder); + if (!(mp = folder_read(draftfolder))) + adios(NULL, "unable to read draft folder %s", draftfolder); /* check for empty folder */ if (mp->nummsg == 0) - adios (NULL, "no messages in draft folder %s", draftfolder); + adios(NULL, "no messages in draft folder %s", draftfolder); /* parse all the message ranges/sequences and set SELECTED */ for (msgnum = 0; msgnum < msgp; msgnum++) - if (!m_convert (mp, msgs[msgnum])) - done (1); - seq_setprev (mp); /* set the previous-sequence */ + if (!m_convert(mp, msgs[msgnum])) + done(1); + seq_setprev(mp); /* set the previous-sequence */ for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { - if (is_selected (mp, msgnum)) { - msgs[msgp++] = getcpy (m_name (msgnum)); - unset_exists (mp, msgnum); + if (is_selected(mp, msgnum)) { + msgs[msgp++] = getcpy(m_name(msgnum)); + unset_exists(mp, msgnum); } } mp->msgflags |= SEQMOD; - seq_save (mp); - - if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0) - if ((cp = context_find ("signature")) && *cp) - m_putenv ("SIGNATURE", cp); -#ifdef UCI - else { - snprintf (buf, sizeof(buf), "%s/.signature", mypath); - if ((fp = fopen (buf, "r")) != NULL - && fgets (buf, sizeof buf, fp) != NULL) { - fclose (fp); - if (cp = strchr (buf, '\n')) - *cp = 0; - m_putenv ("SIGNATURE", buf); - } - } -#endif /* UCI */ + seq_save(mp); + + if (!(cp = getenv("SIGNATURE")) || !*cp) + if ((cp = context_find("signature")) && *cp) + m_putenv("SIGNATURE", cp); for (msgnum = 0; msgnum < msgp; msgnum++) - if (stat (msgs[msgnum], &st) == NOTOK) - adios (msgs[msgnum], "unable to stat draft file"); + if (stat(msgs[msgnum], &st) == NOTOK) + adios(msgs[msgnum], "unable to stat draft file"); - if ((annotext = getenv ("mhannotate")) == NULL || *annotext == 0) + if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0) annotext = NULL; - if (annotext && ((cp = getenv ("mhinplace")) != NULL && *cp != 0)) - inplace = atoi (cp); - if ((altmsg = getenv ("mhaltmsg")) == NULL || *altmsg == 0) + if (annotext && ((cp = getenv("mhinplace")) != NULL && *cp != 0)) + inplace = atoi(cp); + if ((altmsg = getenv("mhaltmsg")) == NULL || *altmsg == 0) altmsg = NULL; /* used by dist interface - see below */ - if ((cp = getenv ("mhdist")) - && *cp - && (distsw = atoi (cp)) - && altmsg) { + if ((cp = getenv("mhdist")) && *cp && (distsw = atoi (cp)) && altmsg) { vec[vecp++] = "-dist"; - distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL)); - if (link (altmsg, distfile) == NOTOK) { + distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL)); + if (link(altmsg, distfile) == NOTOK) { if (errno != EXDEV #ifdef EISREMOTE && errno != EISREMOTE #endif /* EISREMOTE */ ) - adios (distfile, "unable to link %s to", altmsg); - free (distfile); - distfile = getcpy (m_mktemp2(NULL, invo_name, NULL, NULL)); + adios(distfile, "unable to link %s to", + altmsg); + free(distfile); + distfile = getcpy(m_mktemp2(NULL, invo_name, + NULL, NULL)); { int in, out; struct stat st; - if ((in = open (altmsg, O_RDONLY)) == NOTOK) - adios (altmsg, "unable to open"); + if ((in = open(altmsg, O_RDONLY)) == NOTOK) + adios(altmsg, "unable to open"); fstat(in, &st); - if ((out = creat (distfile, (int) st.st_mode & 0777)) == NOTOK) - adios (distfile, "unable to write"); - cpydata (in, out, altmsg, distfile); - close (in); - close (out); + if ((out = creat(distfile, + (int) st.st_mode & 0777)) + == NOTOK) + adios(distfile, "unable to write"); + cpydata(in, out, altmsg, distfile); + close(in); + close(out); } } } else { distfile = NULL; } - if (altmsg == NULL || stat (altmsg, &st) == NOTOK) { + if (altmsg == NULL || stat(altmsg, &st) == NOTOK) { st.st_mtime = 0; st.st_dev = 0; st.st_ino = 0; } if (pushsw) - push (); + push(); status = 0; - vec[0] = r1bindex (postproc, '/'); - closefds (3); + vec[0] = mhbasename(postproc); + closefds(3); for (msgnum = 0; msgnum < msgp; msgnum++) { - switch (sendsbr (vec, vecp, msgs[msgnum], &st, 1, attach, - attachformat)) { - case DONE: - done (++status); - case NOTOK: - status++; /* fall */ - case OK: - break; + switch (sendsbr(vec, vecp, msgs[msgnum], &st, 1)) { + case DONE: + done(++status); + case NOTOK: + status++; /* fall */ + case OK: + break; } } - context_save (); /* save the context file */ - done (status); + context_save(); /* save the context file */ + done(status); return 1; }