/*
* inc.c -- incorporate messages from a maildrop into 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.
*/
#ifdef MAILGROUP
#endif
#include <h/mh.h>
+#include <h/utils.h>
#include <fcntl.h>
#ifdef POP
# include <h/popsbr.h>
#endif
-#ifdef HESIOD
-# include <hesiod.h>
-#endif
-
#include <h/fmt_scan.h>
#include <h/scansbr.h>
#include <h/signals.h>
#include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
#include <errno.h>
#include <signal.h>
# define POPminc(a) 0
#endif
-#ifndef RPOP
-# define RPOPminc(a) (a)
-#else
-# define RPOPminc(a) 0
-#endif
-
-#ifndef APOP
-# define APOPminc(a) (a)
-#else
-# define APOPminc(a) 0
-#endif
-
-#ifndef KPOP
-# define KPOPminc(a) (a)
-#else
-# define KPOPminc(a) 0
-#endif
-
#ifndef CYRUS_SASL
# define SASLminc(a) (a)
#else
{ "pack file", POPminc (-4) },
#define NPACKSW 10
{ "nopack", POPminc (-6) },
-#define APOPSW 11
- { "apop", APOPminc (-4) },
-#define NAPOPSW 12
- { "noapop", APOPminc (-6) },
-#define RPOPSW 13
- { "rpop", RPOPminc (-4) },
-#define NRPOPSW 14
- { "norpop", RPOPminc (-6) },
-#define SILSW 15
+#define PORTSW 11
+ { "port name/number", POPminc (-4) },
+#define SILSW 12
{ "silent", 0 },
-#define NSILSW 16
+#define NSILSW 13
{ "nosilent", 0 },
-#define TRNCSW 17
+#define TRNCSW 14
{ "truncate", 0 },
-#define NTRNCSW 18
+#define NTRNCSW 15
{ "notruncate", 0 },
-#define WIDTHSW 19
+#define WIDTHSW 16
{ "width columns", 0 },
-#define VERSIONSW 20
+#define VERSIONSW 17
{ "version", 0 },
-#define HELPSW 21
+#define HELPSW 18
{ "help", 0 },
-#define SNOOPSW 22
+#define SNOOPSW 19
{ "snoop", -5 },
-#define KPOPSW 23
- { "kpop", KPOPminc (-4) },
-#define SASLSW 24
+#define SASLSW 20
{ "sasl", SASLminc(-4) },
-#define SASLMECHSW 25
+#define SASLMECHSW 21
{ "saslmech", SASLminc(-8) },
+#define PROXYSW 22
+ { "proxy command", POPminc(-5) },
{ NULL, 0 }
};
-extern int errno;
-
/*
* flags for the mail source
*/
#define SAVEGROUPPRIVS()
#endif /* not MAILGROUP */
-#ifdef POP
-#define DROPUSERPRIVS() setuid(getuid())
-#else
-#define DROPUSERPRIVS()
-#endif
-
/* these variables have to be globals so that done() can correctly clean up the lockfile */
static int locked = 0;
static char *newmail;
*/
char *map_name(char *);
+static void inc_done(int) NORETURN;
#ifdef POP
-int done(int);
static int pop_action(char *);
static int pop_pack(char *);
static int map_count(void);
{
int chgflag = 1, trnflag = 1;
int noisy = 1, width = 0;
- int rpop, i, hghnum, msgnum;
- int kpop = 0;
- char *cp, *maildir, *folder = NULL;
+ int i, hghnum = 0, msgnum = 0;
+ int sasl = 0;
+ char *cp, *maildir = NULL, *folder = NULL;
char *format = NULL, *form = NULL;
- char *host = NULL, *user = NULL;
- char *audfile = NULL, *from = NULL;
+ char *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;
+ char *audfile = NULL, *from = NULL, *saslmech = NULL;
char buf[BUFSIZ], **argp, *nfs, **arguments;
- struct msgs *mp;
+ struct msgs *mp = NULL;
struct stat st, s1;
FILE *aud = NULL;
+ char b[MAXPATHLEN + 1];
+ char *maildir_copy = NULL; /* copy of mail directory because the static gets overwritten */
#ifdef POP
int nmsgs, nbytes, p = 0;
char *pass = NULL;
+ char *MAILHOST_env_variable;
#endif
#ifdef MHE
FILE *mhe = NULL;
#endif
-#ifdef HESIOD
- struct hes_postoffice *po;
- char *tmphost;
-#endif
+ done=inc_done;
/* absolutely the first thing we do is save our privileges,
* and drop them if we can.
argp = arguments;
#ifdef POP
-# ifdef HESIOD
/*
* Scheme is:
* use MAILHOST environment variable if present,
* If that fails, use the default (if any)
* provided by mts.conf in mts_init()
*/
- if ((tmphost = getenv("MAILHOST")) != NULL)
- pophost = tmphost;
- else if ((po = hes_getmailhost(getusername())) != NULL &&
- strcmp(po->po_type, "POP") == 0)
- pophost = po->po_host;
-# endif /* HESIOD */
+ if ((MAILHOST_env_variable = getenv("MAILHOST")) != NULL)
+ pophost = MAILHOST_env_variable;
/*
* If there is a valid "pophost" entry in mts.conf,
* then use it as the default host.
snoop++;
#endif /* POP */
- rpop = 0;
-
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
if (!(host = *argp++) || *host == '-')
adios (NULL, "missing argument to %s", argp[-2]);
continue;
+
+ case PORTSW:
+ if (!(host = *argp++) || *port == '-')
+ adios (NULL, "missing argument to %s", argp[-2]);
+ continue;
+
case USERSW:
if (!(user = *argp++) || *user == '-')
adios (NULL, "missing argument to %s", argp[-2]);
#endif /* POP */
continue;
- case APOPSW:
- rpop = -1;
- continue;
- case NAPOPSW:
- rpop = 0;
- continue;
-
- case RPOPSW:
- rpop = 1;
- continue;
- case NRPOPSW:
- rpop = 0;
- continue;
-
- case KPOPSW:
- kpop = 1;
- continue;
-
case SNOOPSW:
snoop++;
continue;
if (!(saslmech = *argp++) || *saslmech == '-')
adios (NULL, "missing argument to %s", argp[-2]);
continue;
+ case PROXYSW:
+ if (!(proxy = *argp++) || *proxy == '-')
+ adios (NULL, "missing argument to %s", argp[-2]);
+ continue;
}
}
if (*cp == '+' || *cp == '@') {
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);
}
#ifdef POP
if (host && !*host)
host = NULL;
- if (from || !host || rpop <= 0)
- DROPUSERPRIVS();
#endif /* POP */
/* guarantee dropping group priveleges; we might not have done so earlier */
if (inc_type == INC_POP) {
if (user == NULL)
user = getusername ();
- if ( strcmp( POPSERVICE, "kpop" ) == 0 ) {
- kpop = 1;
- }
- if (kpop || sasl || ( rpop > 0))
+ if (sasl)
pass = getusername ();
else
ruserpass (host, &user, &pass);
/*
* initialize POP connection
*/
- if (pop_init (host, user, pass, snoop, kpop ? 1 : rpop, kpop,
- sasl, saslmech) == NOTOK)
+ if (pop_init (host, port, user, pass, proxy, snoop, sasl,
+ saslmech) == NOTOK)
adios (NULL, "%s", response);
/* Check if there are any messages */
if (pop_stat (&nmsgs, &nbytes) == NOTOK)
adios (NULL, "%s", response);
- if (rpop > 0)
- DROPUSERPRIVS();
if (nmsgs == 0) {
pop_quit();
adios (NULL, "no mail to incorporate");
}
if (stat (newmail, &s1) == NOTOK || s1.st_size == 0)
adios (NULL, "no mail to incorporate");
+
+ if ((cp = strdup(newmail)) == (char *)0)
+ adios (NULL, "error allocating memory to copy newmail");
+
+ newmail = cp;
}
#ifdef POP
folder = getfolder (0);
maildir = m_maildir (folder);
- if (stat (maildir, &st) == NOTOK) {
- if (errno != ENOENT)
- adios (maildir, "error on folder");
- cp = concat ("Create folder \"", maildir, "\"? ", NULL);
- if (noisy && !getanswer (cp))
- done (1);
- free (cp);
- if (!makedir (maildir))
- adios (NULL, "unable to create folder %s", maildir);
+ if ((maildir_copy = strdup(maildir)) == (char *)0)
+ adios (maildir, "error allocating memory to copy maildir");
+
+ if (!folder_exists(maildir)) {
+ /* If the folder doesn't exist, and we're given the -silent flag,
+ * just fail.
+ */
+ if (noisy)
+ create_folder(maildir, 0, done);
+ else
+ done (1);
}
if (chdir (maildir) == NOTOK)
#ifdef POP
fprintf (aud, from ? "<<inc>> %s -ms %s\n"
- : host ? "<<inc>> %s -host %s -user %s%s\n"
+ : host ? "<<inc>> %s -host %s -user %s\n"
: "<<inc>> %s\n",
- dtimenow (0), from ? from : host, user,
- rpop < 0 ? " -apop" : rpop > 0 ? " -rpop" : "");
+ dtimenow (0), from ? from : host, user);
#else /* POP */
fprintf (aud, from ? "<<inc>> %s -ms %s\n" : "<<inc>> %s\n",
dtimenow (0), from);
/* link message into folder */
newmsg = folder_addmsg(mp, tmpfilenam);
#endif
-
/* create scanline for new message */
switch (i = scan (in, msgnum + 1, msgnum + 1, nfs, width,
msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) {
case SCNMSG:
case SCNENC:
+ /*
+ * Run the external program hook on the message.
+ */
+
+ (void)snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 1);
+ (void)ext_hook("add-hook", b, (char *)0);
+
if (aud)
fputs (scanl, aud);
#ifdef MHE
msgnum++;
mp->hghmsg++;
+ mp->nummsg++;
+ if (mp->lowmsg == 0) mp->lowmsg = 1;
+
clear_msg_flags (mp, msgnum);
set_exists (mp, msgnum);
set_unseen (mp, msgnum);
seq_setunseen (mp, 0); /* set the Unseen-Sequence */
seq_save (mp); /* synchronize sequences */
context_save (); /* save the context file */
- return done (0);
+ done (0);
+ return 1;
}
#endif /* if 0 */
-int
-done (int status)
+static void
+inc_done (int status)
{
#ifdef POP
if (packfile && pd != NOTOK)
DROPGROUPPRIVS();
}
exit (status);
- return 1; /* dead code to satisfy the compiler */
}
#ifdef POP
projects / mmh / blobdiff