386BSD 0.1 development

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

diff --git a/usr/src/lib/libcurses/getstr.c b/usr/src/lib/libcurses/getstr.c
index a9cad49..ff09e8d 100644 (file)
--- a/usr/src/lib/libcurses/getstr.c
+++ b/usr/src/lib/libcurses/getstr.c
@@ -1,18 +1,56 @@
+/*
+ * Copyright (c) 1981 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[] = "@(#)getstr.c   5.4 (Berkeley) 6/1/90";
+#endif /* not lint */
+

 # include      "curses.ext"
 
 /*
  *     This routine gets a string starting at (_cury,_curx)
  *
 # include      "curses.ext"
 
 /*
  *     This routine gets a string starting at (_cury,_curx)
  *

- * %G% (Berkeley) @(#)getstr.c 1.1

  */
 wgetstr(win,str)
 reg WINDOW     *win; 
 reg char       *str; {
 
  */
 wgetstr(win,str)
 reg WINDOW     *win; 
 reg char       *str; {
 

-       while ((*str = wgetch(win)) != ERR && *str != '\n');
+       while ((*str = wgetch(win)) != ERR && *str != '\n')

                str++;
                str++;

-       *str = '\0';
-       if (*str == ERR)
+       if (*str == ERR) {
+               *str = '\0';

                return ERR;
                return ERR;

+       }
+       *str = '\0';

        return OK;
 }
        return OK;
 }