#include <h/mh.h>
#include <h/utils.h>
#include <fcntl.h>
-
#include <h/dropsbr.h>
#include <h/popsbr.h>
#include <h/fmt_scan.h>
#include <h/signals.h>
#include <h/tws.h>
#include <h/mts.h>
-#include <errno.h>
-#include <signal.h>
#ifndef CYRUS_SASL
# define SASLminc(a) (a)
# define SASLminc(a) 0
#endif
-static struct swit switches[] = {
-#define AUDSW 0
- { "audit audit-file", 0 },
-#define NAUDSW 1
- { "noaudit", 0 },
-#define CHGSW 2
- { "changecur", 0 },
-#define NCHGSW 3
- { "nochangecur", 0 },
-#define FILESW 4
- { "file name", 0 },
-#define FORMSW 5
- { "form formatfile", 0 },
-#define FMTSW 6
- { "format string", 5 },
-#define HOSTSW 7
- { "host hostname", 0 },
-#define USERSW 8
- { "user username", 0 },
-#define PACKSW 9
- { "pack file", 0},
-#define NPACKSW 10
- { "nopack", 0 },
-#define PORTSW 11
- { "port name/number", 0 },
-#define SILSW 12
- { "silent", 0 },
-#define NSILSW 13
- { "nosilent", 0 },
-#define TRNCSW 14
- { "truncate", 0 },
-#define NTRNCSW 15
- { "notruncate", 0 },
-#define WIDTHSW 16
- { "width columns", 0 },
-#define VERSIONSW 17
- { "version", 0 },
-#define HELPSW 18
- { "help", 0 },
-#define SNOOPSW 19
- { "snoop", -5 },
-#define SASLSW 20
- { "sasl", SASLminc(-4) },
-#define SASLMECHSW 21
- { "saslmech", SASLminc(-8) },
-#define PROXYSW 22
- { "proxy command", 0 },
- { NULL, 0 }
-};
+#define INC_SWITCHES \
+ X("audit audit-file", 0, AUDSW) \
+ X("noaudit", 0, NAUDSW) \
+ X("changecur", 0, CHGSW) \
+ X("nochangecur", 0, NCHGSW) \
+ X("file name", 0, FILESW) \
+ X("form formatfile", 0, FORMSW) \
+ 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) \
+ X("truncate", 0, TRNCSW) \
+ X("notruncate", 0, NTRNCSW) \
+ X("width columns", 0, WIDTHSW) \
+ X("version", 0, VERSIONSW) \
+ X("help", 0, HELPSW) \
+ X("snoop", -5, SNOOPSW) \
+ X("sasl", SASLminc(-4), SASLSW) \
+ X("nosasl", SASLminc(-6), NOSASLSW) \
+ X("saslmech", SASLminc(-8), SASLMECHSW) \
+ X("proxy command", 0, PROXYSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(INC);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(INC, switches);
+#undef X
/*
* flags for the mail source
main (int argc, char **argv)
{
int chgflag = 1, trnflag = 1;
- int noisy = 1, width = 0;
+ int noisy = 1, width = -1;
int hghnum = 0, msgnum = 0;
int sasl = 0;
int incerr = 0; /* <0 if inc hits an error which means it should not truncate mailspool */
struct msgs *mp = NULL;
struct stat st, s1;
FILE *aud = NULL;
- char b[MAXPATHLEN + 1];
+ char b[PATH_MAX + 1];
char *maildir_copy = NULL; /* copy of mail directory because the static gets overwritten */
int nmsgs, nbytes;
- char *pass = NULL;
char *MAILHOST_env_variable;
done=inc_done;
SAVEGROUPPRIVS();
TRYDROPGROUPPRIVS();
-#ifdef LOCALE
- setlocale(LC_ALL, "");
-#endif
- invo_name = r1bindex (argv[0], '/');
-
- /* read user profile/context */
- context_read();
+ if (nmh_init(argv[0], 1)) { return 1; }
mts_init (invo_name);
arguments = getarguments (invo_name, argc, argv, 1);
if (pophost && *pophost)
host = pophost;
- if ((cp = getenv ("MHPOPDEBUG")) && *cp)
- snoop++;
-
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
case HELPSW:
snprintf (buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
print_help (buf, switches, 1);
- done (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case AUDSW:
if (!(cp = *argp++) || *cp == '-')
continue;
case PORTSW:
- if (!(host = *argp++) || *port == '-')
+ if (!(port = *argp++) || *port == '-')
adios (NULL, "missing argument to %s", argp[-2]);
continue;
case SASLSW:
sasl++;
continue;
+ case NOSASLSW:
+ sasl = 0;
+ continue;
case SASLMECHSW:
if (!(saslmech = *argp++) || *saslmech == '-')
* a POP server?
*/
if (inc_type == INC_POP) {
- if (user == NULL)
- user = getusername ();
- if (sasl)
- pass = getusername ();
- else
- ruserpass (host, &user, &pass);
+ struct nmh_creds creds = { 0, 0, 0 };
/*
* initialize POP connection
*/
- if (pop_init (host, port, user, pass, proxy, snoop, sasl,
- saslmech) == NOTOK)
+ nmh_get_credentials (host, user, sasl, &creds);
+ if (pop_init (host, port, creds.user, creds.password, proxy, snoop,
+ sasl, saslmech) == NOTOK)
adios (NULL, "%s", response);
/* Check if there are any messages */
adios (maildir, "unable to change directory to");
/* read folder and create message structure */
- if (!(mp = folder_read (folder)))
+ if (!(mp = folder_read (folder, 0)))
adios (NULL, "unable to read folder %s", folder);
go_to_it:
}
GETGROUPPRIVS(); /* Reset gid to lock mail file */
- in = lkfopen (newmail, "r");
+ in = lkfopenspool (newmail, "r");
DROPGROUPPRIVS();
if (in == NULL)
adios (NULL, "unable to lock and fopen %s", newmail);
else if (i == NOTOK)
chmod (audfile, m_gmprot ());
- fprintf (aud, from ? "<<inc>> %s -ms %s\n"
- : host ? "<<inc>> %s -host %s -user %s\n"
- : "<<inc>> %s\n",
- dtimenow (0), from ? from : host, user);
+ if (from)
+ fprintf (aud, "<<inc>> %s -ms %s\n", dtimenow(0), from);
+ else {
+ if (host)
+ fprintf (aud, "<<inc>> %s -host %s -user %s\n", dtimenow(0),
+ host, user);
+ else
+ fprintf (aud, "<<inc>> %s\n", dtimenow (0));
+ }
}
/* Get new format string */
fflush (stdout);
}
+
/*
* Get the mail from a POP server
*/
adios (NULL, "unable to fdopen %s", packfile);
} else {
hghnum = msgnum = mp->hghmsg;
- /*
- * Check if we have enough message space for all the new
- * messages. If not, then realloc the folder and add enough
- * space for all new messages plus 10 additional slots.
- */
- if (mp->hghmsg + nmsgs >= mp->hghoff
- && !(mp = folder_realloc (mp, mp->lowoff, mp->hghmsg + nmsgs + 10)))
- adios (NULL, "unable to allocate folder storage");
}
for (i = 1; i <= nmsgs; i++) {
+ charstring_t scanl = NULL;
+
msgnum++;
if (packfile) {
fseek (pf, 0L, SEEK_CUR);
pos = ftell (pf);
size = 0;
- fwrite (mmdlm1, 1, strlen (mmdlm1), pf);
+ if (fwrite (mmdlm1, 1, strlen (mmdlm1), pf) < strlen (mmdlm1)) {
+ advise (mmdlm1, "fwrite");
+ }
start = ftell (pf);
if (pop_retr (i, pop_pack) == NOTOK)
}
switch (incerr = scan (pf, msgnum, 0, nfs, width,
packfile ? 0 : msgnum == mp->hghmsg + 1 && chgflag,
- 1, NULL, stop - start, noisy)) {
+ 1, NULL, stop - start, noisy, &scanl)) {
case SCNEOF:
printf ("%*d empty\n", DMAXFOLDER, msgnum);
break;
case SCNENC:
default:
if (aud)
- fputs (scanl, aud);
+ fputs (charstring_buffer (scanl), aud);
if (noisy)
fflush (stdout);
- if (!packfile) {
- clear_msg_flags (mp, msgnum);
- set_exists (mp, msgnum);
- set_unseen (mp, msgnum);
- mp->msgflags |= SEQMOD;
- }
break;
}
+ charstring_free (scanl);
+
if (packfile) {
fseek (pf, stop, SEEK_SET);
- fwrite (mmdlm2, 1, strlen (mmdlm2), pf);
+ if (fwrite (mmdlm2, 1, strlen (mmdlm2), pf) < strlen (mmdlm1)) {
+ advise (mmdlm2, "fwrite");
+ }
if (fflush (pf) || ferror (pf)) {
int e = errno;
pop_quit ();
} else {
if (ferror(pf) || fclose (pf)) {
int e = errno;
- unlink (cp);
+ (void) m_unlink (cp);
pop_quit ();
errno = e;
adios (cp, "write error on");
if (trnflag && pop_dele (i) == NOTOK)
adios (NULL, "%s", response);
+
+ scan_finished();
}
if (pop_quit () == NOTOK)
* Get the mail from file (usually mail spool)
*/
if (inc_type == INC_FILE && Maildir == NULL) {
- m_unknown (in); /* the MAGIC invocation... */
+ scan_detect_mbox_style (in); /* the MAGIC invocation... */
hghnum = msgnum = mp->hghmsg;
for (;;) {
- /*
- * Check if we need to allocate more space for message status.
- * If so, then add space for an additional 100 messages.
- */
- if (msgnum >= mp->hghoff
- && !(mp = folder_realloc (mp, mp->lowoff, mp->hghoff + 100))) {
- advise (NULL, "unable to allocate folder storage");
- incerr = NOTOK;
- break;
- }
+ charstring_t scanl = NULL;
-#if 0
- /* copy file from spool to tmp file */
- tmpfilenam = m_scratch ("", invo_name);
- if ((fd = creat (tmpfilenam, m_gmprot ())) == NOTOK)
- adios (tmpfilenam, "unable to create");
- chmod (tmpfilenam, m_gmprot ());
- if (!(in2 = fdopen (fd, "r+")))
- adios (tmpfilenam, "unable to access");
- cpymsg (in, in2);
-
- /* link message into folder */
- newmsg = folder_addmsg(mp, tmpfilenam);
-#endif
/* create scanline for new message */
switch (incerr = scan (in, msgnum + 1, msgnum + 1, nfs, width,
- msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) {
+ msgnum == hghnum && chgflag, 1, NULL, 0L, noisy,
+ &scanl)) {
case SCNFAT:
case SCNEOF:
break;
(void)ext_hook("add-hook", b, (char *)0);
if (aud)
- fputs (scanl, aud);
+ fputs (charstring_buffer (scanl), aud);
if (noisy)
fflush (stdout);
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);
- mp->msgflags |= SEQMOD;
continue;
}
+ charstring_free (scanl);
+
/* If we get here there was some sort of error from scan(),
* so stop processing anything more from the spool.
*/
hghnum = msgnum = mp->hghmsg;
for (i = 0; i < num_maildir_entries; i++) {
+ charstring_t scanl = NULL;
+
msgnum++;
- /*
- * Check if we need to allocate more space for message status.
- * If so, then add space for an additional 100 messages.
- */
- if (msgnum >= mp->hghoff
- && !(mp = folder_realloc (mp, mp->lowoff, mp->hghoff + 100))) {
- advise (NULL, "unable to allocate folder storage");
- incerr = NOTOK;
- break;
- }
sp = Maildir[i].filename;
cp = getcpy (m_name (msgnum));
break;
if (ferror(sf) || fflush(pf) || ferror(pf)) {
int e = errno;
- fclose(pf); fclose(sf); unlink(cp);
+ fclose(pf); fclose(sf); (void) m_unlink(cp);
errno = e;
adios(cp, "copy error %s -> %s", sp, cp);
}
fseek (pf, 0L, SEEK_SET);
switch (incerr = scan (pf, msgnum, 0, nfs, width,
msgnum == mp->hghmsg + 1 && chgflag,
- 1, NULL, stop - start, noisy)) {
+ 1, NULL, stop - start, noisy, &scanl)) {
case SCNEOF:
printf ("%*d empty\n", DMAXFOLDER, msgnum);
break;
(void)ext_hook("add-hook", b, (char *)0);
if (aud)
- fputs (scanl, aud);
+ fputs (charstring_buffer (scanl), aud);
if (noisy)
fflush (stdout);
- if (!packfile) {
- clear_msg_flags (mp, msgnum);
- set_exists (mp, msgnum);
- set_unseen (mp, msgnum);
- mp->msgflags |= SEQMOD;
- }
break;
}
+ charstring_free (scanl);
+
if (ferror(pf) || fclose (pf)) {
int e = errno;
- unlink (cp);
+ (void) m_unlink (cp);
errno = e;
adios (cp, "write error on");
}
pf = NULL;
free (cp);
- if (trnflag && unlink (sp) == NOTOK)
+ if (trnflag && m_unlink (sp) == NOTOK)
adios (sp, "couldn't unlink");
free (sp); /* Free Maildir[i]->filename */
+
+ scan_finished();
}
free (Maildir); /* From now on Maildir is just a flag - don't dref! */
}
+ scan_finished ();
+
if (incerr < 0) { /* error */
if (locked) {
GETGROUPPRIVS(); /* Be sure we can unlock mail file */
- (void) lkfclose (in, newmail); in = NULL;
+ (void) lkfclosespool (in, newmail); in = NULL;
DROPGROUPPRIVS(); /* And then return us to normal privileges */
} else {
fclose (in); in = NULL;
close (newfd);
else
admonish (newmail, "error zero'ing");
- unlink(map_name(newmail));
+ (void) m_unlink(map_name(newmail));
}
} else {
if (noisy)
if (msgnum == hghnum) {
admonish (NULL, "no messages incorporated");
} else {
+ /*
+ * Lock the sequence file now, and loop to set the right flags
+ * in the folder structure
+ */
+
+ struct msgs *mp2;
+ int i;
+
context_replace (pfolder, folder); /* update current folder */
+
+ if ((mp2 = folder_read(folder, 1)) == NULL) {
+ admonish(NULL, "Unable to reread folder %s", folder);
+ goto skip;
+ }
+
+ /*
+ * Shouldn't happen, but just in case ...
+ */
+
+ if (msgnum >= mp2->hghoff
+ && !(mp2 = folder_realloc (mp2, mp2->lowoff, msgnum + 1))) {
+ advise (NULL, "unable to reallocate folder storage");
+ goto skip;
+ }
+
if (chgflag)
- mp->curmsg = hghnum + 1;
- mp->hghmsg = msgnum;
- if (mp->lowmsg == 0)
- mp->lowmsg = 1;
+ mp2->curmsg = hghnum + 1;
+ mp2->hghmsg = msgnum;
+
+ if (mp2->lowmsg == 0)
+ mp2->lowmsg = 1;
if (chgflag) /* sigh... */
- seq_setcur (mp, mp->curmsg);
+ seq_setcur (mp2, mp2->curmsg);
+
+ for (i = hghnum + 1; i <= msgnum; i++) {
+ clear_msg_flags (mp2, i);
+ set_exists (mp2, i);
+ set_unseen (mp2, i);
+ }
+ mp2->msgflags |= SEQMOD;
+ seq_setunseen(mp2, 0); /* Set the Unseen-Sequence */
+ seq_save(mp2); /* Save the sequence file */
+ folder_free(mp2);
}
+skip:
/*
* unlock the mail spool
if (inc_type == INC_FILE && Maildir == NULL) {
if (locked) {
GETGROUPPRIVS(); /* Be sure we can unlock mail file */
- (void) lkfclose (in, newmail); in = NULL;
+ (void) lkfclosespool (in, newmail); in = NULL;
DROPGROUPPRIVS(); /* And then return us to normal privileges */
} else {
fclose (in); in = NULL;
}
}
- seq_setunseen (mp, 0); /* set the Unseen-Sequence */
- seq_save (mp); /* synchronize sequences */
context_save (); /* save the context file */
done (0);
return 1;
}
-#if 0
-
-/*
- * Copy message message from spool into
- * temporary file. Massage the "From " line
- * while copying.
- */
-
-cpymsg (FILE *in, FILE *out)
-{
- int state;
- char *tmpbuf, name[NAMESZ];
-
- for (;;) {
- state = m_getfld (state, name, tmpbuf, rlwidth, in);
- switch (state) {
- case FLD:
- case FLDPLUS:
- break;
- case BODY:
- break;
- case LENERR:
- case FMTERR:
- break;
- case FILEEOF:
- break;
- default:
- }
- }
-}
-#endif /* if 0 */
-
-
static void
inc_done (int status)
{
if (locked)
{
GETGROUPPRIVS();
- lkfclose(in, newmail);
+ lkfclosespool(in, newmail);
DROPGROUPPRIVS();
}
exit (status);
char buffer[BUFSIZ];
snprintf (buffer, sizeof(buffer), "%s\n", s);
- for (j = 0; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
+ for ( ; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
continue;
- for (j = 0; (j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++)
+ for ( ; (j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++)
continue;
fputs (buffer, pf);
size += strlen (buffer) + 1;
projects / nmh / blobdiff