new interface

SCCS-vsn: lib/libutil/pty.c 1.2
SCCS-vsn: lib/libc/gen/daemon.c 5.2

Author: Marc Teitelbaum

usr/src/lib/libc/gen/daemon.c

@@ -6,26 +6,32 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)daemon.c	5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)daemon.c	5.2 (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/file.h>
 
-daemon()
+daemon(nochdir, noclose)
+	int nochdir, noclose;
 {
 	int cpid;
 
 	if ((cpid = fork()) == -1)
 		return (-1);
 	if (cpid)
 		exit(0);
-
 	(void) setsid();
-	(void) chdir("/");
-	(void) close(0);
-	(void) close(1);
-	(void) close(2);
-	(void) open("/", O_RDONLY, 0);
-	(void) dup2(0, 1);
-	(void) dup2(0, 2);
+	if (!nochdir)
+		(void) chdir("/");
+	if (!noclose) {
+		int devnull = open("/dev/null", O_RDWR, 0);
+
+		if (devnull != -1) {
+			(void) dup2(devnull, 0);
+			(void) dup2(devnull, 1);
+			(void) dup2(devnull, 2);
+			if (devnull > 2)
+				(void) close(devnull);
+		}
+	}
 }

usr/src/lib/libutil/pty.c

@@ -6,41 +6,91 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)pty.c	1.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)pty.c	1.2 (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/file.h>
+#include <sys/ioctl.h>
+#include <termios.h>
+#include <grp.h>
 #include <errno.h>
 
-openpty(amaster, aslave, name, flag)
+openpty(amaster, aslave, name, termp, winp)
 	int *amaster, *aslave;
 	char *name;
-	int flag;
+	struct termios *termp;
+	struct winsize *winp;
 {
 	register char *line = "/dev/ptyXX", *cp1, *cp2;
-	register master, slave;
+	register master, slave, ruid, ttygid;
+	struct group *gr;
 	extern errno;
 
+	if ((gr = getgrnam("tty")) != NULL)
+		ttygid = gr->gr_gid;
+	else
+		ttygid = -1;
+	ruid = getuid();
+
 	for (cp1 = "pqrs"; *cp1; cp1++) {
 		line[8] = *cp1;
 		for (cp2 = "0123456789abcdef"; *cp2; cp2++) {
 			line[9] = *cp2;
 			if ((master = open(line, O_RDWR, 0)) == -1) {
 				if (errno != EIO)
-					return (-1);
+					return (-1);	/* out of ptys */
 			} else {
 				line[5] = 't';
+				(void) chown(line, ruid, ttygid);
+				(void) chmod(line, 0620);
+				(void) revoke(line);
 				if ((slave = open(line, O_RDWR, 0)) != -1) {
 					*amaster = master;
 					*aslave = slave;
 					if (name)
 						strcpy(name, line);
+					if (termp)
+						(void) tcsetattr(slave, 
+							TCSAFLUSH, &termp);
+					if (winp)
+						(void) ioctl(slave, TIOCSWINSZ, 
+							(char *)&winp);
 					return (0);
 				}
-				close(master);
+				(void) close(master);
 				line[5] = 'p';
 			}
 		}
 	}
+	errno = ENOENT;	/* out of ptys */
 	return (-1);
 }
+
+forkpty(amaster, name, termp, winp)
+	int *amaster;
+	char *name;
+	struct termios *termp;
+	struct winsize *winp;
+{
+	int master, slave, pid;
+
+	if (openpty(&master, &slave, name, termp, winp) == -1)
+		return (-1);
+	switch (pid = fork()) {
+	case -1:
+		return (-1);
+	case 0:
+		/* 
+		 * child
+		 */
+		(void) close(master);
+		login_tty(slave);
+		return (0);
+	}
+	/*
+	 * parent
+	 */
+	*amaster = master;
+	(void) close(slave);
+	return (pid);
+}