X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frcvtty.c;h=577873fa2bd265393c8f197ca8c1d2d5cf8d6fd0;hp=8b04d61d0c8bf0e14fbfd8763f6a4a5d364bcc91;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hpb=f480c03187724e54e5391ee61b810827da319a6c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 8b04d61..577873f 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -1,4 +1,3 @@
-
 /*
  * rcvtty.c -- a rcvmail program (a lot like rcvalert) handling IPC ttys
  *
@@ -33,33 +32,33 @@
 # endif
 #endif
 
-#define	SCANFMT	\
+#define SCANFMT \
 "%2(hour{dtimenow}):%02(min{dtimenow}): %<(size)%5(size) %>%<{encrypted}E%>\
 %<(mymbox{from})%<{to}To:%14(friendly{to})%>%>%<(zero)%17(friendly{from})%>  \
 %{subject}%<{body}<<%{body}>>%>"
 
 static struct swit switches[] = {
-#define	BIFFSW	0
-    { "biff", 0 },
-#define	FORMSW	1
-    { "form formatfile", 0 },
-#define	FMTSW	2
-    { "format string", 5 },
+#define BIFFSW  0
+	{ "biff", 0 },
+#define FORMSW  1
+	{ "form formatfile", 0 },
+#define FMTSW  2
+	{ "format string", 5 },
 #define WIDTHSW 3
-    { "width columns", 0 },
-#define NLSW    4
-    { "newline", 0 },
+	{ "width columns", 0 },
+#define NLSW  4
+	{ "newline", 0 },
 #define NNLSW   5
-    { "nonewline", 0 },
-#define BELSW	6
-    { "bell", 0 },
-#define	NBELSW	7
-    { "nobell", 0 },
+	{ "nonewline", 0 },
+#define BELSW  6
+	{ "bell", 0 },
+#define NBELSW  7
+	{ "nobell", 0 },
 #define VERSIONSW 8
-    { "version", 0 },
-#define	HELPSW	9
-    { "help", 0 },
-    { NULL, 0 }
+	{ "version", 0 },
+#define HELPSW  9
+	{ "help", 0 },
+	{ NULL, 0 }
 };
 
 static jmp_buf myctx;
@@ -87,120 +86,120 @@ static void alert (char *, int);
 int
 main (int argc, char **argv)
 {
-    int md, vecp = 0;
-    char *cp, *user, buf[BUFSIZ], tty[BUFSIZ];
-    char **argp, **arguments, *vec[MAXARGS];
+	int md, vecp = 0;
+	char *cp, *user, buf[BUFSIZ], tty[BUFSIZ];
+	char **argp, **arguments, *vec[MAXARGS];
 #ifdef HAVE_GETUTENT
-    struct utmp * utp;
+	struct utmp * utp;
 #else
-    struct utmp ut;
-    register FILE *uf;
+	struct utmp ut;
+	register FILE *uf;
 #endif
 
 #ifdef LOCALE
-    setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 #endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
-
-    mts_init (invo_name);
-    arguments = getarguments (invo_name, argc, argv, 1);
-    argp = arguments;
-
-    while ((cp = *argp++)) {
-	if (*cp == '-') {
-	    switch (smatch (++cp, switches)) {
-		case AMBIGSW: 
-		    ambigsw (cp, switches);
-		    done (1);
-		case UNKWNSW: 
-		    vec[vecp++] = --cp;
-		    continue;
-
-		case HELPSW: 
-		    snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
-		    print_help (buf, switches, 1);
-		    done (1);
-		case VERSIONSW:
-		    print_version(invo_name);
-		    done (1);
-
-		case BIFFSW:
-		    biff = 1;
-		    continue;
-
-		case FORMSW: 
-		    if (!(form = *argp++) || *form == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
-		    format = NULL;
-		    continue;
-		case FMTSW: 
-		    if (!(format = *argp++) || *format == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
-		    form = NULL;
-		    continue;
-
-		case WIDTHSW:
-		    if (!(cp = *argp++) || *cp == '-')
-			adios(NULL, "missing argument to %s", argp[-2]);
-		    width = atoi(cp);
-		    continue;
-                case NLSW:
-                    newline = 1;
-                    continue;
-                case NNLSW:
-                    newline = 0;
-                    continue;
-                case BELSW:
-                    bell = 1;
-                    continue;
-                case NBELSW:
-                    bell = 0;
-                    continue;
-
-	    }
+	invo_name = r1bindex (argv[0], '/');
+
+	/* read user profile/context */
+	context_read();
+
+	mts_init (invo_name);
+	arguments = getarguments (invo_name, argc, argv, 1);
+	argp = arguments;
+
+	while ((cp = *argp++)) {
+		if (*cp == '-') {
+			switch (smatch (++cp, switches)) {
+				case AMBIGSW:
+					ambigsw (cp, switches);
+					done (1);
+				case UNKWNSW:
+					vec[vecp++] = --cp;
+					continue;
+
+				case HELPSW:
+					snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
+					print_help (buf, switches, 1);
+					done (1);
+				case VERSIONSW:
+					print_version(invo_name);
+					done (1);
+
+				case BIFFSW:
+					biff = 1;
+					continue;
+
+				case FORMSW:
+					if (!(form = *argp++) || *form == '-')
+						adios (NULL, "missing argument to %s", argp[-2]);
+					format = NULL;
+					continue;
+				case FMTSW:
+					if (!(format = *argp++) || *format == '-')
+						adios (NULL, "missing argument to %s", argp[-2]);
+					form = NULL;
+					continue;
+
+				case WIDTHSW:
+					if (!(cp = *argp++) || *cp == '-')
+						adios(NULL, "missing argument to %s", argp[-2]);
+					width = atoi(cp);
+					continue;
+				case NLSW:
+					newline = 1;
+					continue;
+				case NNLSW:
+					newline = 0;
+					continue;
+				case BELSW:
+					bell = 1;
+					continue;
+				case NBELSW:
+					bell = 0;
+					continue;
+
+			}
+		}
+		vec[vecp++] = cp;
 	}
