projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated date on sortm(1) man page.
[mmh]
/
uip
/
mhn.c
diff --git
a/uip/mhn.c
b/uip/mhn.c
index
3f2d262
..
65e78d3
100644
(file)
--- a/
uip/mhn.c
+++ b/
uip/mhn.c
@@
-2,8
+2,6
@@
/*
* mhn.c -- display, list, cache, or store the contents of MIME messages
*
/*
* mhn.c -- display, list, cache, or store the contents of MIME messages
*
- * $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.
* 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.
@@
-22,10
+20,6
@@
#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 AUTOSW 0
{ "auto", 0 },
static struct swit switches[] = {
#define AUTOSW 0
{ "auto", 0 },
@@
-126,7
+120,6
@@
static struct swit switches[] = {
/* mhparse.c */
/* mhparse.c */
-extern int checksw;
extern char *tmp; /* directory to place temp files */
/* mhcachesbr.c */
extern char *tmp; /* directory to place temp files */
/* mhcachesbr.c */
@@
-157,9
+150,6
@@
extern int userrs;
int debugsw = 0;
int verbosw = 0;
int debugsw = 0;
int verbosw = 0;
-/* The list of top-level contents to display */
-CT *cts = NULL;
-
/*
* variables for mhbuild (mhn -build)
*/
/*
* variables for mhbuild (mhn -build)
*/
@@
-183,7
+173,6
@@
CT parse_mime (char *);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
-void set_endian (void);
void flush_errors (void);
/* mhshowsbr.c */
void flush_errors (void);
/* mhshowsbr.c */
@@
-200,12
+189,13
@@
void cache_all_messages (CT *);
/* mhfree.c */
void free_content (CT);
/* mhfree.c */
void free_content (CT);
+extern CT *cts;
+void freects_done (int) NORETURN;
/*
* static prototypes
*/
/*
* static prototypes
*/
-static RETSIGTYPE pipeser (int);
-static int freectp_done (int);
+static void pipeser (int);
int
int
@@
-221,7
+211,7
@@
main (int argc, char **argv)
CT ct, *ctp;
FILE *fp;
CT ct, *ctp;
FILE *fp;
- done=freectp_done;
+ done=freects_done;
#ifdef LOCALE
setlocale(LC_ALL, "");
#ifdef LOCALE
setlocale(LC_ALL, "");
@@
-250,10
+240,10
@@
main (int argc, char **argv)
snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
invo_name);
print_help (buf, switches, 1);
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);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case AUTOSW:
autosw++;
case AUTOSW:
autosw++;
@@
-439,14
+429,6
@@
do_cache:
parts[npart] = NULL;
types[ntype] = NULL;
parts[npart] = NULL;
types[ntype] = NULL;
- set_endian ();
-
- if ((cp = getenv ("MM_NOASK")) && !strcmp (cp, "1")) {
- nolist = 1;
- listsw = 0;
- pausesw = 0;
- }
-
/*
* Check if we've specified an additional profile
*/
/*
* Check if we've specified an additional profile
*/
@@
-572,7
+554,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 {
/*
@@
-688,11
+670,12
@@
do_cache:
context_save (); /* save the context file */
}
context_save (); /* save the context file */
}
- return done (0);
+ done (0);
+ return 1;
}
}
-static RETSIGTYPE
+static void
pipeser (int i)
{
if (i == SIGQUIT) {
pipeser (int i)
{
if (i == SIGQUIT) {
@@
-705,17
+688,3
@@
pipeser (int i)
done (1);
/* NOTREACHED */
}
done (1);
/* NOTREACHED */
}
-
-
-static int
-freectp_done (int status)
-{
- CT *ctp;
-
- if ((ctp = cts))
- for (; *ctp; ctp++)
- free_content (*ctp);
-
- exit (status);
- return 1; /* dead code to satisfy the compiler */
-}