*/
#endif
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/fmt_new.h"
+#include "sbr/dtime.h"
+#include "scansbr.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/getarguments.h"
+#include "sbr/concat.h"
+#include "sbr/seq_setunseen.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/getfolder.h"
+#include "sbr/ext_hook.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_realloc.h"
+#include "sbr/folder_free.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.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 "popsbr.h"
+#include "h/fmt_scan.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"
X("sasl", 0, SASLSW) \
X("nosasl", 0, NOSASLSW) \
X("saslmech", 0, SASLMECHSW) \
+ X("tls", TLSminc(-3), TLSSW) \
X("initialtls", TLSminc(-10), INITTLSSW) \
X("notls", TLSminc(-5), NOTLSSW) \
X("certverify", TLSminc(-10), CERTVERSW) \
time_t mtime;
} *Maildir = NULL;
static int num_maildir_entries = 0;
-static int snoop = 0;
+static bool snoop;
typedef struct {
FILE *mailout;
int width = -1;
int hghnum = 0, msgnum = 0;
FILE *pf = NULL;
- bool sasl, tls, noverify;
+ bool sasl, noverify;
+ int tls = 0;
int incerr = 0; /* <0 if inc hits an error which means it should not truncate mailspool */
char *cp, *maildir = NULL, *folder = NULL;
char *format = NULL, *form = NULL;
FILE *aud = NULL;
char b[PATH_MAX + 1];
char *maildir_copy = NULL; /* copy of mail directory because the static gets overwritten */
+ charstring_t scanl = NULL;
int nmsgs, nbytes;
char *MAILHOST_env_variable;
if (pophost && *pophost)
host = pophost;
- sasl = tls = false;
+ sasl = false;
chgflag = noisy = noverify = true;
while ((cp = *argp++)) {
if (*cp == '-') {
continue;
case SNOOPSW:
- snoop++;
+ snoop = true;
continue;
case SASLSW:
die("missing argument to %s", argp[-2]);
continue;
+ case TLSSW:
+ tls = 1;
+ continue;
+
case INITTLSSW:
- tls = true;
+ tls = 2;
continue;
case NOTLSSW:
- tls = false;
+ tls = 0;
continue;
case CERTVERSW:
}
}
- if (tls)
- tlsflag |= P_INITTLS;
+ if (tls == 1)
+ tlsflag = P_STARTTLS;
+ else if (tls == 2)
+ tlsflag = P_INITTLS;
if (noverify)
tlsflag |= P_NOVERIFY;
}
if (stat (newmail, &s1) == NOTOK || s1.st_size == 0)
die("no mail to incorporate");
- if (s1.st_mode & S_IFDIR) {
- DIR *md;
- struct dirent *de;
- struct stat ms;
- int i;
- i = 0;
- cp = concat (newmail, "/new", NULL);
- if ((md = opendir(cp)) == NULL)
- 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)
- 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);
- if (stat(Maildir[i].filename, &ms) != 0)
- adios (Maildir[i].filename, "couldn't get delivery time");
- Maildir[i].mtime = ms.st_mtime;
- i++;
- }
- free (cp);
- closedir (md);
- cp = concat (newmail, "/cur", NULL);
- if ((md = opendir(cp)) == NULL)
- 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)
- 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);
- if (stat(Maildir[i].filename, &ms) != 0)
- adios (Maildir[i].filename, "couldn't get delivery time");
- Maildir[i].mtime = ms.st_mtime;
- i++;
- }
- free (cp);
- closedir (md);
- if (i == 0)
- die("no mail to incorporate");
- num_maildir_entries = i;
- qsort (Maildir, num_maildir_entries, sizeof(*Maildir), maildir_srt);
- }
+ if (s1.st_mode & S_IFDIR) {
+ DIR *md;
+ struct dirent *de;
+ struct stat ms;
+ int i;
+ i = 0;
+ cp = concat (newmail, "/new", NULL);
+ if ((md = opendir(cp)) == NULL)
+ 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)
+ 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);
+ if (stat(Maildir[i].filename, &ms) != 0)
+ adios (Maildir[i].filename, "couldn't get delivery time");
+ Maildir[i].mtime = ms.st_mtime;
+ i++;
+ }
+ free (cp);
+ closedir (md);
+ cp = concat (newmail, "/cur", NULL);
+ if ((md = opendir(cp)) == NULL)
+ 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)
+ 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);
+ if (stat(Maildir[i].filename, &ms) != 0)
+ adios (Maildir[i].filename, "couldn't get delivery time");
+ Maildir[i].mtime = ms.st_mtime;
+ i++;
+ }
+ free (cp);
+ closedir (md);
+ if (i == 0)
+ die("no mail to incorporate");
+ num_maildir_entries = i;
+ qsort (Maildir, num_maildir_entries, sizeof(*Maildir), maildir_srt);
+ }
cp = mh_xstrdup(newmail);
newmail = cp;
fprintf (aud, "<<inc>> %s -ms %s\n", dtimenow(0), from);
else {
if (host)
- fprintf (aud, "<<inc>> %s -host %s -user %s\n", dtimenow(0),
+ fprintf (aud, "<<inc>> %s -host %s -user %s\n", dtimenow(0),
host, user);
else
fprintf (aud, "<<inc>> %s\n", dtimenow (0));
hghnum = msgnum = mp->hghmsg;
for (i = 1; i <= nmsgs; i++) {
- charstring_t scanl = NULL;
msgnum++;
cp = mh_xstrdup(m_name (msgnum));
break;
case SCNMSG:
- case SCNENC:
default:
if (aud)
fputs (charstring_buffer (scanl), aud);
fflush (stdout);
break;
}
- charstring_free (scanl);
+
+ if (scanl)
+ charstring_clear (scanl);
if (ferror(pf) || fclose (pf)) {
int e = errno;
scan_finished();
}
+ charstring_free (scanl);
+ scanl = NULL;
+
if (pop_quit () == NOTOK)
die("%s", response);
scan_detect_mbox_style (in); /* the MAGIC invocation... */
hghnum = msgnum = mp->hghmsg;
for (;;) {
- charstring_t scanl = NULL;
-
/* create scanline for new message */
switch (incerr = scan (in, msgnum + 1, msgnum + 1, nfs, width,
msgnum == hghnum && chgflag, 1, NULL, 0L, noisy,
break;
case SCNMSG:
- case SCNENC:
/*
* Run the external program hook on the message.
*/
if (noisy)
fflush (stdout);
+ charstring_clear (scanl);
msgnum++;
continue;
}
- charstring_free (scanl);
/* If we get here there was some sort of error from scan(),
* so stop processing anything more from the spool.
*/
break;
}
+ charstring_free (scanl);
+ scanl = NULL;
} else {
/* Mail from Maildir. */
hghnum = msgnum = mp->hghmsg;
for (i = 0; i < num_maildir_entries; i++) {
- charstring_t scanl = NULL;
-
msgnum++;
sp = Maildir[i].filename;
size_t nrd;
if ((sf = fopen (sp, "r")) == NULL)
- adios (sp, "unable to read for copy");
+ adios (sp, "unable to read for copy");
if ((pf = fopen (cp, "w+")) == NULL)
adios (cp, "unable to write for copy");
while ((nrd = fread(buf, 1, sizeof(buf), sf)) > 0)
break;
case SCNMSG:
- case SCNENC:
default:
/*
* Run the external program hook on the message.
fflush (stdout);
break;
}
- charstring_free (scanl);
+ charstring_clear (scanl);
if (ferror(pf) || fclose (pf)) {
int e = errno;
scan_finished();
}
free (Maildir); /* From now on Maildir is just a flag - don't dref! */
+ charstring_free (scanl);
+ scanl = NULL;
}
scan_finished ();
if (msgnum == hghnum) {
inform("no messages incorporated, continuing...");
} else {
- /*
+ /*
* Lock the sequence file now, and loop to set the right flags
* in the folder structure
*/
projects / nmh / blobdiff