Use variable-size (but in one case, fixed but larger) buffers for the SASL

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 9cd77dd6e37bb37241efd38a8455d1f02fb660be..3bee075e038e6165f50593c1cb11a952154e60ef 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -19,7 +19,6 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/mts.h>

-#include <signal.h>

 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT
 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT


@@ -70,7 +69,9 @@ char *getusername(void);
 static void alrmser (int);
 static int message_fd (char **);
 static int header_fd (void);
 static void alrmser (int);
 static int message_fd (char **);
 static int header_fd (void);

+#if HAVE_GETUTXENT

 static void alert (char *, int);
 static void alert (char *, int);

+#endif /* HAVE_GETUTXENT */

 
 
 int
 
 
 int


@@ -80,13 +81,8 @@ main (int argc, char **argv)
     char *cp, *user, buf[BUFSIZ], tty[BUFSIZ];
     char **argp, **arguments, *vec[MAXARGS];
     struct utmpx *utp;
     char *cp, *user, buf[BUFSIZ], tty[BUFSIZ];
     char **argp, **arguments, *vec[MAXARGS];
     struct utmpx *utp;

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');

 
 

-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }

 
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc, argv, 1);
 
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc, argv, 1);


@@ -165,10 +161,12 @@ main (int argc, char **argv)
         }
     }
     endutxent();
         }
     }
     endutxent();

+#else
+    NMH_UNUSED (tty);
+    NMH_UNUSED (utp);

 #endif /* HAVE_GETUTXENT */
 
     exit (RCV_MOK);
 #endif /* HAVE_GETUTXENT */
 
     exit (RCV_MOK);

-    return 0;  /* dead code to satisfy the compiler */

 }
 
 
 }
 
 


@@ -185,14 +183,18 @@ static int
 message_fd (char **vec)
 {
     pid_t child_id;
 message_fd (char **vec)
 {
     pid_t child_id;

-    int bytes, fd, seconds;
-    char tmpfil[BUFSIZ];
+    int bytes, seconds;
+    int fd;
+    char *tfile;

     struct stat st;
 
     struct stat st;
 

-    fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
-    unlink (tmpfil);
+    if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {
+       advise(NULL, "unable to create temporary file in %s", get_temp_dir());
+       return NOTOK;
+    }
+    (void) m_unlink(tfile);  /* Use fd, no longer need the file name. */

 
 

-    if ((child_id = vfork()) == NOTOK) {
+    if ((child_id = fork()) == NOTOK) {

        /* fork error */
        close (fd);
        return header_fd ();
        /* fork error */
        close (fd);
        return header_fd ();


@@ -235,9 +237,11 @@ message_fd (char **vec)
        _exit (-1);
     closefds (3);
     setpgid ((pid_t) 0, getpid ());    /* put in own process group */
        _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 */
+    if (execvp (vec[0], vec) == NOTOK) {
+        _exit (-1);
+    }
+
+    return NOTOK;

 }
 
 
 }
 
 


@@ -248,15 +252,18 @@ header_fd (void)
     char *nfs;
     char *tfile = NULL;
 
     char *nfs;
     char *tfile = NULL;
 

-    tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
-    if (tfile == NULL) return NOTOK;
-    unlink (tfile);
+    if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {
+       advise(NULL, "unable to create temporary file in %s", get_temp_dir());
+        return NOTOK;
+    }
+    (void) m_unlink(tfile);  /* Use fd, no longer need the file name. */

 
     rewind (stdin);
 
     /* get new format string */
     nfs = new_fs (form, format, SCANFMT);
     scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);
 
     rewind (stdin);
 
     /* get new format string */
     nfs = new_fs (form, format, SCANFMT);
     scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);

+    scan_finished ();

     if (newline)
         write (fd, "\n\r", 2);
     write (fd, scanl, strlen (scanl));
     if (newline)
         write (fd, "\n\r", 2);
     write (fd, scanl, strlen (scanl));


@@ -267,6 +274,7 @@ header_fd (void)
 }
 
 
 }
 
 

+#if HAVE_GETUTXENT

 static void
 alert (char *tty, int md)
 {
 static void
 alert (char *tty, int md)
 {


@@ -304,4 +312,4 @@ alert (char *tty, int md)
 
     close (td);
 }
 
     close (td);
 }

-
+#endif /* HAVE_GETUTXENT */