X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fshow.c;h=6c795cae4cb99cf5a2c60720781425fe8fdfa12f;hp=413daeba1328bc65bf236a8f3a5be51bac81cf69;hb=ced6090a330d3d83d0bce709f756aa3d7d65fea4;hpb=337338b404931f06f0db2119c9e145e8ca5a9860 diff --git a/uip/show.c b/uip/show.c index 413daeb..6c795ca 100644 --- a/uip/show.c +++ b/uip/show.c @@ -1,10 +1,10 @@ /* - * show.c -- show/list messages - * - * 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. - */ +** show.c -- show/list messages +** +** 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 @@ -45,8 +45,8 @@ static struct swit switches[] = { }; /* - * static prototypes - */ +** static prototypes +*/ static int is_nontext(char *); /* prototype from mhlsbr.c */ @@ -96,9 +96,7 @@ main (int argc, char **argv) continue; case HELPSW: - snprintf (buf, sizeof(buf), - "%s [+folder] %s[switches] [switches for showproc]", - invo_name, mode == SHOW ? "[msgs] ": ""); + snprintf (buf, sizeof(buf), "%s [+folder] %s[switches] [switches for showproc]", invo_name, mode == SHOW ? "[msgs] ": ""); print_help (buf, switches, 1); done (1); case VERSIONSW: @@ -167,11 +165,10 @@ usage: adios (NULL, "only one folder at a time!"); else folder = pluspath (cp); + } else if (mode != SHOW) { + goto usage; } else { - if (mode != SHOW) - goto usage; - else - msgs[msgp++] = cp; + msgs[msgp++] = cp; } } procp = vecp; @@ -187,7 +184,8 @@ usage: } #ifdef WHATNOW - if (!msgp && !folder && mode == SHOW && (cp = getenv ("mhdraft")) && *cp) { + if (!msgp && !folder && mode == SHOW && + (cp = getenv ("mhdraft")) && *cp) { vec[vecp++] = cp; goto go_to_it; } @@ -228,10 +226,10 @@ usage: done (1); /* - * Set the SELECT_UNSEEN bit for all the SELECTED messages, - * since we will use that as a tag to know which messages - * to remove from the "unseen" sequence. - */ + ** Set the SELECT_UNSEEN bit for all the SELECTED messages, + ** since we will use that as a tag to know which messages + ** to remove from the "unseen" sequence. + */ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) if (is_selected(mp, msgnum)) set_unseen (mp, msgnum); @@ -240,7 +238,8 @@ usage: seq_setunseen (mp, 1); /* unset the Unseen-Sequence */ if (mp->numsel > MAXARGS - 2) - adios (NULL, "more than %d messages for show exec", MAXARGS - 2); + adios (NULL, "more than %d messages for show exec", + MAXARGS - 2); for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) if (is_selected(mp, msgnum)) @@ -260,8 +259,8 @@ go_to_it: ; vec[vecp] = NULL; /* - * Decide which "proc" to use - */ + ** Decide which "proc" to use + */ mime = 0; if (nshow) { proc = catproc; @@ -269,8 +268,13 @@ go_to_it: ; /* check if any messages are non-text MIME messages */ if (checkmime && !getenv ("NOMHNPROC")) { if (!file) { - /* loop through selected messages and check for MIME */ - for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) + /* + ** loop through selected messages + ** and check for MIME + */ + for (msgnum = mp->lowsel; + msgnum <= mp->hghsel; + msgnum++) if (is_selected (mp, msgnum) && is_nontext (m_name (msgnum))) { mime = 1; break; @@ -293,10 +297,10 @@ go_to_it: ; m_putenv ("mhfolder", folder); /* - * For backward compatibility, if the "proc" is mhn, - * then add "-show" option. Add "-file" if showing - * file. - */ + ** For backward compatibility, if the "proc" is mhn, + ** then add "-show" option. Add "-file" if showing + ** file. + */ if (strcmp (r1bindex (proc, '/'), "mhn") == 0) { if (file) { vec[vecp] = vec[vecp - 1]; @@ -307,8 +311,7 @@ go_to_it: ; vec[vecp] = NULL; } - /* If the "proc" is "mhshow", add "-file" if showing file. - */ + /* If the "proc" is "mhshow", add "-file" if showing file. */ if (strcmp (r1bindex (proc, '/'), "mhshow") == 0 && file ) { vec[vecp] = vec[vecp - 1]; vec[vecp - 1] = "-file"; @@ -316,9 +319,9 @@ go_to_it: ; } /* - * If "proc" is mhl, then run it internally - * rather than exec'ing it. - */ + ** If "proc" is mhl, then run it internally + ** rather than exec'ing it. + */ if (strcmp (r1bindex (proc, '/'), "mhl") == 0) { vec[0] = "mhl"; mhl (vecp, vec); @@ -326,13 +329,14 @@ go_to_it: ; } /* - * If you are not using a nmh command as your "proc", then - * add the path to the message names. Currently, we are just - * checking for mhn here, since we've already taken care of mhl. - */ + ** If you are not using a nmh command as your "proc", then + ** add the path to the message names. Currently, we are just + ** checking for mhn here, since we've already taken care of mhl. + */ if (!strcmp (r1bindex (proc, '/'), "mhl") && !file - && chdir (maildir = concat (m_maildir (""), "/", NULL)) != NOTOK) { + && chdir (maildir = + concat (m_maildir (""), "/", NULL)) != NOTOK) { mp->foldpath = concat (mp->foldpath, "/", NULL); cp = ssequal (maildir, mp->foldpath) ? mp->foldpath + strlen (maildir) @@ -348,8 +352,8 @@ go_to_it: ; } /* - * Check if a message or file contains any non-text parts - */ +** Check if a message or file contains any non-text parts +*/ static int is_nontext (char *msgnam) { @@ -368,15 +372,16 @@ is_nontext (char *msgnam) case FLDPLUS: case FLDEOF: /* - * Check Content-Type field - */ + ** Check Content-Type field + */ if (!mh_strcasecmp (name, TYPE_FIELD)) { int passno; char c; cp = add (buf, NULL); while (state == FLDPLUS) { - state = m_getfld (state, name, buf, sizeof(buf), fp); + state = m_getfld (state, name, buf, + sizeof(buf), fp); cp = add (buf, cp); } bp = cp; @@ -425,13 +430,15 @@ invalid: if (!*bp) goto invalid; if (passno > 1) { - if ((result = (mh_strcasecmp (bp, "plain") != 0))) + if ((result = (mh_strcasecmp (bp, + "plain") != 0))) goto out; *dp = c; for (dp++; isspace (*dp); dp++) continue; if (*dp) { - if ((result = !uprf (dp, "charset"))) + if ((result = !uprf (dp, + "charset"))) goto out; dp += sizeof("charset") - 1; while (isspace (*dp)) @@ -474,8 +481,8 @@ out: } /* - * Check Content-Transfer-Encoding field - */ + ** Check Content-Transfer-Encoding field + */ if (!mh_strcasecmp (name, ENCODING_FIELD)) { cp = add (buf, NULL); while (state == FLDPLUS) { @@ -500,17 +507,18 @@ out: } /* - * Just skip the rest of this header - * field and go to next one. - */ + ** Just skip the rest of this header + ** field and go to next one. + */ while (state == FLDPLUS) - state = m_getfld (state, name, buf, sizeof(buf), fp); + state = m_getfld(state, name, buf, sizeof(buf), + fp); break; /* - * We've passed the message header, - * so message is just text. - */ + ** We've passed the message header, + ** so message is just text. + */ default: fclose (fp); return 0;