X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmshcmds.c;h=147a261b960f5a3230d3d3b11fc8463406bf43f9;hp=13ad35622c3f5136baa8f6d45efbfbc9f54ae838;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=8563731b02ce9d750806f6b1769af8b399d964e8 diff --git a/uip/mshcmds.c b/uip/mshcmds.c index 13ad356..147a261 100644 --- a/uip/mshcmds.c +++ b/uip/mshcmds.c @@ -3,6 +3,10 @@ * 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 +14,15 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include +#include -extern int errno; static char delim3[] = "-------"; /* from burst.c */ @@ -139,7 +143,7 @@ static struct swit distswit[] = { #define DINWTSW 11 { "nowhatnowproc", 0 }, #define DIHELP 12 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -240,7 +244,7 @@ static struct swit explswit[] = { #define EXNVBSW 5 { "noverbose", 0 }, #define EXHELP 6 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -469,7 +473,7 @@ static struct swit fileswit[] = { #define FINPRC 8 { "normmproc", 0 }, #define FIHELP 9 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -589,7 +593,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); @@ -633,7 +637,7 @@ static struct swit foldswit[] = { #define FLLISW 14 { "list", 0 }, #define FLHELP 15 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -699,7 +703,7 @@ foldcmd (char **args) return; } else - folder = fmsh ? path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF) + folder = fmsh ? pluspath (cp) : cp + 1; } else @@ -852,7 +856,7 @@ static struct swit forwswit[] = { #define FONWTSW 16 { "nowhatnow", 0 }, #define FOHELP 17 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -1120,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 } @@ -1339,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 @@ -1454,7 +1458,7 @@ static struct swit packswit[] = { #define PAFISW 0 { "file name", 0 }, #define PAHELP 1 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -1632,7 +1636,7 @@ static struct swit pickswit[] = { #define PINLISW 21 { "nolist", 0 }, #define PIHELP 22 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -1819,7 +1823,7 @@ static struct swit replswit[] = { #define REWIDSW 19 { "width columns", 0 }, #define REHELP 20 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -1915,7 +1919,7 @@ replcmd (char **args) static struct swit rmmswit[] = { #define RMHELP 0 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -2044,7 +2048,7 @@ static struct swit scanswit[] = { #define SCWID 6 { "width columns", 0 }, #define SCHELP 7 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -2157,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'; @@ -2294,7 +2297,7 @@ static struct swit showswit[] = { #define SHNHEAD 9 { "noheader", 3 }, #define SHHELP 10 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -2307,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 == '-') @@ -2387,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; @@ -2545,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; @@ -2563,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; @@ -2618,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++) @@ -2650,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; @@ -2669,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); @@ -2680,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) { @@ -2726,7 +2729,7 @@ static struct swit sortswit[] = { #define SONVERB 6 { "noverbose", 0 }, #define SOHELP 7 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -2866,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); @@ -2883,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); @@ -2958,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:")) @@ -3006,7 +3010,6 @@ process (int msgnum, char *proc, int vecp, char **vec) strncpy (tmpfil, m_scratch ("", invo_name), sizeof(tmpfil)); if ((out = fopen (tmpfil, "w")) == NULL) { int olderr; - extern int errno; char newfil[80]; olderr = errno;