projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaned up uip/mhmail. Added chmod +x of spost in configure.ac.
[mmh]
/
uip
/
mhlist.c
diff --git
a/uip/mhlist.c
b/uip/mhlist.c
index
b130cf1
..
021a4b2
100644
(file)
--- a/
uip/mhlist.c
+++ b/
uip/mhlist.c
@@
-2,8
+2,6
@@
/*
* mhlist.c -- list the contents of MIME messages
*
/*
* mhlist.c -- list 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 CHECKSW 0
{ "check", 0 },
static struct swit switches[] = {
#define CHECKSW 0
{ "check", 0 },
@@
-68,7
+62,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 */
@@
-93,9
+86,6
@@
pid_t xpid = 0;
int debugsw = 0;
int verbosw = 0;
int debugsw = 0;
int verbosw = 0;
-/* The list of top-level contents to display */
-CT *cts = NULL;
-
#define quitser pipeser
/* mhparse.c */
#define quitser pipeser
/* mhparse.c */
@@
-104,7
+94,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);
/* mhlistsbr.c */
void flush_errors (void);
/* mhlistsbr.c */
@@
-112,11
+101,13
@@
void list_all_messages (CT *, int, int, int, int);
/* 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 void pipeser (int);
int
int
@@
-131,6
+122,8
@@
main (int argc, char **argv)
struct msgs *mp = NULL;
CT ct, *ctp;
struct msgs *mp = NULL;
CT ct, *ctp;
+ done=freects_done;
+
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
@@
-158,10
+151,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 RCACHESW:
icachesw = &rcachesw;
case RCACHESW:
icachesw = &rcachesw;
@@
-242,7
+235,7
@@
do_cache:
if (folder)
adios (NULL, "only one folder at a time!");
else
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
} else
app_msgarg(&msgs, cp);
}
@@
-251,8
+244,6
@@
do_cache:
parts[npart] = NULL;
types[ntype] = NULL;
parts[npart] = NULL;
types[ntype] = NULL;
- set_endian ();
-
/* Check for public cache location */
if ((cache_public = context_find (nmhcache)) && *cache_public != '/')
cache_public = NULL;
/* Check for public cache location */
if ((cache_public = context_find (nmhcache)) && *cache_public != '/')
cache_public = NULL;
@@
-286,7
+277,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 {
/*
@@
-372,11
+363,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) {
@@
-389,17
+381,3
@@
pipeser (int i)
done (1);
/* NOTREACHED */
}
done (1);
/* NOTREACHED */
}
-
-
-int
-done (int status)
-{
- CT *ctp;
-
- if ((ctp = cts))
- for (; *ctp; ctp++)
- free_content (*ctp);
-
- exit (status);
- return 1; /* dead code to satisfy the compiler */
-}