NetBSD: You choose the hardware, we'll bring the OS.

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

diff --git a/trek/out.c b/trek/out.c
index 410b9f82e7700bb93cf90ab4bcd3d4594044b429..c7ac084d7b2d6548819988112a0c43dc89fa22ba 100644 (file)
--- a/trek/out.c
+++ b/trek/out.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: out.c,v 1.6 1999/07/21 13:19:11 hubertf 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
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -31,25 +33,32 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #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.6 1999/07/21 13:19:11 hubertf Exp $");
+#endif

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

-# include      "trek.h"
+#include <stdio.h>
+#include <string.h>
+#include "trek.h"

 
 /*
 **  Announce Device Out
 */
 
 
 /*
 **  Announce Device Out
 */
 

+void

 out(dev)
 int    dev;
 {
 out(dev)
 int    dev;
 {

-       register struct device  *d;
+       const struct device     *d;

 
        d = &Device[dev];
        printf("%s reports %s ", d->person, d->name);
 
        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");
                printf("are");
        else
                printf("is");