projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* h/mh.h, h/prototypes.h, uip/mhbuildsbr.c, uip/send.c,
[mmh]
/
uip
/
slocal.c
diff --git
a/uip/slocal.c
b/uip/slocal.c
index
ca23fd8
..
275eedd
100644
(file)
--- a/
uip/slocal.c
+++ b/
uip/slocal.c
@@
-16,9
+16,6
@@
*
* to their $HOME/.forward file.
*
*
* to their $HOME/.forward file.
*
- * Under MMDF-I, users should (symbolically) link
- * /usr/local/nmh/lib/slocal to $HOME/bin/rcvmail.
- *
*/
/* Changed to use getutent() and friends. Assumes that when getutent() exists,
*/
/* Changed to use getutent() and friends. Assumes that when getutent() exists,
@@
-32,6
+29,7
@@
#include <h/signals.h>
#include <h/tws.h>
#include <h/mts.h>
#include <h/signals.h>
#include <h/tws.h>
#include <h/mts.h>
+#include <h/utils.h>
#include <pwd.h>
#include <signal.h>
#include <pwd.h>
#include <signal.h>
@@
-48,20
+46,14
@@
extern int initgroups(char*, int);
#endif
extern int initgroups(char*, int);
#endif
-
-#ifdef HAVE_DB1_NDBM_H
-#include <db1/ndbm.h>
-#else
-#ifdef HAVE_GDBM_NDBM_H
-#include <gdbm/ndbm.h>
-#else
-#if defined(HAVE_DB_H) && defined(HAVE_LIBDB)
+/* This define is needed for Berkeley db v2 and above to
+ * make the header file expose the 'historical' ndbm APIs.
+ * We define it unconditionally because this is simple and
+ * harmless.
+ */
#define DB_DBM_HSEARCH 1
#define DB_DBM_HSEARCH 1
-#include <db.h>
-#else
-#include <ndbm.h>
-#endif
-#endif
+#ifdef NDBM_HEADER
+#include NDBM_HEADER
#endif
#include <utmp.h>
#endif
#include <utmp.h>
@@
-1196,10
+1188,6
@@
usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
status = pidwait (child_id, 0);
alarm (0);
status = pidwait (child_id, 0);
alarm (0);
-#ifdef MMDFI
- if (status == RP_MOK || status == RP_OK)
- status = 0;
-#endif
if (verbose) {
if (status == 0)
verbose_printf (", success.\n");
if (verbose) {
if (status == 0)
verbose_printf (", success.\n");