BSD 4_3_Net_2 release

[unix-history] / usr / src / sbin / halt / halt.c

diff --git a/usr/src/sbin/halt/halt.c b/usr/src/sbin/halt/halt.c
index 91bf3e3..083c958 100644 (file)
--- a/usr/src/sbin/halt/halt.c
+++ b/usr/src/sbin/halt/halt.c
@@ -2,19 +2,33 @@
  * Copyright (c) 1980, 1986 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980, 1986 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -24,7 +38,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)halt.c     5.7 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)halt.c     5.10 (Berkeley) 4/3/91";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -46,7 +60,7 @@ main(argc, argv)
 {
        register int i;
        register int qflag = 0;
 {
        register int i;
        register int qflag = 0;

-       struct passwd *pw, *getpwuid();
+       struct passwd *pw;

        int ch, howto, needlog = 1;
        char *user, *ttyn, *getlogin(), *ttyname();
 
        int ch, howto, needlog = 1;
        char *user, *ttyn, *getlogin(), *ttyname();
 


@@ -122,16 +136,18 @@ main(argc, argv)
                setalarm(5);
                pause();
        }
                setalarm(5);
                pause();
        }

-       syscall(55, howto);
+       reboot(howto);

        perror("halt");
 }
 
        perror("halt");
 }
 

+void

 dingdong()
 {
        /* RRRIIINNNGGG RRRIIINNNGGG */
 }
 
 setalarm(n)
 dingdong()
 {
        /* RRRIIINNNGGG RRRIIINNNGGG */
 }
 
 setalarm(n)

+       int n;

 {
        signal(SIGALRM, dingdong);
        alarm(n);
 {
        signal(SIGALRM, dingdong);
        alarm(n);