1999-06-13 Roland McGrath <roland@baalperazim.frob.com>

	Move all the /etc/ttys handling stuff into a separate source file.
	* init.c (_PATH_LOGIN, WINDOW_DELAY, struct terminal,
	nttys, ttyslen, setup_terminal, add_terminal,
	init_ttys, free_ttys, startup_terminal, startup_ttys,
	find_line, restart_terminal, shutdown_terminal, reread_ttys): Move to
	* ttys.c: ... here, new file.
	* ttys.h: New file, declare external functions in ttys.c.
	* Makefile (SRCS): Add ttys.c.
	(OBJS): Derive from $(SRCS).
	(LCLHDRS): New variable, add ttys.h.

3 files changed, 31 insertions, 294 deletions

diff --git a/init/Makefile b/init/Makefile
index da1ee177..efa87c8c 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -1,5 +1,5 @@
-# 
-#   Copyright (C) 1994, 1995, 1996 Free Software Foundation
+#
+#   Copyright (C) 1994, 1995, 1996, 1999 Free Software Foundation
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -18,9 +18,11 @@
 dir := init
 makemode := server
 
-SRCS = init.c
-OBJS = init.o startupServer.o notifyServer.o startup_replyUser.o msgServer.o \
-	startup_notifyUser.o
+SRCS = init.c ttys.c
+OBJS = $(SRCS:.c=.o) \
+       startupServer.o notifyServer.o startup_replyUser.o msgServer.o \
+       startup_notifyUser.o
+LCLHDRS = ttys.h
 target = init
 HURDLIBS=ports fshelp shouldbeinlibc
 
@@ -30,4 +32,3 @@ include ../Makeconf
 
 mung_msg_S.h: msg_S.h
 	sed 's/msg_server/mung_msg_server/' < $< > $@
-
diff --git a/init/init.c b/init/init.c
index 459b6d49..b344ad40 100644
--- a/init/init.c
+++ b/init/init.c
@@ -45,9 +45,7 @@
 #include <sys/wait.h>
 #include <error.h>
 #include <hurd/msg_reply.h>
-#include <ttyent.h>
 #include <argz.h>
-#include <utmp.h>
 #include <maptime.h>
 #include <version.h>
 #include <argp.h>
@@ -64,10 +62,6 @@ int crash_flags = RB_AUTOBOOT;
 #define BOOT(flags)	((flags & RB_HALT) ? "halt" : "reboot")
 
 #define _PATH_RUNCOM "/libexec/rc"
-#define _PATH_LOGIN "/bin/login"
-
-/* How long to wait after starting window specs before starting getty */
-#define WINDOW_DELAY 3		/* seconds */
 
 
 /* Multiboot command line used to start the kernel,
@@ -125,30 +119,6 @@ struct ntfy_task *ntfy_tasks;
 /* Mapped time */
 volatile struct mapped_time_value *mapped_time;
 
-/* All the ttys in /etc/ttys. */
-struct terminal
-{
-  /* argz list for getty */
-  char *getty_argz;
-  size_t getty_argz_len;
-
-  /* argz list for window spec */
-  char *window_argz;
-  size_t window_argz_len;
-
-  int on;
-  int pid;
-  int read;
-
-  char *name;
-};
-
-struct terminal *ttys;
-/* Number of live elements in ttys */
-int nttys;
-/* Total number of elements in ttys */
-int ttyslen;
-
 
 /* Our receive right */
 mach_port_t startup;
@@ -509,264 +479,6 @@ run_for_real (char *filename, char *args, int arglen, mach_port_t ctty,
   return pid;
 }
 