-	vec[vecp++] = cp;
-    }
-    vec[vecp] = 0;
+	vec[vecp] = 0;
 
-    if ((md = vecp ? message_fd (vec) : header_fd ()) == NOTOK)
-	exit (RCV_MBX);
+	if ((md = vecp ? message_fd (vec) : header_fd ()) == NOTOK)
+		exit (RCV_MBX);
 
-    user = getusername();
+	user = getusername();
 
 #ifdef HAVE_GETUTENT
-    setutent();
-    while ((utp = getutent()) != NULL) {
-        if (
+	setutent();
+	while ((utp = getutent()) != NULL) {
+		if (
 #ifdef HAVE_STRUCT_UTMP_UT_TYPE
-	       utp->ut_type == USER_PROCESS 
-	       &&
+			   utp->ut_type == USER_PROCESS
+			   &&
 #endif
-               utp->ut_name[0] != 0
-               && utp->ut_line[0] != 0
-               && strncmp (user, utp->ut_name, sizeof(utp->ut_name)) == 0) {
-            strncpy (tty, utp->ut_line, sizeof(utp->ut_line));
-	    alert (tty, md);
-        }
-    }
-    endutent();
-#else
-    if ((uf = fopen (UTMP_FILE, "r")) == NULL)
-	exit (RCV_MBX);
-    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) {
-	    strncpy (tty, ut.ut_line, sizeof(ut.ut_line));
-	    alert (tty, md);
+			   utp->ut_name[0] != 0
+			   && utp->ut_line[0] != 0
+			   && strncmp (user, utp->ut_name, sizeof(utp->ut_name)) == 0) {
+			strncpy (tty, utp->ut_line, sizeof(utp->ut_line));
+			alert (tty, md);
+		}
 	}
