X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhmail.c;h=f9e7fcd8aed6259cf511e012850bd43f672f1aad;hp=037246ddeb68c60c4919832b3d8f627011a19f41;hb=ffe93d6dc707aaf92529cefb38a1814956b48c9e;hpb=240013872c392fe644bd4f79382d9f5314b4ea60 diff --git a/uip/mhmail.c b/uip/mhmail.c index 037246d..f9e7fcd 100644 --- a/uip/mhmail.c +++ b/uip/mhmail.c @@ -72,46 +72,51 @@ main(int argc, char **argv) while ((cp = *argp++)) { if (*cp == '-') { switch (smatch(++cp, switches)) { - case AMBIGSW: - ambigsw(cp, switches); - done(1); - case UNKWNSW: - adios(NULL, "-%s unknown", cp); - - case HELPSW: - snprintf(buf, sizeof(buf), "%s [addrs ... [switches]]", invo_name); - print_help(buf, switches, 0); - done(1); - case VERSIONSW: - print_version(invo_name); - done(1); - - case FROMSW: - if (!(from = *argp++) || *from == '-') - adios(NULL, "missing argument to %s", argp[-2]); - continue; - - case BODYSW: - if (!(body = *argp++) || *body == '-') - adios(NULL, "missing argument to %s", argp[-2]); - continue; - - case CCSW: - iscc++; - continue; - - case SUBJSW: - if (!(subject = *argp++) || *subject == '-') - adios(NULL, "missing argument to %s", argp[-2]); - continue; - - case RESNDSW: - resent++; - continue; - - case QUEUESW: - queued++; - continue; + case AMBIGSW: + ambigsw(cp, switches); + done(1); + case UNKWNSW: + adios(NULL, "-%s unknown", cp); + + case HELPSW: + snprintf(buf, sizeof(buf), + "%s [addrs ... [switches]]", + invo_name); + print_help(buf, switches, 0); + done(1); + case VERSIONSW: + print_version(invo_name); + done(1); + + case FROMSW: + if (!(from = *argp++) || *from == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + continue; + + case BODYSW: + if (!(body = *argp++) || *body == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + continue; + + case CCSW: + iscc++; + continue; + + case SUBJSW: + if (!(subject = *argp++) || *subject == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + continue; + + case RESNDSW: + resent++; + continue; + + case QUEUESW: + queued++; + continue; } } if (iscc) @@ -125,7 +130,7 @@ main(int argc, char **argv) if (tolist == NULL) adios(NULL, "usage: %s addrs ... [switches]", invo_name); - tfile = m_mktemp2(NULL, invo_name, NULL, &out); + tfile = m_mktemp2("/tmp/", invo_name, NULL, &out); if (tfile == NULL) adios("mhmail", "unable to create temporary file"); chmod(tfile, 0600); @@ -135,7 +140,7 @@ main(int argc, char **argv) fprintf(out, "%sTo: %s\n", resent ? "Resent-" : "", tolist); if (cclist) - fprintf(out, "%scc: %s\n", resent ? "Resent-" : "", cclist); + fprintf(out, "%sCc: %s\n", resent ? "Resent-" : "", cclist); if (subject) fprintf(out, "%sSubject: %s\n", resent ? "Resent-" : "", subject); if (from)