X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=07440b123f3cd5e56f668dc28abcbbd45ba5c0dd;hb=bfad64befb4d6696fdfb63b119666eec4bac6fb3;hp=8f99b7bdb3191197fa0c21d85ca3b07f7dd2bc8c;hpb=0ce746a6f402fd4a6a4bbdedd5ae65993ef56c38;p=mmh diff --git a/uip/inc.c b/uip/inc.c index 8f99b7b..07440b1 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -30,11 +30,8 @@ #include #include -#ifdef POP -# include -# include -#endif - +#include +#include #include #include #include @@ -43,12 +40,6 @@ #include #include -#ifndef POP -# define POPminc(a) (a) -#else -# define POPminc(a) 0 -#endif - #ifndef CYRUS_SASL # define SASLminc(a) (a) #else @@ -71,15 +62,15 @@ static struct swit switches[] = { #define FMTSW 6 { "format string", 5 }, #define HOSTSW 7 - { "host hostname", POPminc (-4) }, + { "host hostname", 0 }, #define USERSW 8 - { "user username", POPminc (-4) }, + { "user username", 0 }, #define PACKSW 9 - { "pack file", POPminc (-4) }, + { "pack file", 0}, #define NPACKSW 10 - { "nopack", POPminc (-6) }, + { "nopack", 0 }, #define PORTSW 11 - { "port name/number", POPminc (-4) }, + { "port name/number", 0 }, #define SILSW 12 { "silent", 0 }, #define NSILSW 13 @@ -98,10 +89,12 @@ static struct swit switches[] = { { "snoop", -5 }, #define SASLSW 20 { "sasl", SASLminc(-4) }, -#define SASLMECHSW 21 +#define NOSASLSW 21 + { "nosasl", SASLminc(-6) }, +#define SASLMECHSW 22 { "saslmech", SASLminc(-8) }, -#define PROXYSW 22 - { "proxy command", POPminc(-5) }, +#define PROXYSW 23 + { "proxy command", 0 }, { NULL, 0 } }; @@ -112,33 +105,34 @@ static struct swit switches[] = { #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; -#ifdef POP extern char response[]; -static char *packfile = NULL; static int size; static long pos; -static long start; -static long stop; static int mbx_style = MMDF_FORMAT; static int pd = NOTOK; + +static long start; +static long stop; + +static char *packfile = NULL; static FILE *pf = NULL; -#endif /* POP */ /* This is an attempt to simplify things by putting all the * privilege ops into macros. * *GROUPPRIVS() is related to handling the setgid MAIL property, * and only applies if MAILGROUP is defined. - * *USERPRIVS() is related to handling the setuid root property, - * and only applies if POP is defined [why does POP => setuid root?] * Basically, SAVEGROUPPRIVS() is called right at the top of main() * to initialise things, and then DROPGROUPPRIVS() and GETGROUPPRIVS() - * do the obvious thing. TRYDROPGROUPPRIVS() has to be safe to call - * before DROPUSERPRIVS() is called [this is needed because setgid() - * sets both effective and real uids if euid is root.] + * do the obvious thing. * * There's probably a better implementation if we're allowed to use * BSD-style setreuid() rather than using POSIX saved-ids. @@ -155,15 +149,7 @@ static FILE *pf = NULL; */ #ifdef MAILGROUP static int return_gid; -#ifndef POP -/* easy case; we're not setuid root, so can drop group privs - * immediately. - */ #define TRYDROPGROUPPRIVS() DROPGROUPPRIVS() -#else /* POP ie we are setuid root */ -#define TRYDROPGROUPPRIVS() \ -if (geteuid() != 0) DROPGROUPPRIVS() -#endif #define DROPGROUPPRIVS() setgid(getgid()) #define GETGROUPPRIVS() setgid(return_gid) #define SAVEGROUPPRIVS() return_gid = getegid() @@ -186,12 +172,21 @@ static FILE *in; char *map_name(char *); static void inc_done(int) NORETURN; -#ifdef POP static int pop_action(char *); static int pop_pack(char *); static int map_count(void); -#endif +int +maildir_srt(const void *va, const void *vb) +{ + const struct Maildir_entry *a = va, *b = vb; + if (a->mtime > b->mtime) + return 1; + else if (a->mtime < b->mtime) + return -1; + else + return 0; +} int main (int argc, char **argv) @@ -209,18 +204,12 @@ main (int argc, char **argv) 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 */ -#ifdef POP int nmsgs, nbytes; char *pass = NULL; char *MAILHOST_env_variable; -#endif - -#ifdef MHE - FILE *mhe = NULL; -#endif done=inc_done; @@ -242,7 +231,6 @@ main (int argc, char **argv) arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; -#ifdef POP /* * Scheme is: * use MAILHOST environment variable if present, @@ -259,10 +247,6 @@ main (int argc, char **argv) if (pophost && *pophost) host = pophost; - if ((cp = getenv ("MHPOPDEBUG")) && *cp) - snoop++; -#endif /* POP */ - while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, switches)) { @@ -275,10 +259,10 @@ main (int argc, char **argv) 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 == '-') @@ -353,7 +337,7 @@ main (int argc, char **argv) continue; case PORTSW: - if (!(host = *argp++) || *port == '-') + if (!(port = *argp++) || *port == '-') adios (NULL, "missing argument to %s", argp[-2]); continue; @@ -363,18 +347,11 @@ main (int argc, char **argv) continue; case PACKSW: -#ifndef POP - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); -#else /* POP */ if (!(packfile = *argp++) || *packfile == '-') adios (NULL, "missing argument to %s", argp[-2]); -#endif /* POP */ continue; case NPACKSW: -#ifdef POP packfile = NULL; -#endif /* POP */ continue; case SNOOPSW: @@ -384,6 +361,9 @@ main (int argc, char **argv) case SASLSW: sasl++; continue; + case NOSASLSW: + sasl = 0; + continue; case SASLMECHSW: if (!(saslmech = *argp++) || *saslmech == '-') @@ -408,10 +388,8 @@ main (int argc, char **argv) /* NOTE: above this point you should use TRYDROPGROUPPRIVS(), * not DROPGROUPPRIVS(). */ -#ifdef POP if (host && !*host) host = NULL; -#endif /* POP */ /* guarantee dropping group priveleges; we might not have done so earlier */ DROPGROUPPRIVS(); @@ -421,14 +399,11 @@ main (int argc, char **argv) */ if (from) inc_type = INC_FILE; -#ifdef POP else if (host) inc_type = INC_POP; -#endif else inc_type = INC_FILE; -#ifdef POP /* * Are we getting the mail from * a POP server? @@ -457,7 +432,6 @@ main (int argc, char **argv) adios (NULL, "no mail to incorporate"); } } -#endif /* POP */ /* * We will get the mail from a file @@ -476,6 +450,55 @@ main (int argc, char **argv) } if (stat (newmail, &s1) == NOTOK || s1.st_size == 0) adios (NULL, "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) + adios (NULL, "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); + 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) + adios (NULL, "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); + 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) + adios (NULL, "no mail to incorporate"); + num_maildir_entries = i; + qsort (Maildir, num_maildir_entries, sizeof(*Maildir), maildir_srt); + } if ((cp = strdup(newmail)) == (char *)0) adios (NULL, "error allocating memory to copy newmail"); @@ -483,11 +506,9 @@ main (int argc, char **argv) newmail = cp; } -#ifdef POP /* skip the folder setup */ if ((inc_type == INC_POP) && packfile) goto go_to_it; -#endif /* POP */ if (!context_find ("path")) free (path ("./", TFOLDER)); @@ -515,11 +536,9 @@ main (int argc, char **argv) if (!(mp = folder_read (folder))) adios (NULL, "unable to read folder %s", folder); -#ifdef POP go_to_it: -#endif /* POP */ - if (inc_type == INC_FILE) { + if (inc_type == INC_FILE && Maildir == NULL) { if (access (newmail, W_OK) != NOTOK) { locked++; if (trnflag) { @@ -554,30 +573,11 @@ go_to_it: else if (i == NOTOK) chmod (audfile, m_gmprot ()); -#ifdef POP fprintf (aud, from ? "<> %s -ms %s\n" : host ? "<> %s -host %s -user %s\n" : "<> %s\n", dtimenow (0), from ? from : host, user); -#else /* POP */ - fprintf (aud, from ? "<> %s -ms %s\n" : "<> %s\n", - dtimenow (0), from); -#endif /* POP */ - } - -#ifdef MHE - if (context_find ("mhe")) { - int i; - cp = concat (maildir, "/++", NULL); - i = stat (cp, &st); - if ((mhe = fopen (cp, "a")) == NULL) - admonish (cp, "unable to append to"); - else - if (i == NOTOK) - chmod (cp, m_gmprot ()); - free (cp); } -#endif /* MHE */ /* Get new format string */ nfs = new_fs (form, format, FORMAT); @@ -587,7 +587,6 @@ go_to_it: fflush (stdout); } -#ifdef POP /* * Get the mail from a POP server */ @@ -674,10 +673,6 @@ go_to_it: default: if (aud) fputs (scanl, aud); -# ifdef MHE - if (mhe) - fputs (scanl, mhe); -# endif /* MHE */ if (noisy) fflush (stdout); if (!packfile) { @@ -720,12 +715,11 @@ go_to_it: pd = NOTOK; } } -#endif /* POP */ /* * Get the mail from file (usually mail spool) */ - if (inc_type == INC_FILE) { + if (inc_type == INC_FILE && Maildir == NULL) { m_unknown (in); /* the MAGIC invocation... */ hghnum = msgnum = mp->hghmsg; for (;;) { @@ -740,19 +734,6 @@ go_to_it: break; } -#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)) { @@ -785,10 +766,6 @@ go_to_it: if (aud) fputs (scanl, aud); -#ifdef MHE - if (mhe) - fputs (scanl, mhe); -#endif /* MHE */ if (noisy) fflush (stdout); @@ -808,6 +785,106 @@ go_to_it: */ break; } + } else if (inc_type == INC_FILE) { /* Maildir inbox to process */ + char *sp; + FILE *sf; + int i; + + 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)); + pf = NULL; + if (!trnflag || link(sp, cp) == -1) { + static char buf[65536]; + size_t nrd; + + if ((sf = fopen (sp, "r")) == NULL) + 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) + if (fwrite(buf, 1, nrd, pf) != nrd) + break; + if (ferror(sf) || fflush(pf) || ferror(pf)) { + int e = errno; + fclose(pf); fclose(sf); unlink(cp); + errno = e; + adios(cp, "copy error %s -> %s", sp, cp); + } + fclose (sf); + sf = NULL; + } + if (pf == NULL && (pf = fopen (cp, "r")) == NULL) + adios (cp, "not available"); + chmod (cp, m_gmprot ()); + + fseek (pf, 0L, SEEK_SET); + switch (incerr = scan (pf, msgnum, 0, nfs, width, + msgnum == mp->hghmsg + 1 && chgflag, + 1, NULL, stop - start, noisy)) { + case SCNEOF: + printf ("%*d empty\n", DMAXFOLDER, msgnum); + break; + + case SCNFAT: + trnflag = 0; + noisy++; + /* advise (cp, "unable to read"); already advised */ + /* fall thru */ + + case SCNERR: + case SCNNUM: + break; + + case SCNMSG: + case SCNENC: + default: + /* + * 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); + 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)) { + int e = errno; + unlink (cp); + errno = e; + adios (cp, "write error on"); + } + pf = NULL; + free (cp); + + if (trnflag && unlink (sp) == NOTOK) + adios (sp, "couldn't unlink"); + free (sp); /* Free Maildir[i]->filename */ + } + free (Maildir); /* From now on Maildir is just a flag - don't dref! */ } if (incerr < 0) { /* error */ @@ -824,23 +901,16 @@ go_to_it: if (aud) fclose (aud); -#ifdef MHE - if (mhe) - fclose (mhe); -#endif /* MHE */ - if (noisy) fflush (stdout); -#ifdef POP if ((inc_type == INC_POP) && packfile) done (0); -#endif /* POP */ /* * truncate file we are incorporating from */ - if (inc_type == INC_FILE) { + if (inc_type == INC_FILE && Maildir == NULL) { if (trnflag) { if (stat (newmail, &st) != NOTOK && s1.st_mtime != st.st_mtime) advise (NULL, "new messages have arrived!\007"); @@ -874,7 +944,7 @@ go_to_it: /* * unlock the mail spool */ - if (inc_type == INC_FILE) { + if (inc_type == INC_FILE && Maildir == NULL) { if (locked) { GETGROUPPRIVS(); /* Be sure we can unlock mail file */ (void) lkfclose (in, newmail); in = NULL; @@ -892,46 +962,11 @@ go_to_it: } -#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) { -#ifdef POP if (packfile && pd != NOTOK) mbx_close (packfile, pd); -#endif /* POP */ if (locked) { GETGROUPPRIVS(); @@ -941,7 +976,6 @@ inc_done (int status) exit (status); } -#ifdef POP static int pop_action (char *s) { @@ -985,4 +1019,3 @@ map_count (void) close (md); return (d.d_id); } -#endif /* POP */