-    fclose (uf);
+	endutent();
+#else
+	if ((uf = fopen (UTMP_FILE, "r")) == NULL)
+		exit (RCV_MBX);
+	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) {
+			strncpy (tty, ut.ut_line, sizeof(ut.ut_line));
+			alert (tty, md);
+		}
+	fclose (uf);
 #endif
 
-    exit (RCV_MOK);
-    return 0;  /* dead code to satisfy the compiler */
+	exit (RCV_MOK);
+	return 0;  /* dead code to satisfy the compiler */
 }
 
 
@@ -208,140 +207,140 @@ static RETSIGTYPE
 alrmser (int i)
 {
 #ifndef RELIABLE_SIGNALS
-    SIGNAL (SIGALRM, alrmser);
+	SIGNAL (SIGALRM, alrmser);
 #endif
 
-    longjmp (myctx, 1);
+	longjmp (myctx, 1);
 }
 
 
 static int
 message_fd (char **vec)
 {
-    pid_t child_id;
-    int bytes, fd, seconds;
-    char tmpfil[BUFSIZ];
-    struct stat st;
+	pid_t child_id;
+	int bytes, fd, seconds;
+	char tmpfil[BUFSIZ];
+	struct stat st;
 
 #ifdef HAVE_MKSTEMP
-    fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
+	fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
 #else
-    unlink (mktemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil))));
-    if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
-	return header_fd ();
+	unlink (mktemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil))));
+	if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
+		return header_fd ();
 #endif
-    unlink (tmpfil);
-
-    if ((child_id = vfork()) == NOTOK) {
-	/* fork error */
-	close (fd);
-	return header_fd ();
-    } else if (child_id) {
-	/* parent process */
-	if (!setjmp (myctx)) {
-	    SIGNAL (SIGALRM, alrmser);
-	    bytes = fstat(fileno (stdin), &st) != NOTOK ? (int) st.st_size : 100;
-
-	    /* amount of time to wait depends on message size */
-	    if (bytes <= 100) {
-		/* give at least 5 minutes */
-		seconds = 300;
-	    } else if (bytes >= 90000) {
-		/* but 30 minutes should be long enough */
-		seconds = 1800;
-	    } else {
-		seconds = (bytes / 60) + 300;
-	    }
-	    alarm ((unsigned int) seconds);
-	    pidwait(child_id, OK);
-	    alarm (0);
-
-	    if (fstat (fd, &st) != NOTOK && st.st_size > (off_t) 0)
-		return fd;
-	} else {
-	    /*
-	     * Ruthlessly kill the child and anything
-	     * else in its process group.
-	     */
-	    KILLPG(child_id, SIGKILL);
+	unlink (tmpfil);
+
+	if ((child_id = vfork()) == NOTOK) {
+		/* fork error */
+		close (fd);
+		return header_fd ();
+	} else if (child_id) {
+		/* parent process */
+		if (!setjmp (myctx)) {
+			SIGNAL (SIGALRM, alrmser);
+			bytes = fstat(fileno (stdin), &st) != NOTOK ? (int) st.st_size : 100;
+
+			/* amount of time to wait depends on message size */
+			if (bytes <= 100) {
+				/* give at least 5 minutes */
+				seconds = 300;
+			} else if (bytes >= 90000) {
+				/* but 30 minutes should be long enough */
+				seconds = 1800;
+			} else {
+				seconds = (bytes / 60) + 300;
+			}
+			alarm ((unsigned int) seconds);
+			pidwait(child_id, OK);
+			alarm (0);
+
+			if (fstat (fd, &st) != NOTOK && st.st_size > (off_t) 0)
+				return fd;
+		} else {
+			/*
+			 * Ruthlessly kill the child and anything
+			 * else in its process group.
+			 */
+			KILLPG(child_id, SIGKILL);
+		}
+		close (fd);
+		return header_fd ();
 	}
-	close (fd);
-	return header_fd ();
-    }
 
-    /* child process */
-    rewind (stdin);
-    if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK)
+	/* child process */
+	rewind (stdin);
+	if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK)
+		_exit (-1);
+	closefds (3);
+	setpgid ((pid_t) 0, getpid ());  /* put in own process group */
+	execvp (vec[0], vec);
 	_exit (-1);
