Fix from Charles Hedrick at Rutgers - flush output when

[unix-history] / usr / src / libexec / fingerd / fingerd.c

diff --git a/usr/src/libexec/fingerd/fingerd.c b/usr/src/libexec/fingerd/fingerd.c
index 779cee5..1bef7ab 100644 (file)
--- a/usr/src/libexec/fingerd/fingerd.c
+++ b/usr/src/libexec/fingerd/fingerd.c
@@ -1,6 +1,18 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif not lint
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)fingerd.c  1.2 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)fingerd.c  5.1 (Berkeley) %G%";
+#endif not lint

 
 /*
  * Finger server.
 
 /*
  * Finger server.


@@ -11,16 +23,15 @@ static char sccsid[] = "@(#)fingerd.c       1.2 (Berkeley) %G%";
 #include <stdio.h>
 #include <ctype.h>
 
 #include <stdio.h>
 #include <ctype.h>
 

-FILE   *popen();
-

 main(argc, argv)
        char *argv[];
 {
 main(argc, argv)
        char *argv[];
 {

-       register char *cp, *sp;
-       char cmdbuf[512], line[512];
+       register char *sp;
+       char line[512];

        struct sockaddr_in sin;
        struct sockaddr_in sin;

-       int i;
+       int i, p[2], pid, status;

        FILE *fp;
        FILE *fp;

+       char *av[4];

 
        i = sizeof (sin);
        if (getpeername(0, &sin, &i) < 0)
 
        i = sizeof (sin);
        if (getpeername(0, &sin, &i) < 0)


@@ -28,31 +39,49 @@ main(argc, argv)
        line[0] = '\0';
        gets(line);
        sp = line;
        line[0] = '\0';
        gets(line);
        sp = line;

-       strcpy(cmdbuf, "/usr/ucb/finger");
-       cp = cmdbuf + strlen(cmdbuf);
+       av[0] = "finger";
+       i = 1;

        while (1) {
                while (isspace(*sp))
                        sp++;
                if (!*sp)
                        break;
        while (1) {
                while (isspace(*sp))
                        sp++;
                if (!*sp)
                        break;

-               *cp++ = ' ';

                if (*sp == '/' && (sp[1] == 'W' || sp[1] == 'w')) {
                        sp += 2;
                if (*sp == '/' && (sp[1] == 'W' || sp[1] == 'w')) {
                        sp += 2;

-                       *cp++ = '-';
-                       *cp++ = 'l';
+                       av[i++] = "-l";
+               }
+               if (*sp && !isspace(*sp)) {
+                       av[i++] = sp;
+                       while (*sp && !isspace(*sp))
+                               sp++;
+                       *sp = '\0';
+               }
+       }
+       av[i] = 0;
+       if (pipe(p) < 0)
+               fatal(argv[0], "pipe");
+       if ((pid = fork()) == 0) {
+               close(p[0]);
+               if (p[1] != 1) {
+                       dup2(p[1], 1);
+                       close(p[1]);

                }
                }

-               while (!isspace(*sp))
-                       *cp++ = *sp++;
+               execv("/usr/ucb/finger", av);
+               _exit(1);

        }
        }

-       *cp++ = '\0';
-       if ((fp = popen(cmdbuf, "r")) == NULL)
-               fatal(argv[0], "/usr/ucb/finger");
+       if (pid == -1)
+               fatal(argv[0], "fork");
+       close(p[1]);
+       if ((fp = fdopen(p[0], "r")) == NULL)
+               fatal(argv[0], "fdopen");

        while ((i = getc(fp)) != EOF) {
                if (i == '\n')
                        putchar('\r');
                putchar(i);
        }
        while ((i = getc(fp)) != EOF) {
                if (i == '\n')
                        putchar('\r');
                putchar(i);
        }

-       pclose(fp);
+       fclose(fp);
+       while ((i = wait(&status)) != pid && i != -1)
+               ;

        return(0);
 }
 
        return(0);
 }