update copyright notice

[unix-history] / usr / src / usr.bin / more / tags.c

diff --git a/usr/src/usr.bin/more/tags.c b/usr/src/usr.bin/more/tags.c
index 4992981..781aa31 100644 (file)
--- a/usr/src/usr.bin/more/tags.c
+++ b/usr/src/usr.bin/more/tags.c
@@ -3,15 +3,13 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * This code is derived from software contributed to Berkeley by
- * Mark Nudleman.
- * 

  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
  * advertising materials, and other materials related to such
  * distribution and use acknowledge that the software was developed
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
  * advertising materials, and other materials related to such
  * distribution and use acknowledge that the software was developed

- * by the University of California, Berkeley.  The name of the
+ * by Mark Nudleman and the University of California, Berkeley.  The
+ * name of Mark Nudleman or the

  * University may not 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
  * University may not 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


@@ -20,7 +18,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)tags.c     5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)tags.c     5.3 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -28,8 +26,6 @@ static char sccsid[] = "@(#)tags.c    5.1 (Berkeley) %G%";
 
 #define        WHITESP(c)      ((c)==' ' || (c)=='\t')
 
 
 #define        WHITESP(c)      ((c)==' ' || (c)=='\t')
 

-#if TAGS
-

 public char *tagfile;
 public char *tagpattern;
 
 public char *tagfile;
 public char *tagpattern;
 


@@ -193,5 +189,3 @@ tagsearch()
        jump_loc(linepos);
        return (0);
 }
        jump_loc(linepos);
        return (0);
 }

-
-#endif