BSD 4_4 release

[unix-history] / usr / src / lib / libcurses / longname.c

diff --git a/usr/src/lib/libcurses/longname.c b/usr/src/lib/libcurses/longname.c
index b93f9dc..fd54630 100644 (file)
--- a/usr/src/lib/libcurses/longname.c
+++ b/usr/src/lib/libcurses/longname.c
@@ -1,23 +1,56 @@
-# define       reg     register
+/*
+ * Copyright (c) 1981, 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
+ * 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
+static char sccsid[] = "@(#)longname.c 8.1 (Berkeley) 6/4/93";
+#endif /* not lint */

 
 /*
 
 /*

- *     This routine fills in "def" with the long name of the terminal.
+ * longname --
+ *     Fill in "def" with the long name of the terminal.

  */
 char *
 longname(bp, def)
  */
 char *
 longname(bp, def)

-reg char       *bp, *def; {
-
-       reg char        *cp;
+       register char *bp, *def;
+{
+       register char *cp;

 
        while (*bp && *bp != ':' && *bp != '|')
                bp++;
        if (*bp == '|') {
 
        while (*bp && *bp != ':' && *bp != '|')
                bp++;
        if (*bp == '|') {

-               bp++;
-               cp = bp;
-               while (*cp && *cp != ':' && *cp != '|')
-                       cp++;
-               *cp = 0;
-               return bp;
+               for (cp = def, ++bp; *bp && *bp != ':' && *bp != '|';)
+                       *cp++ = *bp++;
+               *cp = '\0';

        }
        }

-       return def;
+       return (def);

 }
 }