Command line printer manipulation client, and build goo.

[moira.git] / reg_svr / startreg.c

diff --git a/reg_svr/startreg.c b/reg_svr/startreg.c
index e17be889df7687ee905742fea789e0d4e96137c9..0afe73dc47483c0f4423943170c125be575971d8 100644 (file)
--- a/reg_svr/startreg.c
+++ b/reg_svr/startreg.c
@@ -1,38 +1,34 @@
-/*
- *     $Source$
- *     $Author$
- *     $Header$
+/* $Id$
  *
- *     Copyright (C) 1987 by the Massachusetts Institute of Technology
- *     For copying and distribution information, please see the file
- *     <mit-copyright.h>.
+ * This program starts the user registration server
+ * in a "clean" environment, and then waits for it to exit.
  *
- *     This program starts the user registration server
- *     in a "clean" environment, and then waits for it to exit.
+ * Copyright (C) 1987-1998 by the Massachusetts Institute of Technology
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
  */
 
-#ifndef lint
-static char *rcsid_mr_starter_c = "$Header$";
-#endif lint
-
 #include <mit-copyright.h>
+#include <moira.h>
+#include <moira_site.h>
+
+#include <sys/resource.h>
+#include <sys/wait.h>
+
 #include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/wait.h>
-#include <sys/signal.h>
-#include <sys/ioctl.h>
-#include <time.h>
-#include <fcntl.h>
-#include <sys/resource.h>
-#include <moira_site.h>
+#include <unistd.h>
+
+RCSID("$Header$");
 
 #define PROG   "reg_svr"
 
 int rdpipe[2];
-extern int errno;
+
+void cleanup(void);
 
 void cleanup(void)
 {
@@ -63,12 +59,9 @@ int main(int argc, char **argv)
 {
   char buf[BUFSIZ];
   FILE *log, *prog;
-  int logf, inf, i, done, pid, tty;
+  int logf, inf, i, done, pid;
   struct rlimit rl;
 
-  extern int errno;
-  extern char *sys_errlist[];
-
   struct sigaction action;
   int nfds;
 
@@ -80,7 +73,7 @@ int main(int argc, char **argv)
   sigemptyset(&action.sa_mask);
   sigaction(SIGCHLD, &action, NULL);
 
-  sprintf(buf, "%s/%s.log", SMS_DIR, PROG);
+  sprintf(buf, "%s/%s.log", MOIRA_DIR, PROG);
   logf = open(buf, O_CREAT|O_WRONLY|O_APPEND, 0640);
   if (logf < 0)
     {
@@ -139,7 +132,7 @@ int main(int argc, char **argv)
          if (errno && errno != EINTR)
            {
              strcpy(buf, "Unable to read from program: ");
-             strcat(buf, sys_errlist[errno]);
+             strcat(buf, strerror(errno));
              strcat(buf, "\n");
            }
          else