projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If post or send fail, exit with their exit status.
[mmh]
/
uip
/
packf.c
diff --git
a/uip/packf.c
b/uip/packf.c
index
e074505
..
cd003dd
100644
(file)
--- a/
uip/packf.c
+++ b/
uip/packf.c
@@
-2,8
+2,6
@@
/*
* packf.c -- pack a nmh folder into a file
*
/*
* packf.c -- pack a nmh folder into a file
*
- * $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.
@@
-33,6
+31,8
@@
static int md = NOTOK;
static int mbx_style = MBOX_FORMAT;
static int mapping = 0;
static int mbx_style = MBOX_FORMAT;
static int mapping = 0;
+static void mbxclose_done(int) NORETURN;
+
char *file = NULL;
char *file = NULL;
@@
-46,6
+46,8
@@
main (int argc, char **argv)
struct msgs *mp;
struct stat st;
struct msgs *mp;
struct stat st;
+ done=mbxclose_done;
+
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
@@
-73,10
+75,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 FILESW:
if (file)
case FILESW:
if (file)
@@
-98,7
+100,7
@@
main (int argc, char **argv)
if (*cp == '+' || *cp == '@') {
if (folder)
adios (NULL, "only one folder at a time!");
if (*cp == '+' || *cp == '@') {
if (folder)
adios (NULL, "only one folder at a time!");
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
} else
app_msgarg(&msgs, cp);
}
@@
-175,13
+177,13
@@
main (int argc, char **argv)
seq_save (mp);
context_save (); /* save the context file */
folder_free (mp); /* free folder/message structure */
seq_save (mp);
context_save (); /* save the context file */
folder_free (mp); /* free folder/message structure */
- return done (0);
+ done (0);
+ return 1;
}
}
-int
-done (int status)
+static void
+mbxclose_done (int status)
{
mbx_close (file, md);
exit (status);
{
mbx_close (file, md);
exit (status);
- return 1; /* dead code to satisfy the compiler */
}
}