projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ml script to docs/contrib.
[mmh]
/
uip
/
slocal.c
diff --git
a/uip/slocal.c
b/uip/slocal.c
index
5026d82
..
80620a7
100644
(file)
--- a/
uip/slocal.c
+++ b/
uip/slocal.c
@@
-25,7
+25,7
@@
#include <h/dropsbr.h>
#include <h/rcvmail.h>
#include <h/signals.h>
#include <h/dropsbr.h>
#include <h/rcvmail.h>
#include <h/signals.h>
-#include <h/m_setjmp.h>
+#include <setjmp.h>
#include <h/tws.h>
#include <h/mts.h>
#include <h/utils.h>
#include <h/tws.h>
#include <h/mts.h>
#include <h/utils.h>
@@
-51,7
+51,9
@@
#include NDBM_HEADER
#endif
#include NDBM_HEADER
#endif
+#ifdef HAVE_GETUTXENT
#include <utmpx.h>
#include <utmpx.h>
+#endif /* HAVE_GETUTXENT */
static struct swit switches[] = {
#define ADDRSW 0
static struct swit switches[] = {
#define ADDRSW 0
@@
-223,10
+225,10
@@
main (int argc, char **argv)
snprintf (buf, sizeof(buf),
"%s [switches] [address info sender]", invo_name);
print_help (buf, switches, 0);
snprintf (buf, sizeof(buf),
"%s [switches] [address info sender]", invo_name);
print_help (buf, switches, 0);
- done (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case ADDRSW:
if (!(addr = *argp++))/* allow -xyz arguments */
case ADDRSW:
if (!(addr = *argp++))/* allow -xyz arguments */
@@
-930,6
+932,7
@@
lookup (struct pair *pairs, char *key)
static int
logged_in (void)
{
static int
logged_in (void)
{
+#if HAVE_GETUTXENT
struct utmpx *utp;
if (utmped)
struct utmpx *utp;
if (utmped)
@@
-948,6
+951,7
@@
logged_in (void)
}
endutxent();
}
endutxent();
+#endif /* HAVE_GETUTXENT */
return (utmped = NOTOK);
}
return (utmped = NOTOK);
}
@@
-1123,7
+1127,7
@@
usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
default:
/* parent process */
default:
/* parent process */
- if (! m_setjmp (myctx)) {
+ if (! setjmp (myctx)) {
SIGNAL (SIGALRM, alrmser);
bytes = fstat (fd, &st) != -1 ? (int) st.st_size : 100;
SIGNAL (SIGALRM, alrmser);
bytes = fstat (fd, &st) != -1 ? (int) st.st_size : 100;