-    closefds (3);
-    setpgid ((pid_t) 0, getpid ());	/* put in own process group */
-    execvp (vec[0], vec);
-    _exit (-1);
-    return 1;  /* dead code to satisfy compiler */
+	return 1;  /* dead code to satisfy compiler */
 }
 
 
 static int
 header_fd (void)
 {
-    int fd;
-    char *nfs;
-    char *tfile = NULL;
-
-    tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
-    if (tfile == NULL) return NOTOK;
-    unlink (tfile);
-
-    rewind (stdin);
-
-    /* get new format string */
-    nfs = new_fs (form, format, SCANFMT);
-    scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);
-    if (newline)
-        write (fd, "\n\r", 2);
-    write (fd, scanl, strlen (scanl));
-    if (bell)
-        write (fd, "\007", 1);
-
-    return fd;
+	int fd;
+	char *nfs;
+	char *tfile = NULL;
+
+	tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
+	if (tfile == NULL) return NOTOK;
+	unlink (tfile);
+
+	rewind (stdin);
+
+	/* get new format string */
+	nfs = new_fs (form, format, SCANFMT);
+	scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);
+	if (newline)
+		write (fd, "\n\r", 2);
+	write (fd, scanl, strlen (scanl));
+	if (bell)
+		write (fd, "\007", 1);
+
+	return fd;
 }
 
 
 static void
 alert (char *tty, int md)
 {
-    int i, td, mask;
-    char buffer[BUFSIZ], ttyspec[BUFSIZ];
-    struct stat st;
+	int i, td, mask;
+	char buffer[BUFSIZ], ttyspec[BUFSIZ];
+	struct stat st;
 
-    snprintf (ttyspec, sizeof(ttyspec), "/dev/%s", tty);
+	snprintf (ttyspec, sizeof(ttyspec), "/dev/%s", tty);
 
-    /*
-     * The mask depends on whether we are checking for
-     * write permission based on `biff' or `mesg'.
-     */
-    mask = biff ? S_IEXEC : (S_IWRITE >> 3);
-    if (stat (ttyspec, &st) == NOTOK || (st.st_mode & mask) == 0)
-	return;
+	/*
+	 * The mask depends on whether we are checking for
+	 * write permission based on `biff' or `mesg'.
+	 */
+	mask = biff ? S_IEXEC : (S_IWRITE >> 3);
+	if (stat (ttyspec, &st) == NOTOK || (st.st_mode & mask) == 0)
+		return;
 
-    if (!setjmp (myctx)) {
-	SIGNAL (SIGALRM, alrmser);
-	alarm (2);
-	td = open (ttyspec, O_WRONLY);
-	alarm (0);
-	if (td == NOTOK)
-	    return;
-    } else {
-	alarm (0);
-	return;
-    }
-
-    lseek (md, (off_t) 0, SEEK_SET);
-
-    while ((i = read (md, buffer, sizeof(buffer))) > 0)
-	if (write (td, buffer, i) != i)
-	    break;
-
-    close (td);
+	if (!setjmp (myctx)) {
+		SIGNAL (SIGALRM, alrmser);
+		alarm (2);
+		td = open (ttyspec, O_WRONLY);
+		alarm (0);
+		if (td == NOTOK)
+			return;
+	} else {
+		alarm (0);
+		return;
+	}
+
+	lseek (md, (off_t) 0, SEEK_SET);
+
+	while ((i = read (md, buffer, sizeof(buffer))) > 0)
+		if (write (td, buffer, i) != i)
+			break;
+
+	close (td);
 }