-
-
-
-/** /etc/ttys support **/
-
-/* Set up the getty and window fields of terminal spec T corresponding
-   to line TT. */
-void
-setup_terminal (struct terminal *t, struct ttyent *tt)
-{
-  char *line;
-
-  if (t->getty_argz)
-    free (t->getty_argz);
-  if (t->window_argz)
-    free (t->window_argz);
-
-  if ((tt->ty_status & TTY_ON) && tt->ty_getty)
-    {
-      asprintf (&line, "%s %s", tt->ty_getty, tt->ty_name);
-      argz_create_sep (line, ' ', &t->getty_argz, &t->getty_argz_len);
-      free (line);
-      if (tt->ty_window)
-	argz_create_sep (tt->ty_window, ' ',
-			 &t->window_argz, &t->window_argz_len);
-      else
-	t->window_argz = 0;
-    }
-  else
-      t->getty_argz = t->window_argz = 0;
-}
-
-
-/* Add a new terminal spec for TT and return it. */
-struct terminal *
-add_terminal (struct ttyent *tt)
-{
-  struct terminal *t;
-
-  if (nttys >= ttyslen)
-    {
-      ttys = realloc (ttys, (ttyslen * 2) * sizeof (struct ttyent));
-      bzero (&ttys[nttys], ttyslen);
-      ttyslen *= 2;
-    }
-
-  t = &ttys[nttys];
-  nttys++;
-
-  t->name = malloc (strlen (tt->ty_name) + 1);
-  strcpy (t->name, tt->ty_name);
-
-  setup_terminal (t, tt);
-  if (t->getty_argz)
-    t->on = 1;
-
-  return t;
-}
-
-/* Read /etc/ttys and initialize ttys array.  Return non-zero if we fail. */
-int
-init_ttys (void)
-{
-  struct ttyent *tt;
-
-  ttyslen = 10;
-  nttys = 0;
-
-  ttys = malloc (ttyslen * sizeof (struct ttyent));
-  bzero (ttys, ttyslen * sizeof (struct ttyent));
-
-  if (!setttyent ())
-    {
-      error (0, errno, "%s", _PATH_TTYS);
-      return 1;
-    }
-  while ((tt = getttyent ()))
-    {
-      if (!tt->ty_name)
-	continue;
-
-      add_terminal (tt);
-    }
-
-  endttyent ();
-  return 0;
-}
-
-/* Free everyting in the terminal array */
-void
-free_ttys (void)
-{
-  int i;
-
-  for (i = 0; i < nttys; i++)
-    {
-      if (ttys[i].getty_argz)
-	free (ttys[i].getty_argz);
-      if (ttys[i].window_argz)
-	free (ttys[i].window_argz);
-      free (ttys[i].name);
-    }
-  free (ttys);
-}
-
-/* Start line T.  Return non-zero if we didn't actually start anything.  */
-int
-startup_terminal (struct terminal *t)
-{
-  pid_t pid;
-  assert (t->on);
-  assert (t->getty_argz);
-
-  if (t->window_argz)
-    {
-      pid = run_for_real (t->window_argz, t->window_argz,
-			  t->window_argz_len, MACH_PORT_NULL, 1);
-      if (!pid)
-	goto error;
-
-      sleep (WINDOW_DELAY);
-    }
-
-  pid = run_for_real (t->getty_argz, t->getty_argz,
-		      t->getty_argz_len, MACH_PORT_NULL, 0);
-  if (pid == 0)
-    {
-    error:
-      t->pid = 0;
-      t->on = 0;
-      return 1;
-    }
-  else
-    {
-      t->pid = pid;
-      return 0;
-    }
-}
-
-/* For each line in /etc/ttys, start up the specified program.  Return
-   non-zero if we fail.  */
-int
-startup_ttys (void)
-{
-  int i;
-  int didone, fail;
-
-  didone = 0;
-
-  for (i = 0; i < nttys; i++)
-    if (ttys[i].on)
-      {
-	fail = startup_terminal (&ttys[i]);
-	if (!fail)
-	  didone = 1;
-      }
-  return !didone;
-}
-
-/* Find the terminal spec corresponding to line LINE. */
-struct terminal *
-find_line (char *line)
-{
-  int i;
-
-  for (i = 0; i < nttys; i++)
-    if (!strcmp (ttys[i].name, line))
-      return &ttys[i];
-  return 0;
-}
-
-/* PID has just exited; restart the terminal it's on if necessary. */
-void
-restart_terminal (int pid)
-{
-  int i;
-
-  for (i = 0; i < nttys; i++)
-    if (pid == ttys[i].pid)
-      {
-	if (logout (ttys[i].name))
-	  logwtmp (ttys[i].name, "", "");
-	ttys[i].pid = 0;
-	if (ttys[i].on)
-	  startup_terminal (&ttys[i]);
-      }
-}
-
-/* Shutdown the things running on terminal spec T. */
-void
-shutdown_terminal (struct terminal *t)
-{
-  kill (t->pid, SIGHUP);
-  revoke (t->name);
-}
-
-/* Re-read /etc/ttys.  If a line has turned off, kill what's there.
-   If a line has turned on, start it.  */
-void
-reread_ttys (void)
-{
-  struct ttyent *tt;
-  struct terminal *t;
-  int on;
-  int i;
-
-  if (!setttyent ())
-    {
-      error (0, errno, "%s", _PATH_TTYS);
-      return;
-    }
-
-  /* Mark all the lines not yet read */
-  for (i = 0; i < nttys; i++)
-    ttys[i].read = 0;
-
-  while ((tt = getttyent ()))
-    {
-      if (!tt->ty_name)
-	continue;
-
-      t = find_line (tt->ty_name);
-      on = tt->ty_getty && (tt->ty_status & TTY_ON);
-
-      if (t)
-	{
-	  if (t->on && !on)
-	    {
-	      t->on = 0;
-	      shutdown_terminal (t);
-	    }
-	  else if (!t->on && on)
-	    {
-	      t->on = 1;
-	      setup_terminal (t, tt);
-	      startup_terminal (t);
-	    }
-	}
-      else
-	{
-	  t = add_terminal (tt);
-	  if (on)
-	    startup_terminal (t);
-	}
-
-      t->read = 1;
-    }
-  endttyent ();
-
-  /* Scan tty entries; any that were not found and were on, turn off. */
-  for (i = 0; i < nttys; i++)
-    if (!ttys[i].read && ttys[i].on)
-      {
-	ttys[i].on = 0;
-	shutdown_terminal (&ttys[i]);
-      }
-}
-
 
 /** Main program and setup **/
 
@@ -1310,6 +1022,8 @@ frob_kernel_process (void)
 
 /** Single and multi user transitions **/
 
+#include "ttys.h"
+
 
 /* Start the single-user environment.  This can only be done
    when the core servers have fully started.  We know that
diff --git a/init/ttys.h b/init/ttys.h
new file mode 100644
index 00000000..db59f16d
--- /dev/null
+++ b/init/ttys.h
@@ -0,0 +1,22 @@
+/* Declarations for /etc/ttys support for Hurd init
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU Hurd.
+
+   The GNU Hurd is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   The GNU Hurd is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with the GNU Hurd; see the file COPYING.  If not, write to
+   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+int init_ttys (), startup_ttys ();
+void reread_ttys (), free_ttys ();
+
+void restart_terminal (pid_t pid);