X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshow.c;h=993477bb6c8e23b9cc97de7925c70440e933d760;hb=e69044f7624abe5cb2cb796d528c0cc5f29515f7;hp=191eeff84961bb2b4fb2f9d63e664d9c57bb0a73;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh diff --git a/uip/mhshow.c b/uip/mhshow.c index 191eeff..993477b 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -20,10 +20,6 @@ #include #include -#ifdef HAVE_SYS_WAIT_H -# include -#endif - static struct swit switches[] = { #define CHECKSW 0 { "check", 0 }, @@ -114,7 +110,6 @@ CT parse_mime (char *); /* mhmisc.c */ int part_ok (CT, int); int type_ok (CT, int); -void set_endian (void); void flush_errors (void); /* mhshowsbr.c */ @@ -128,7 +123,7 @@ void freects_done (int) NORETURN; /* * static prototypes */ -static RETSIGTYPE pipeser (int); +static void pipeser (int); int @@ -172,10 +167,10 @@ main (int argc, char **argv) snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); print_help (buf, switches, 1); - done (1); + done (0); case VERSIONSW: print_version(invo_name); - done (1); + done (0); case RCACHESW: icachesw = &rcachesw; @@ -290,13 +285,6 @@ do_cache: parts[npart] = NULL; types[ntype] = NULL; - set_endian (); - - if ((cp = getenv ("MM_NOASK")) && !strcmp (cp, "1")) { - nolist = 1; - pausesw = 0; - } - /* * Check if we've specified an additional profile */ @@ -350,7 +338,7 @@ do_cache: adios (NULL, "out of memory"); ctp = cts; - if ((ct = parse_mime (file))); + if ((ct = parse_mime (file))) *ctp++ = ct; } else { /* @@ -430,6 +418,14 @@ do_cache: } } + /* If reading from a folder, do some updating */ + if (mp) { + context_replace (pfolder, folder);/* update current folder */ + seq_setcur (mp, mp->hghsel); /* update current message */ + seq_save (mp); /* synchronize sequences */ + context_save (); /* save the context file */ + } + /* * Show the message content */ @@ -442,20 +438,12 @@ do_cache: free ((char *) cts); cts = NULL; - /* If reading from a folder, do some updating */ - if (mp) { - context_replace (pfolder, folder);/* update current folder */ - seq_setcur (mp, mp->hghsel); /* update current message */ - seq_save (mp); /* synchronize sequences */ - context_save (); /* save the context file */ - } - done (0); return 1; } -static RETSIGTYPE +static void pipeser (int i) { if (i == SIGQUIT) {