projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't display multipart/parallel in parallel. Always serialize displaying.
[mmh]
/
uip
/
mhshow.c
diff --git
a/uip/mhshow.c
b/uip/mhshow.c
index
0baf198
..
6e694c4
100644
(file)
--- a/
uip/mhshow.c
+++ b/
uip/mhshow.c
@@
-18,52
+18,32
@@
#include <h/mhcachesbr.h>
#include <h/utils.h>
#include <h/mhcachesbr.h>
#include <h/utils.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
static struct swit switches[] = {
#define CHECKSW 0
{ "check", 0 },
#define NCHECKSW 1
{ "nocheck", 0 },
static struct swit switches[] = {
#define CHECKSW 0
{ "check", 0 },
#define NCHECKSW 1
{ "nocheck", 0 },
-#define SERIALSW 2
- { "serialonly", 0 },
-#define NSERIALSW 3
- { "noserialonly", 0 },
-#define VERBSW 4
+#define VERBSW 2
{ "verbose", 0 },
{ "verbose", 0 },
-#define NVERBSW 5
+#define NVERBSW 3
{ "noverbose", 0 },
{ "noverbose", 0 },
-#define FILESW 6 /* interface from show */
+#define FILESW 4 /* interface from show */
{ "file file", 0 },
{ "file file", 0 },
-#define FORMSW 7
+#define FORMSW 5
{ "form formfile", 0 },
{ "form formfile", 0 },
-#define PARTSW 8
+#define PARTSW 6
{ "part number", 0 },
{ "part number", 0 },
-#define TYPESW 9
+#define TYPESW 7
{ "type content", 0 },
{ "type content", 0 },
-#define RCACHESW 10
+#define RCACHESW 8
{ "rcache policy", 0 },
{ "rcache policy", 0 },
-#define WCACHESW 11
+#define WCACHESW 9
{ "wcache policy", 0 },
{ "wcache policy", 0 },
-#define VERSIONSW 12
+#define VERSIONSW 10
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 13
+#define HELPSW 11
{ "help", 0 },
{ "help", 0 },
-/*
-** switches for moreproc/mhlproc
-*/
-#define PROGSW 14
- { "moreproc program", -4 },
-#define LENSW 15
- { "length lines", -4 },
-#define WIDTHSW 16
- { "width columns", -4 },
-/*
-** switches for debugging
-*/
-#define DEBUGSW 17
+#define DEBUGSW 12
{ "debug", -5 },
{ NULL, 0 }
};
{ "debug", -5 },
{ NULL, 0 }
};
@@
-79,8
+59,6
@@
extern char *cache_public;
extern char *cache_private;
/* mhshowsbr.c */
extern char *cache_private;
/* mhshowsbr.c */
-extern int serialsw;
-extern char *progsw;
extern int nolist;
extern char *formsw;
extern int nolist;
extern char *formsw;
@@
-116,7
+94,7
@@
void freects_done(int) NORETURN;
/*
** static prototypes
*/
/*
** static prototypes
*/
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
int
int
@@
-191,13
+169,6
@@
do_cache:
checksw = 0;
continue;
checksw = 0;
continue;
- case SERIALSW:
- serialsw = 1;
- continue;
- case NSERIALSW:
- serialsw = 0;
- continue;
-
case PARTSW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
case PARTSW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
@@
-232,22
+203,6
@@
do_cache:
formsw = getcpy(etcpath(cp));
continue;
formsw = getcpy(etcpath(cp));
continue;
- /*
- ** Switches for moreproc/mhlproc
- */
- case PROGSW:
- if (!(progsw = *argp++) || *progsw == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- continue;
-
- case LENSW:
- case WIDTHSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- continue;
-
case VERBSW:
verbosw = 1;
continue;
case VERBSW:
verbosw = 1;
continue;
@@
-329,7
+284,7
@@
do_cache:
adios(NULL, "out of memory");
ctp = cts;
adios(NULL, "out of memory");
ctp = cts;
- if ((ct = parse_mime(file)));
+ if ((ct = parse_mime(file)))
*ctp++ = ct;
} else {
/*
*ctp++ = ct;
} else {
/*
@@
-435,7
+390,7
@@
do_cache:
}
}
-static RETSIGTYPE
+static void
pipeser(int i)
{
if (i == SIGQUIT) {
pipeser(int i)
{
if (i == SIGQUIT) {