Move UCB-licensed code from 4-clause to 3-clause licence.

[bsdgames-darwin.git] / trek / out.c

diff --git a/trek/out.c b/trek/out.c
index 410b9f82e7700bb93cf90ab4bcd3d4594044b429..550c2c26e4833dce15d45be952689e0b73ac3980 100644 (file)
--- a/trek/out.c
+++ b/trek/out.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: out.c,v 1.7 2003/08/07 09:37:53 agc Exp $      */
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,11 +12,7 @@
  * 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
+ * 3. 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.
  *
@@ -31,25 +29,32 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)out.c      5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: out.c,v 1.2 1993/08/01 18:50:13 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)out.c      8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: out.c,v 1.7 2003/08/07 09:37:53 agc Exp $");
+#endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include <string.h>
+#include "trek.h"
 
 /*
 **  Announce Device Out
 */
 
+void
 out(dev)
 int    dev;
 {
-       register struct device  *d;
+       const struct device     *d;
 
        d = &Device[dev];
        printf("%s reports %s ", d->person, d->name);
-       if (d->name[length(d->name) - 1] == 's')
+       if (d->name[strlen(d->name) - 1] == 's')
                printf("are");
        else
                printf("is");