/*
* slocal.c -- asynchronously filter and deliver new mail
*
- * $Id$
- *
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
#include <h/dropsbr.h>
#include <h/rcvmail.h>
#include <h/signals.h>
+#include <setjmp.h>
#include <h/tws.h>
#include <h/mts.h>
#include <h/utils.h>
#include <sys/ioctl.h>
#include <fcntl.h>
-#ifdef INITGROUPS_HEADER
-#include INITGROUPS_HEADER
-#else
-/* On AIX 4.1, initgroups() is defined and even documented (giving the parameter
- types as char* and int), but doesn't have a prototype in any of the system
- header files. AIX 4.3, SunOS 4.1.3, and ULTRIX 4.2A have the same
- problem. */
-extern int initgroups(char*, int);
-#endif
+/* Hopefully, grp.h declares initgroups(). If we run into a platform
+ where it doesn't, we could consider declaring it here as well. */
+#include <grp.h>
/* This define is needed for Berkeley db v2 and above to
* make the header file expose the 'historical' ndbm APIs.
* harmless.
*/
#define DB_DBM_HSEARCH 1
+#ifdef DB_DBM_HSEARCH
+#endif /* Use DB_DBM_HSEARCH to prevent warning from gcc -Wunused-macros. */
#ifdef NDBM_HEADER
#include NDBM_HEADER
#endif
-#include <utmp.h>
-
-#ifndef HAVE_GETUTENT
-# ifndef UTMP_FILE
-# ifdef _PATH_UTMP
-# define UTMP_FILE _PATH_UTMP
-# else
-# define UTMP_FILE "/etc/utmp"
-# endif
-# endif
-#endif
+#ifdef HAVE_GETUTXENT
+#include <utmpx.h>
+#endif /* HAVE_GETUTXENT */
static struct swit switches[] = {
#define ADDRSW 0
static int usr_file (int, char *, int);
static int usr_pipe (int, char *, char *, char **, int);
static int usr_folder (int, char *);
-static RETSIGTYPE alrmser (int);
+static void alrmser (int);
static void get_sender (char *, char **);
static int copy_message (int, char *, int);
static void verbose_printf (char *fmt, ...);
adios (NULL, "-%s unknown", cp);
case HELPSW:
- snprintf (buf, sizeof(buf),
- "%s [switches] [address info sender]", invo_name);
+ snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
print_help (buf, switches, 0);
- done (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case ADDRSW:
if (!(addr = *argp++))/* allow -xyz arguments */
debug++;
continue;
}
- }
-
- switch (argp - (argv + 1)) {
- case 1:
- addr = cp;
- break;
-
- case 2:
- info = cp;
- break;
-
- case 3:
- sender = cp;
- break;
+ } else {
+ adios (NULL, "only switch arguments are supported");
}
}
verbose_printf ("(delivering to standard mail spool)\n");
/* last resort - deliver to standard mail spool */
-#ifdef SLOCAL_MBOX
return usr_file (fd, mbox, MBOX_FORMAT);
-#else
- return usr_file (fd, mbox, MMDF_FORMAT);
-#endif
}
* logged in.
*/
-#ifdef HAVE_GETUTENT
static int
logged_in (void)
{
- struct utmp * utp;
+#if HAVE_GETUTXENT
+ struct utmpx *utp;
if (utmped)
return utmped;
- setutent();
+ setutxent();
- while ((utp = getutent()) != NULL) {
- if (
-#ifdef HAVE_UTMP_UT_TYPE
- utp->ut_type == USER_PROCESS
- &&
-#endif
- utp->ut_name[0] != 0
- && strncmp (user, utp->ut_name, sizeof(utp->ut_name)) == 0) {
+ while ((utp = getutxent()) != NULL) {
+ if ( utp->ut_type == USER_PROCESS && utp->ut_user[0] != 0
+ && strncmp (user, utp->ut_user, sizeof(utp->ut_user)) == 0) {
if (debug)
continue;
- endutent();
+ endutxent();
return (utmped = DONE);
}
}
- endutent();
- return (utmped = NOTOK);
-}
-#else
-static int
-logged_in (void)
-{
- struct utmp ut;
- FILE *uf;
-
- if (utmped)
- return utmped;
-
- if ((uf = fopen (UTMP_FILE, "r")) == NULL)
- return NOTOK;
-
- while (fread ((char *) &ut, sizeof(ut), 1, uf) == 1) {
- if (ut.ut_name[0] != 0
- && strncmp (user, ut.ut_name, sizeof(ut.ut_name)) == 0) {
- if (debug)
- continue;
- fclose (uf);
- return (utmped = DONE);
- }
- }
-
- fclose (uf);
+ endutxent();
+#endif /* HAVE_GETUTXENT */
return (utmped = NOTOK);
}
-#endif
#define check(t,a,b) if (t < a || t > b) return -1
#define cmpar(h1,m1,h2,m2) if (h1 < h2 || (h1 == h2 && m1 < m2)) return 0
}
/* close and unlock file */
- mbx_close (mailbox, md);
+ if (mbx_close (mailbox, md) == NOTOK) {
+ if (verbose)
+ adorn ("", "error closing:");
+ return -1;
+ }
if (verbose)
verbose_printf (", success.\n");
default:
/* parent process */
- if (!setjmp (myctx)) {
+ if (! setjmp (myctx)) {
SIGNAL (SIGALRM, alrmser);
bytes = fstat (fd, &st) != -1 ? (int) st.st_size : 100;
* Ruthlessly kill the child and anything
* else in its process group.
*/
- KILLPG(child_id, SIGKILL);
+ killpg(child_id, SIGKILL);
if (verbose)
verbose_printf (", timed-out; terminated\n");
return -1;
}
-static RETSIGTYPE
+static void
alrmser (int i)
{
-#ifndef RELIABLE_SIGNALS
- SIGNAL (SIGALRM, alrmser);
-#endif
+ NMH_UNUSED (i);
longjmp (myctx, DONE);
}
int i, first = 1, fd1, fd2;
char buffer[BUFSIZ];
FILE *qfp, *ffp;
+ char *tfile = NULL;
- strcpy (tmpfil, m_tmpfil (invo_name));
-
- /* open temporary file to put message in */
- if ((fd1 = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == -1)
- return -1;
+ tfile = m_mktemp2(NULL, invo_name, &fd1, NULL);
+ if (tfile == NULL) return -1;
+ fchmod(fd1, 0600);
+ strncpy (tmpfil, tfile, BUFSIZ);
if (!fold) {
while ((i = read (qd, buffer, sizeof(buffer))) > 0)
if (first) {
first = 0;
if (!strncmp (buffer, "From ", i)) {
-#ifdef RPATHS
- char *fp, *cp, *hp, *ep;
-#endif
/* get copy of envelope information ("From " line) */
envelope = getcpy (buffer);
goto fputs_error;
#endif
-#ifdef RPATHS
- /*
- * Now create a "Return-Path:" line
- * from the "From " line.
- */
- hp = cp = strchr(fp = envelope + i, ' ');
- while ((hp = strchr(++hp, 'r')))
- if (uprf (hp, "remote from")) {
- hp = strrchr(hp, ' ');
- break;
- }
- if (hp) {
- /* return path for UUCP style addressing */
- ep = strchr(++hp, '\n');
- snprintf (buffer, sizeof(buffer), "Return-Path: %.*s!%.*s\n",
- (int)(ep - hp), hp, (int)(cp - fp), fp);
- } else {
- /* return path for standard domain addressing */
- snprintf (buffer, sizeof(buffer), "Return-Path: %.*s\n",
- (int)(cp - fp), fp);
- }
-
- /* Add Return-Path header to message */
- fputs (buffer, ffp);
- if (ferror (ffp))
- goto fputs_error;
-#endif
/* Put the delivery date in message */
fputs (ddate, ffp);
if (ferror (ffp))
projects / mmh / blobdiff