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
/
rcvtty.c
diff --git
a/uip/rcvtty.c
b/uip/rcvtty.c
index
f61f0b9
..
29f2dd9
100644
(file)
--- a/
uip/rcvtty.c
+++ b/
uip/rcvtty.c
@@
-14,7
+14,7
@@
#include <h/mh.h>
#include <h/signals.h>
#include <h/mh.h>
#include <h/signals.h>
-#include <h/m_setjmp.h>
+#include <setjmp.h>
#include <h/rcvmail.h>
#include <h/scansbr.h>
#include <h/tws.h>
#include <h/rcvmail.h>
#include <h/scansbr.h>
#include <h/tws.h>
@@
-22,7
+22,9
@@
#include <signal.h>
#include <fcntl.h>
#include <signal.h>
#include <fcntl.h>
+#ifdef HAVE_GETUTXENT
#include <utmpx.h>
#include <utmpx.h>
+#endif /* HAVE_GETUTXENT */
#define SCANFMT \
"%2(hour{dtimenow}):%02(min{dtimenow}): %<(size)%5(size) %>%<{encrypted}E%>\
#define SCANFMT \
"%2(hour{dtimenow}):%02(min{dtimenow}): %<(size)%5(size) %>%<{encrypted}E%>\
@@
-107,10
+109,10
@@
main (int argc, char **argv)
case HELPSW:
snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
print_help (buf, switches, 1);
case HELPSW:
snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
print_help (buf, switches, 1);
- done (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case BIFFSW:
biff = 1;
case BIFFSW:
biff = 1;
@@
-156,6
+158,7
@@
main (int argc, char **argv)
user = getusername();
user = getusername();
+#if HAVE_GETUTXENT
setutxent();
while ((utp = getutxent()) != NULL) {
if (utp->ut_type == USER_PROCESS && utp->ut_user[0] != 0
setutxent();
while ((utp = getutxent()) != NULL) {
if (utp->ut_type == USER_PROCESS && utp->ut_user[0] != 0
@@
-166,6
+169,7
@@
main (int argc, char **argv)
}
}
endutxent();
}
}
endutxent();
+#endif /* HAVE_GETUTXENT */
exit (RCV_MOK);
return 0; /* dead code to satisfy the compiler */
exit (RCV_MOK);
return 0; /* dead code to satisfy the compiler */
@@
-198,7
+202,7
@@
message_fd (char **vec)
return header_fd ();
} else if (child_id) {
/* parent process */
return header_fd ();
} else if (child_id) {
/* parent process */
- if (!m_setjmp (myctx)) {
+ if (!setjmp (myctx)) {
SIGNAL (SIGALRM, alrmser);
bytes = fstat(fileno (stdin), &st) != NOTOK ? (int) st.st_size : 100;
SIGNAL (SIGALRM, alrmser);
bytes = fstat(fileno (stdin), &st) != NOTOK ? (int) st.st_size : 100;
@@
-284,7
+288,7
@@
alert (char *tty, int md)
if (stat (ttyspec, &st) == NOTOK || (st.st_mode & mask) == 0)
return;
if (stat (ttyspec, &st) == NOTOK || (st.st_mode & mask) == 0)
return;
- if (!m_setjmp (myctx)) {
+ if (!setjmp (myctx)) {
SIGNAL (SIGALRM, alrmser);
alarm (2);
td = open (ttyspec, O_WRONLY);
SIGNAL (SIGALRM, alrmser);
alarm (2);
td = open (ttyspec, O_WRONLY);