X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmshcmds.c;h=0190beecfca8df52159fad315a1503d02ea23afa;hp=427bff60c96deabdd2caa1d731a74d0ede452cd7;hb=5dd6771b28c257af405d7248639ed0e3bcdce38b;hpb=794dab6aa5027ffaf024506140c258f6a0a9322d diff --git a/uip/mshcmds.c b/uip/mshcmds.c index 427bff6..0190bee 100644 --- a/uip/mshcmds.c +++ b/uip/mshcmds.c @@ -2,7 +2,9 @@ /* * mshcmds.c -- command handlers in msh * - * $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 @@ -10,15 +12,15 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include +#include -extern int errno; static char delim3[] = "-------"; /* from burst.c */ @@ -68,6 +70,8 @@ static int process (int, char *, int, char **); static void copy_message (int, FILE *); static void copy_digest (int, FILE *); +/* from mhlsbr.c */ +int mhlsbr (int, char **, FILE *(*)()); void forkcmd (char **args, char *pgm) @@ -137,7 +141,7 @@ static struct swit distswit[] = { #define DINWTSW 11 { "nowhatnowproc", 0 }, #define DIHELP 12 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -238,7 +242,7 @@ static struct swit explswit[] = { #define EXNVBSW 5 { "noverbose", 0 }, #define EXHELP 6 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -467,7 +471,7 @@ static struct swit fileswit[] = { #define FINPRC 8 { "normmproc", 0 }, #define FIHELP 9 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -587,7 +591,7 @@ filehak (char **args) if (cwd == NULL) cwd = getcpy (pwd ()); chdir (m_maildir ("")); - cp = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF); + cp = pluspath (cp); if (access (m_maildir (cp), F_OK) == NOTOK) result = OK; free (cp); @@ -631,7 +635,7 @@ static struct swit foldswit[] = { #define FLLISW 14 { "list", 0 }, #define FLHELP 15 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -697,7 +701,7 @@ foldcmd (char **args) return; } else - folder = fmsh ? path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF) + folder = fmsh ? pluspath (cp) : cp + 1; } else @@ -850,7 +854,7 @@ static struct swit forwswit[] = { #define FONWTSW 16 { "nowhatnow", 0 }, #define FOHELP 17 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -861,6 +865,8 @@ forwcmd (char **args) int msgp = 0, vecp = 1, msgnum; char *cp, *filter = NULL, buf[BUFSIZ]; char *msgs[MAXARGS], *vec[MAXARGS]; + char *tfile = NULL; + char tmpfil[BUFSIZ]; if (fmsh) { forkcmd (args, cmd_name); @@ -933,11 +939,12 @@ forwcmd (char **args) /* foil search of .mh_profile */ snprintf (buf, sizeof(buf), "%sXXXXXX", invo_name); -#ifdef HAVE_MKSTEMP - vec[0] = (char *)mkstemp (buf); -#else - vec[0] = (char *)mktemp (buf); -#endif + + tfile = m_mktemp(buf, NULL, NULL); + if (tfile == NULL) adios("forwcmd", "unable to create temporary file"); + strncpy (tmpfil, tfile, sizeof(tmpfil)); + vec[0] = tmpfil; + vec[vecp++] = "-file"; vec[vecp] = NULL; if (!msgp) @@ -968,10 +975,14 @@ static void forw (char *proc, char *filter, int vecp, char **vec) { int i, child_id, msgnum, msgcnt; - char tmpfil[80], *args[MAXARGS]; + char tmpfil[BUFSIZ], *args[MAXARGS]; FILE *out; + char *tfile = NULL; + + tfile = m_mktemp2(NULL, invo_name, NULL, NULL); + if (tfile == NULL) adios("forw", "unable to create temporary file"); + strncpy (tmpfil, tfile, sizeof(tmpfil)); - strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil)); interrupted = 0; if (filter) switch (child_id = fork ()) { @@ -1113,7 +1124,7 @@ static struct swit markswit[] = { #define MNZERSW 7 { "nozero", 0 }, #define MHELP 8 - { "help", 4 }, + { "help", 0 }, #define MDBUGSW 9 { "debug", -5 }, { NULL, 0 } @@ -1332,7 +1343,7 @@ static struct swit mhnswit[] = { #define MHNNVERBSW 23 { "noverbose", 0 }, #define MHNHELPSW 24 - { "help", 4 }, + { "help", 0 }, #define MHNPROGSW 25 { "moreproc program", -4 }, #define MHNNPROGSW 26 @@ -1447,11 +1458,11 @@ static struct swit packswit[] = { #define PAFISW 0 { "file name", 0 }, #define PAHELP 1 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; -static mbx_style = MMDF_FORMAT; +static int mbx_style = MMDF_FORMAT; void packcmd (char **args) @@ -1625,7 +1636,7 @@ static struct swit pickswit[] = { #define PINLISW 21 { "nolist", 0 }, #define PIHELP 22 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -1812,7 +1823,7 @@ static struct swit replswit[] = { #define REWIDSW 19 { "width columns", 0 }, #define REHELP 20 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -1908,7 +1919,7 @@ replcmd (char **args) static struct swit rmmswit[] = { #define RMHELP 0 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -2037,7 +2048,7 @@ static struct swit scanswit[] = { #define SCWID 6 { "width columns", 0 }, #define SCHELP 7 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -2150,8 +2161,7 @@ scancmd (char **args) if (*dp == '\\' || *dp == '"' || *dp == '\n') i++; i++; - if ((ep = malloc ((unsigned) i)) == NULL) - adios (NULL, "out of memory"); + ep = mh_xmalloc ((unsigned) i); for (dp = nfs, fp = ep; *dp; dp++) { if (*dp == '\n') { *fp++ = '\\', *fp++ = 'n'; @@ -2287,7 +2297,7 @@ static struct swit showswit[] = { #define SHNHEAD 9 { "noheader", 3 }, #define SHHELP 10 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -2300,10 +2310,10 @@ showcmd (char **args) char *cp, *proc = showproc, buf[BUFSIZ]; char *msgs[MAXARGS], *vec[MAXARGS]; - if (!strcasecmp (cmd_name, "next")) + if (!mh_strcasecmp (cmd_name, "next")) mode = 1; else - if (!strcasecmp (cmd_name, "prev")) + if (!mh_strcasecmp (cmd_name, "prev")) mode = -1; while ((cp = *args++)) { if (*cp == '-') @@ -2380,7 +2390,6 @@ showcmd (char **args) for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) if (is_selected (mp, msgnum) && is_nontext (msgnum)) { proc = showmimeproc; - vec[vecp++] = "-show"; vec[vecp++] = "-file"; vec[vecp] = NULL; goto finish; @@ -2538,7 +2547,8 @@ static int is_nontext (int msgnum) { int result, state; - char *bp, *cp, *dp; + unsigned char *bp, *dp; + char *cp; char buf[BUFSIZ], name[NAMESZ]; FILE *fp; @@ -2556,7 +2566,7 @@ is_nontext (int msgnum) /* * Check Content-Type field */ - if (!strcasecmp (name, TYPE_FIELD)) { + if (!mh_strcasecmp (name, TYPE_FIELD)) { int passno; char c; @@ -2611,7 +2621,7 @@ invalid: if (!*bp) goto invalid; if (passno > 1) { - if ((result = (strcasecmp (bp, "plain") != 0))) + if ((result = (mh_strcasecmp (bp, "plain") != 0))) goto out; *dp = c; for (dp++; isspace (*dp); dp++) @@ -2643,7 +2653,7 @@ invalid: /* Check the character set */ result = !check_charset (dp, strlen (dp)); } else { - if (!(result = (strcasecmp (bp, "text") != 0))) { + if (!(result = (mh_strcasecmp (bp, "text") != 0))) { *dp = c; bp = dp; passno = 2; @@ -2662,7 +2672,7 @@ out: /* * Check Content-Transfer-Encoding field */ - if (!strcasecmp (name, ENCODING_FIELD)) { + if (!mh_strcasecmp (name, ENCODING_FIELD)) { cp = add (buf, NULL); while (state == FLDPLUS) { state = m_getfld (state, name, buf, sizeof buf, fp); @@ -2673,9 +2683,9 @@ out: for (dp = bp; istoken (*dp); dp++) continue; *dp = '\0'; - result = (strcasecmp (bp, "7bit") - && strcasecmp (bp, "8bit") - && strcasecmp (bp, "binary")); + result = (mh_strcasecmp (bp, "7bit") + && mh_strcasecmp (bp, "8bit") + && mh_strcasecmp (bp, "binary")); free (cp); if (result) { @@ -2719,7 +2729,7 @@ static struct swit sortswit[] = { #define SONVERB 6 { "noverbose", 0 }, #define SOHELP 7 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -2859,7 +2869,7 @@ get_fields (char *datesw, char *subjsw, int msgnum, struct Msg *msgp) case FLD: case FLDEOF: case FLDPLUS: - if (!strcasecmp (name, datesw)) { + if (!mh_strcasecmp (name, datesw)) { bp = getcpy (buf); while (state == FLDPLUS) { state = m_getfld (state, name, buf, sizeof buf, zp); @@ -2876,7 +2886,7 @@ get_fields (char *datesw, char *subjsw, int msgnum, struct Msg *msgp) break; /* all done! */ gotdate++; } - else if (subjsw && !strcasecmp(name, subjsw)) { + else if (subjsw && !mh_strcasecmp(name, subjsw)) { bp = getcpy (buf); while (state == FLDPLUS) { state = m_getfld (state, name, buf, sizeof buf, zp); @@ -2951,12 +2961,13 @@ subsort (struct Msg *a, struct Msg *b) static char * sosmash (char *subj, char *s) { - register char *cp, *dp, c; + register char *cp, *dp; + register unsigned char c; if (s) { cp = s; dp = s; /* dst pointer */ - if (!strcasecmp (subj, "subject")) + if (!mh_strcasecmp (subj, "subject")) while ((c = *cp)) { if (! isspace(c)) { if(uprf(cp, "re:")) @@ -2984,8 +2995,9 @@ static int process (int msgnum, char *proc, int vecp, char **vec) { int child_id, status; - char tmpfil[80]; + char tmpfil[BUFSIZ]; FILE *out; + char *cp; if (fmsh) { strncpy (tmpfil, m_name (msgnum), sizeof(tmpfil)); @@ -2996,24 +3008,20 @@ process (int msgnum, char *proc, int vecp, char **vec) goto ready; } - strncpy (tmpfil, m_scratch ("", invo_name), sizeof(tmpfil)); - if ((out = fopen (tmpfil, "w")) == NULL) { - int olderr; - extern int errno; - char newfil[80]; - - olderr = errno; - strncpy (newfil, m_tmpfil (invo_name), sizeof(newfil)); - if ((out = fopen (newfil, "w")) == NULL) { + cp = m_mktemp(invo_name, NULL, &out); + if (cp == NULL) { + /* Try again, but try to create under /tmp */ + int olderr = errno; + cp = m_mktemp2(NULL, invo_name, NULL, &out); + if (cp == NULL) { errno = olderr; - advise (tmpfil, "unable to create temporary file"); + advise (NULL, "unable to create temporary file"); return NOTOK; - } else { - strncpy (tmpfil, newfil, sizeof(tmpfil)); } } copy_message (msgnum, out); fclose (out); + strncpy(tmpfil, cp, sizeof(tmpfil)); ready: ; fflush (stdout); @@ -3079,7 +3087,7 @@ static void copy_digest (int msgnum, FILE *out) { char c; - long pos; + long pos = 0L; static char buffer[BUFSIZ]; register FILE *zp;