projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the -nomoreproc switch from mhl, show, mhshow.
[mmh]
/
uip
/
mhshow.c
diff --git
a/uip/mhshow.c
b/uip/mhshow.c
index
3510120
..
0baf198
100644
(file)
--- a/
uip/mhshow.c
+++ b/
uip/mhshow.c
@@
-12,7
+12,6
@@
#include <h/md5.h>
#include <errno.h>
#include <signal.h>
#include <h/md5.h>
#include <errno.h>
#include <signal.h>
-#include <h/mts.h>
#include <h/tws.h>
#include <h/mime.h>
#include <h/mhparse.h>
#include <h/tws.h>
#include <h/mime.h>
#include <h/mhparse.h>
@@
-28,51
+27,43
@@
static struct swit switches[] = {
{ "check", 0 },
#define NCHECKSW 1
{ "nocheck", 0 },
{ "check", 0 },
#define NCHECKSW 1
{ "nocheck", 0 },
-#define PAUSESW 2
- { "pause", 0 },
-#define NPAUSESW 3
- { "nopause", 0 },
-#define SERIALSW 4
+#define SERIALSW 2
{ "serialonly", 0 },
{ "serialonly", 0 },
-#define NSERIALSW 5
+#define NSERIALSW 3
{ "noserialonly", 0 },
{ "noserialonly", 0 },
-#define VERBSW 6
+#define VERBSW 4
{ "verbose", 0 },
{ "verbose", 0 },
-#define NVERBSW 7
+#define NVERBSW 5
{ "noverbose", 0 },
{ "noverbose", 0 },
-#define FILESW 8 /* interface from show */
+#define FILESW 6 /* interface from show */
{ "file file", 0 },
{ "file file", 0 },
-#define FORMSW 9
+#define FORMSW 7
{ "form formfile", 0 },
{ "form formfile", 0 },
-#define PARTSW 10
+#define PARTSW 8
{ "part number", 0 },
{ "part number", 0 },
-#define TYPESW 11
+#define TYPESW 9
{ "type content", 0 },
{ "type content", 0 },
-#define RCACHESW 12
+#define RCACHESW 10
{ "rcache policy", 0 },
{ "rcache policy", 0 },
-#define WCACHESW 13
+#define WCACHESW 11
{ "wcache policy", 0 },
{ "wcache policy", 0 },
-#define VERSIONSW 14
+#define VERSIONSW 12
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 15
+#define HELPSW 13
{ "help", 0 },
{ "help", 0 },
-
/*
** switches for moreproc/mhlproc
*/
/*
** switches for moreproc/mhlproc
*/
-#define PROGSW 16
+#define PROGSW 14
{ "moreproc program", -4 },
{ "moreproc program", -4 },
-#define NPROGSW 17
- { "nomoreproc", -3 },
-#define LENSW 18
+#define LENSW 15
{ "length lines", -4 },
{ "length lines", -4 },
-#define WIDTHSW 19
+#define WIDTHSW 16
{ "width columns", -4 },
{ "width columns", -4 },
-
/*
** switches for debugging
*/
/*
** switches for debugging
*/
-#define DEBUGSW 20
+#define DEBUGSW 17
{ "debug", -5 },
{ NULL, 0 }
};
{ "debug", -5 },
{ NULL, 0 }
};
@@
-88,11
+79,9
@@
extern char *cache_public;
extern char *cache_private;
/* mhshowsbr.c */
extern char *cache_private;
/* mhshowsbr.c */
-extern int pausesw;
extern int serialsw;
extern char *progsw;
extern int nolist;
extern int serialsw;
extern char *progsw;
extern int nolist;
-extern int nomore; /* flags for moreproc/header display */
extern char *formsw;
/* mhmisc.c */
extern char *formsw;
/* mhmisc.c */
@@
-202,13
+191,6
@@
do_cache:
checksw = 0;
continue;
checksw = 0;
continue;
- case PAUSESW:
- pausesw = 1;
- continue;
- case NPAUSESW:
- pausesw = 0;
- continue;
-
case SERIALSW:
serialsw = 1;
continue;
case SERIALSW:
serialsw = 1;
continue;
@@
-258,9
+240,6
@@
do_cache:
adios(NULL, "missing argument to %s",
argp[-2]);
continue;
adios(NULL, "missing argument to %s",
argp[-2]);
continue;
- case NPROGSW:
- nomore++;
- continue;
case LENSW:
case WIDTHSW:
case LENSW:
case WIDTHSW:
@@
-295,9
+274,8
@@
do_cache:
set_endian();
set_endian();
- if ((cp = getenv("MM_NOASK")) && !strcmp(cp, "1")) {
+ if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0) {
nolist = 1;
nolist = 1;
- pausesw = 0;
}
/*
}
/*
@@
-358,7
+336,7
@@
do_cache:
** message(s) are coming from a folder
*/
if (!msgs.size)
** message(s) are coming from a folder
*/
if (!msgs.size)
- app_msgarg(&msgs, "cur");
+ app_msgarg(&msgs, seq_cur);
if (!folder)
folder = getcurfol();
maildir = toabsdir(folder);
if (!folder)
folder = getcurfol();
maildir = toabsdir(folder);
@@
-389,7
+367,7
@@
do_cache:
set_unseen(mp, msgnum);
seq_setprev(mp); /* set the Previous-Sequence */
set_unseen(mp, msgnum);
seq_setprev(mp); /* set the Previous-Sequence */
- seq_setunseen(mp, 1); /* unset the Unseen-Sequence */
+ seq_setunseen(mp, 0); /* unset unseen seqs for shown msgs */
if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
sizeof(*cts))))
if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
sizeof(*cts))))
@@
-446,8
+424,8
@@
do_cache:
/* If reading from a folder, do some updating */
if (mp) {
/* 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 */
+ context_replace(curfolder, folder); /* update current folder */
+ seq_setcur(mp, mp->hghsel); /* update current message */
seq_save(mp); /* synchronize sequences */
context_save(); /* save the context file */
}
seq_save(mp); /* synchronize sequences */
context_save(); /* save the context file */
}