#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
-extern m_getfld_state_t gstate;
-
-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 NOSASLSW 21
- { "nosasl", SASLminc(-6) },
-#define SASLMECHSW 22
- { "saslmech", SASLminc(-8) },
-#define PROXYSW 23
- { "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
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;
* 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);
}
- m_getfld_state_init (&gstate);
/*
* 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++) {
fputs (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;
}
if (packfile) {
* Get the mail from file (usually mail spool)
*/
if (inc_type == INC_FILE && Maildir == NULL) {
- m_unknown (gstate, 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;
- }
-
/* create scanline for new message */
switch (incerr = scan (in, msgnum + 1, msgnum + 1, nfs, width,
msgnum == hghnum && chgflag, 1, NULL, 0L, 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;
}
/* If we get here there was some sort of error from scan(),
hghnum = msgnum = mp->hghmsg;
for (i = 0; i < num_maildir_entries; i++) {
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));
fputs (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;
}
if (ferror(pf) || fclose (pf)) {
free (Maildir); /* From now on Maildir is just a flag - don't dref! */
}
- m_getfld_state_destroy (&gstate);
+ 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;
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 (locked)
{
GETGROUPPRIVS();
- lkfclose(in, newmail);
+ lkfclosespool(in, newmail);
DROPGROUPPRIVS();
}
exit (status);
projects / nmh / blobdiff