projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backport fix from trunk for SASL bug.
[mmh]
/
uip
/
rcvstore.c
diff --git
a/uip/rcvstore.c
b/uip/rcvstore.c
index
81a03e8
..
493bade
100644
(file)
--- a/
uip/rcvstore.c
+++ b/
uip/rcvstore.c
@@
-3,6
+3,10
@@
* rcvstore.c -- asynchronously add mail to a folder
*
* $Id$
* rcvstore.c -- asynchronously add mail to a folder
*
* $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.
*/
#include <h/mh.h>
*/
#include <h/mh.h>
@@
-10,6
+14,7
@@
#include <h/signals.h>
#include <errno.h>
#include <signal.h>
#include <h/signals.h>
#include <errno.h>
#include <signal.h>
+#include <h/mts.h>
static struct swit switches[] = {
#define CRETSW 0
static struct swit switches[] = {
#define CRETSW 0
@@
-33,17
+38,17
@@
static struct swit switches[] = {
#define VERSIONSW 9
{ "version", 0 },
#define HELPSW 10
#define VERSIONSW 9
{ "version", 0 },
#define HELPSW 10
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
-extern int errno;
/*
* name of temporary file to store incoming message
*/
static char *tmpfilenam = NULL;
/*
* name of temporary file to store incoming message
*/
static char *tmpfilenam = NULL;
+static void unlink_done(int);
int
main (int argc, char **argv)
int
main (int argc, char **argv)
@@
-56,6
+61,8
@@
main (int argc, char **argv)
struct msgs *mp;
struct stat st;
struct msgs *mp;
struct stat st;
+ done=unlink_done;
+
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
@@
-130,7
+137,7
@@
main (int argc, char **argv)
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 {
adios (NULL, "usage: %s [+folder] [switches]", invo_name);
}
} else {
adios (NULL, "usage: %s [+folder] [switches]", invo_name);
}
@@
-198,7
+205,7
@@
main (int argc, char **argv)
* Link message into folder, and possibly add
* to the Unseen-Sequence's.
*/
* Link message into folder, and possibly add
* to the Unseen-Sequence's.
*/
- if ((msgnum = folder_addmsg (&mp, tmpfilenam, 0, unseensw, 0)) == -1)
+ if ((msgnum = folder_addmsg (&mp, tmpfilenam, 0, unseensw, 0, 0, (char *)0)) == -1)
done (1);
/*
done (1);
/*
@@
-219,13
+226,14
@@
main (int argc, char **argv)
tmpfilenam = NULL;
done (0);
tmpfilenam = NULL;
done (0);
+ return 1;
}
/*
* Clean up and exit
*/
}
/*
* Clean up and exit
*/
-void
-done(int status)
+static void
+unlink_done(int status)
{
if (tmpfilenam && *tmpfilenam)
unlink (tmpfilenam);
{
if (tmpfilenam && *tmpfilenam)
unlink (tmpfilenam);