*/
#endif
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/utils.h"
#include <fcntl.h>
-#include <h/dropsbr.h>
-#include <h/popsbr.h>
-#include <h/fmt_scan.h>
-#include <h/scansbr.h>
-#include <h/signals.h>
-#include <h/tws.h>
-#include <h/mts.h>
+#include "h/dropsbr.h"
+#include "h/popsbr.h"
+#include "h/fmt_scan.h"
+#include "h/scansbr.h"
+#include "h/signals.h"
+#include "h/tws.h"
+#include "h/mts.h"
+#include "h/done.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
#ifndef TLS_SUPPORT
# define TLSminc(a) (a)
X("format string", 5, FMTSW) \
X("host hostname", 0, HOSTSW) \
X("user username", 0, USERSW) \
- X("pack file", 0, PACKSW) \
- X("nopack", 0, NPACKSW) \
X("port name/number", 0, PORTSW) \
X("silent", 0, SILSW) \
X("nosilent", 0, NSILSW) \
#define INC_FILE 0
#define INC_POP 1
-static int inc_type;
static struct Maildir_entry {
char *filename;
time_t mtime;
} *Maildir = NULL;
static int num_maildir_entries = 0;
-static int snoop = 0;
+static bool snoop;
-extern char response[];
-
-static int size;
-static long pos;
-
-static int mbx_style = MMDF_FORMAT;
-static int pd = NOTOK;
-
-static long start;
-static long stop;
+typedef struct {
+ FILE *mailout;
+ long written;
+} pop_closure;
-static char *packfile = NULL;
-static FILE *pf = NULL;
+extern char response[];
/* This is an attempt to simplify things by putting all the
* privilege ops into macros.
#endif /* not MAILGROUP */
/* these variables have to be globals so that done() can correctly clean up the lockfile */
-static int locked = 0;
+static bool locked;
static char *newmail;
static FILE *in;
/*
* prototypes
*/
-char *map_name(char *);
-
+static int maildir_srt(const void *va, const void *vb) PURE;
static void inc_done(int) NORETURN;
-static int pop_action(char *);
-static int pop_pack(char *);
-static int map_count(void);
+static int pop_action(void *closure, char *);
-int
+static int
maildir_srt(const void *va, const void *vb)
{
const struct Maildir_entry *a = va, *b = vb;
int
main (int argc, char **argv)
{
+ static int inc_type;
bool chgflag;
int trnflag = 1;
bool noisy;
int width = -1;
int hghnum = 0, msgnum = 0;
+ FILE *pf = NULL;
bool sasl, tls, noverify;
int incerr = 0; /* <0 if inc hits an error which means it should not truncate mailspool */
char *cp, *maildir = NULL, *folder = NULL;
int nmsgs, nbytes;
char *MAILHOST_env_variable;
- done=inc_done;
+ set_done(inc_done);
/* absolutely the first thing we do is save our privileges,
* and drop them if we can.
SAVEGROUPPRIVS();
TRYDROPGROUPPRIVS();
- if (nmh_init(argv[0], 1)) { return 1; }
+ if (nmh_init(argv[0], true, true)) { return 1; }
mts_init ();
arguments = getarguments (invo_name, argc, argv, 1);
ambigsw (cp, switches);
done (1);
case UNKWNSW:
- adios (NULL, "-%s unknown", cp);
+ die("-%s unknown", cp);
case HELPSW:
snprintf (buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
case AUDSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- audfile = getcpy (m_maildir (cp));
+ die("missing argument to %s", argp[-2]);
+ audfile = mh_xstrdup(m_maildir(cp));
continue;
case NAUDSW:
audfile = NULL;
case FILESW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
from = path (cp, TFILE);
/*
case FORMSW:
if (!(form = *argp++) || *form == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
format = NULL;
continue;
case FMTSW:
if (!(format = *argp++) || *format == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
form = NULL;
continue;
case WIDTHSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
width = atoi (cp);
continue;
case HOSTSW:
if (!(host = *argp++) || *host == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case PORTSW:
if (!(port = *argp++) || *port == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case USERSW:
if (!(user = *argp++) || *user == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
-
- case PACKSW:
- if (!(packfile = *argp++) || *packfile == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
- case NPACKSW:
- packfile = NULL;
+ die("missing argument to %s", argp[-2]);
continue;
case SNOOPSW:
- snoop++;
+ snoop = true;
continue;
case SASLSW:
case SASLMECHSW:
if (!(saslmech = *argp++) || *saslmech == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case INITTLSSW:
case AUTHSERVICESW:
#ifdef OAUTH_SUPPORT
if (!(auth_svc = *argp++) || *auth_svc == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
#else
- adios (NULL, "not built with OAuth support");
+ die("not built with OAuth support");
#endif
continue;
case PROXYSW:
if (!(proxy = *argp++) || *proxy == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
}
}
if (*cp == '+' || *cp == '@') {
if (folder)
- adios (NULL, "only one folder at a time!");
- else
- folder = pluspath (cp);
+ die("only one folder at a time!");
+ folder = pluspath (cp);
} else {
- adios (NULL, "usage: %s [+folder] [switches]", invo_name);
+ die("usage: %s [+folder] [switches]", invo_name);
}
}
/* guarantee dropping group privileges; we might not have done so earlier */
DROPGROUPPRIVS();
- /*
- * Where are we getting the new mail?
- */
- if (from)
- inc_type = INC_FILE;
- else if (host)
- inc_type = INC_POP;
- else
- inc_type = INC_FILE;
+ /* Source of mail; -from overrides any -host. */
+ inc_type = host && !from ? INC_POP : INC_FILE;
- /*
- * Are we getting the mail from
- * a POP server?
- */
if (inc_type == INC_POP) {
+ /* Mail from a POP server. */
int tlsflag = 0;
if (auth_svc == NULL) {
if (saslmech && ! strcasecmp(saslmech, "xoauth2")) {
- adios (NULL, "must specify -authservice with -saslmech xoauth2");
+ die("must specify -authservice with -saslmech xoauth2");
}
} else {
if (user == NULL) {
- adios (NULL, "must specify -user with -saslmech xoauth2");
+ die("must specify -user with -saslmech xoauth2");
}
}
*/
if (pop_init (host, port, user, proxy, snoop, sasl, saslmech,
tlsflag, auth_svc) == NOTOK)
- adios (NULL, "%s", response);
+ die("%s", response);
/* Check if there are any messages */
if (pop_stat (&nmsgs, &nbytes) == NOTOK)
- adios (NULL, "%s", response);
+ die("%s", response);
if (nmsgs == 0) {
pop_quit();
- adios (NULL, "no mail to incorporate");
+ die("no mail to incorporate");
}
- }
-
- /*
- * We will get the mail from a file
- * (typically the standard maildrop)
- */
- if (inc_type == INC_FILE) {
+ } else if (inc_type == INC_FILE) {
+ /* Mail from a spool file, or Maildir. */
if (from)
newmail = from;
else if ((newmail = getenv ("MAILDROP")) && *newmail)
newmail = concat (MAILDIR, "/", MAILFIL, NULL);
}
if (stat (newmail, &s1) == NOTOK || s1.st_size == 0)
- adios (NULL, "no mail to incorporate");
+ die("no mail to incorporate");
if (s1.st_mode & S_IFDIR) {
DIR *md;
struct dirent *de;
i = 0;
cp = concat (newmail, "/new", NULL);
if ((md = opendir(cp)) == NULL)
- adios (NULL, "unable to open %s", cp);
+ die("unable to open %s", cp);
while ((de = readdir (md)) != NULL) {
if (de->d_name[0] == '.')
continue;
if (i >= num_maildir_entries) {
if ((Maildir = realloc(Maildir, sizeof(*Maildir) * (2*i+16))) == NULL)
- adios(NULL, "not enough memory for %d messages", 2*i+16);
+ die("not enough memory for %d messages", 2*i+16);
num_maildir_entries = 2*i+16;
}
Maildir[i].filename = concat (cp, "/", de->d_name, NULL);
closedir (md);
cp = concat (newmail, "/cur", NULL);
if ((md = opendir(cp)) == NULL)
- adios (NULL, "unable to open %s", cp);
+ die("unable to open %s", cp);
while ((de = readdir (md)) != NULL) {
if (de->d_name[0] == '.')
continue;
if (i >= num_maildir_entries) {
if ((Maildir = realloc(Maildir, sizeof(*Maildir) * (2*i+16))) == NULL)
- adios(NULL, "not enough memory for %d messages", 2*i+16);
+ die("not enough memory for %d messages", 2*i+16);
num_maildir_entries = 2*i+16;
}
Maildir[i].filename = concat (cp, "/", de->d_name, NULL);
free (cp);
closedir (md);
if (i == 0)
- adios (NULL, "no mail to incorporate");
+ die("no mail to incorporate");
num_maildir_entries = i;
qsort (Maildir, num_maildir_entries, sizeof(*Maildir), maildir_srt);
}
newmail = cp;
}
- /* skip the folder setup */
- if ((inc_type == INC_POP) && packfile)
- goto go_to_it;
-
if (!context_find ("path"))
free (path ("./", TFOLDER));
if (!folder)
/* read folder and create message structure */
if (!(mp = folder_read (folder, 0)))
- adios (NULL, "unable to read folder %s", folder);
-
-go_to_it:
+ die("unable to read folder %s", folder);
if (inc_type == INC_FILE && Maildir == NULL) {
+ /* Mail from a spool file. */
+
if (access (newmail, W_OK) != NOTOK) {
- locked++;
+ locked = true;
if (trnflag) {
SIGNAL (SIGHUP, SIG_IGN);
SIGNAL (SIGINT, SIG_IGN);
in = lkfopenspool (newmail, "r");
DROPGROUPPRIVS();
if (in == NULL)
- adios (NULL, "unable to lock and fopen %s", newmail);
+ die("unable to lock and fopen %s", newmail);
fstat (fileno(in), &s1);
} else {
trnflag = 0;
inform("Creating Receive-Audit: %s", audfile);
if ((aud = fopen (audfile, "a")) == NULL)
adios (audfile, "unable to append to");
- else if (i == NOTOK)
+ if (i == NOTOK)
chmod (audfile, m_gmprot ());
if (from)
* Get the mail from a POP server
*/
if (inc_type == INC_POP) {
+ /* Mail from a POP server. */
int i;
- if (packfile) {
- packfile = path (packfile, TFILE);
- if (stat (packfile, &st) == NOTOK) {
- if (errno != ENOENT)
- adios (packfile, "error on file");
- cp = concat ("Create file \"", packfile, "\"? ", NULL);
- if (noisy && !read_yes_or_no_if_tty (cp))
- done (1);
- free (cp);
- }
- msgnum = map_count ();
- if ((pd = mbx_open (packfile, mbx_style, getuid(), getgid(), m_gmprot()))
- == NOTOK)
- adios (packfile, "unable to open");
- if ((pf = fdopen (pd, "w+")) == NULL)
- adios (NULL, "unable to fdopen %s", packfile);
- } else {
- hghnum = msgnum = mp->hghmsg;
- }
+ pop_closure pc;
+ hghnum = msgnum = mp->hghmsg;
for (i = 1; i <= nmsgs; i++) {
charstring_t scanl = NULL;
msgnum++;
- if (packfile) {
- size_t len;
-
- fseek (pf, 0L, SEEK_CUR);
- pos = ftell (pf);
- size = 0;
- len = strlen(mmdlm1);
- if (fwrite(mmdlm1, 1, len, pf) < len)
- advise (mmdlm1, "fwrite");
- start = ftell (pf);
-
- if (pop_retr (i, pop_pack) == NOTOK)
- adios (NULL, "%s", response);
-
- fseek (pf, 0L, SEEK_CUR);
- stop = ftell (pf);
- if (fflush (pf))
- adios (packfile, "write error on");
- fseek (pf, start, SEEK_SET);
- } else {
- cp = mh_xstrdup(m_name (msgnum));
- if ((pf = fopen (cp, "w+")) == NULL)
- adios (cp, "unable to write");
- chmod (cp, m_gmprot ());
- start = stop = 0L;
-
- if (pop_retr (i, pop_action) == NOTOK)
- adios (NULL, "%s", response);
-
- if (fflush (pf))
- adios (cp, "write error on");
- fseek (pf, 0L, SEEK_SET);
- }
+ cp = mh_xstrdup(m_name (msgnum));
+ if ((pf = fopen (cp, "w+")) == NULL)
+ adios (cp, "unable to write");
+ chmod (cp, m_gmprot ());
+
+ pc.written = 0;
+ pc.mailout = pf;
+ if (pop_retr(i, pop_action, &pc) == NOTOK)
+ die("%s", response);
+
+ if (fflush (pf))
+ adios (cp, "write error on");
+ fseek (pf, 0L, SEEK_SET);
switch (incerr = scan (pf, msgnum, 0, nfs, width,
- packfile ? 0 : msgnum == mp->hghmsg + 1 && chgflag,
- 1, NULL, stop - start, noisy, &scanl)) {
+ msgnum == mp->hghmsg + 1 && chgflag,
+ 1, NULL, pc.written, noisy, &scanl)) {
case SCNEOF:
printf ("%*d empty\n", DMAXFOLDER, msgnum);
break;
case SCNFAT:
trnflag = 0;
- noisy++;
+ noisy = true;
/* advise (cp, "unable to read"); already advised */
- /* FALLTHRU */
+ break;
case SCNERR:
case SCNNUM:
}
charstring_free (scanl);
- if (packfile) {
- size_t len;
-
- fseek (pf, stop, SEEK_SET);
- len = strlen(mmdlm2);
- if (fwrite(mmdlm2, 1, len, pf) < len)
- advise (mmdlm2, "fwrite");
- if (fflush (pf) || ferror (pf)) {
- int e = errno;
- pop_quit ();
- errno = e;
- adios (packfile, "write error on");
- }
- map_write (packfile, pd, 0, 0L, start, stop, pos, size, noisy);
- } else {
- if (ferror(pf) || fclose (pf)) {
- int e = errno;
- (void) m_unlink (cp);
- pop_quit ();
- errno = e;
- adios (cp, "write error on");
- }
- free (cp);
- }
+ if (ferror(pf) || fclose (pf)) {
+ int e = errno;
+ (void) m_unlink (cp);
+ pop_quit ();
+ errno = e;
+ adios (cp, "write error on");
+ }
+ free (cp);
if (trnflag && pop_dele (i) == NOTOK)
- adios (NULL, "%s", response);
+ die("%s", response);
scan_finished();
}
if (pop_quit () == NOTOK)
- adios (NULL, "%s", response);
- if (packfile) {
- mbx_close (packfile, pd);
- pd = NOTOK;
- }
- }
+ die("%s", response);
+
+ } else if (inc_type == INC_FILE && Maildir == NULL) {
+ /* Mail from a spool file. */
- /*
- * Get the mail from file (usually mail spool)
- */
- if (inc_type == INC_FILE && Maildir == NULL) {
scan_detect_mbox_style (in); /* the MAGIC invocation... */
hghnum = msgnum = mp->hghmsg;
for (;;) {
*/
break;
}
- } else if (inc_type == INC_FILE) { /* Maildir inbox to process */
+
+ } else {
+ /* Mail from Maildir. */
char *sp;
FILE *sf;
int i;
fseek (pf, 0L, SEEK_SET);
switch (incerr = scan (pf, msgnum, 0, nfs, width,
msgnum == mp->hghmsg + 1 && chgflag,
- 1, NULL, stop - start, noisy, &scanl)) {
+ 1, NULL, 0, noisy, &scanl)) {
case SCNEOF:
printf ("%*d empty\n", DMAXFOLDER, msgnum);
break;
case SCNFAT:
trnflag = 0;
- noisy++;
+ noisy = true;
/* advise (cp, "unable to read"); already advised */
- /* FALLTHRU */
+ break;
case SCNERR:
case SCNNUM:
} else {
fclose (in); in = NULL;
}
- adios (NULL, "failed");
+ die("failed");
}
if (aud)
if (noisy)
fflush (stdout);
- if ((inc_type == INC_POP) && packfile)
- done (0);
-
- /*
- * truncate file we are incorporating from
- */
if (inc_type == INC_FILE && Maildir == NULL) {
+ /* Mail from a spool file; truncate it. */
+
if (trnflag) {
if (stat (newmail, &st) != NOTOK && s1.st_mtime != st.st_mtime)
inform("new messages have arrived!\007");
close (newfd);
else
admonish (newmail, "error zero'ing");
- (void) m_unlink(map_name(newmail));
}
} else {
if (noisy)
seq_save(mp2); /* Save the sequence file */
folder_free(mp2);
}
-skip:
- /*
- * unlock the mail spool
- */
+skip:
if (inc_type == INC_FILE && Maildir == NULL) {
+ /* Mail from a spool file; unlock it. */
+
if (locked) {
GETGROUPPRIVS(); /* Be sure we can unlock mail file */
(void) lkfclosespool (in, newmail); in = NULL;
static void NORETURN
inc_done (int status)
{
- done = exit;
- if (packfile && pd != NOTOK)
- mbx_close (packfile, pd);
+ set_done(exit);
if (locked)
{
GETGROUPPRIVS();
}
static int
-pop_action (char *s)
+pop_action(void *closure, char *s)
{
- fprintf (pf, "%s\n", s);
- stop += strlen (s) + 1;
- return 0; /* Is return value used? This was missing before 1999-07-15. */
-}
+ pop_closure *pc;
+ int n;
-static int
-pop_pack (char *s)
-{
- int j;
- char buffer[BUFSIZ];
-
- snprintf (buffer, sizeof(buffer), "%s\n", s);
- for ( ; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
- continue;
- for ( ; (j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++)
- continue;
- fputs (buffer, pf);
- size += strlen (buffer) + 1;
- return 0; /* Is return value used? This was missing before 1999-07-15. */
-}
+ pc = closure;
+ n = fprintf(pc->mailout, "%s\n", s);
+ if (n < 0)
+ return NOTOK;
+ pc->written += n; /* Count linefeed too. */
-static int
-map_count (void)
-{
- int md;
- char *cp;
- struct drop d;
- struct stat st;
-
- if (stat (packfile, &st) == NOTOK)
- return 0;
- if ((md = open (cp = map_name (packfile), O_RDONLY)) == NOTOK
- || map_chk (cp, md, &d, (long) st.st_size, 1)) {
- if (md != NOTOK)
- close (md);
- return 0;
- }
- close (md);
- return (d.d_id);
+ return OK;
}
projects / nmh / blobdiff