WARNS=5

[bsdgames-darwin.git] / hack / hack.tty.c

diff --git a/hack/hack.tty.c b/hack/hack.tty.c
index 08e94cc8123787c23093d16e11804f84721c5402..9c9bcefd6235c84417ca575e53f9af78c93c9404 100644 (file)
--- a/hack/hack.tty.c
+++ b/hack/hack.tty.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.tty.c,v 1.11 2003/04/02 18:36:41 jsm Exp $        */
+/*     $NetBSD: hack.tty.c,v 1.16 2011/08/06 20:42:43 dholland Exp $   */

 
 /*-
  * Copyright (c) 1988, 1993
 
 /*-
  * Copyright (c) 1988, 1993


@@ -12,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.
  * 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.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -38,7 +34,7 @@
 #if 0
 static char     sccsid[] = "@(#)hack.tty.c     8.1 (Berkeley) 5/31/93";
 #else
 #if 0
 static char     sccsid[] = "@(#)hack.tty.c     8.1 (Berkeley) 5/31/93";
 #else

-__RCSID("$NetBSD: hack.tty.c,v 1.11 2003/04/02 18:36:41 jsm Exp $");
+__RCSID("$NetBSD: hack.tty.c,v 1.16 2011/08/06 20:42:43 dholland Exp $");

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


@@ -124,7 +120,9 @@ __RCSID("$NetBSD: hack.tty.c,v 1.11 2003/04/02 18:36:41 jsm Exp $");
 
 static char     erase_char, kill_char;
 static boolean  settty_needed = FALSE;
 
 static char     erase_char, kill_char;
 static boolean  settty_needed = FALSE;

-struct termios  inittyb, curttyb;
+static struct termios  inittyb, curttyb;
+
+static void setctty(void);

 
 /*
  * Get initial state of terminal, set ospeed (for termcap routines)
 
 /*
  * Get initial state of terminal, set ospeed (for termcap routines)


@@ -132,7 +130,7 @@ struct termios  inittyb, curttyb;
  * Called by startup() in termcap.c and after returning from ! or ^Z
  */
 void
  * Called by startup() in termcap.c and after returning from ! or ^Z
  */
 void

-gettty()
+gettty(void)

 {
        if (tcgetattr(0, &inittyb) < 0)
                perror("Hack (gettty)");
 {
        if (tcgetattr(0, &inittyb) < 0)
                perror("Hack (gettty)");


@@ -152,11 +150,10 @@ gettty()
 
 /* reset terminal to original state */
 void
 
 /* reset terminal to original state */
 void

-settty(s)
-       const char           *s;
+settty(const char *s)

 {
 {

-       clear_screen();
-       end_screen();
+       clearscreen();
+       endscreen();

        if (s)
                printf("%s", s);
        (void) fflush(stdout);
        if (s)
                printf("%s", s);
        (void) fflush(stdout);


@@ -167,8 +164,8 @@ settty(s)
        setioctls();
 }
 
        setioctls();
 }
 

-void
-setctty()
+static void
+setctty(void)

 {
        if (tcsetattr(0, TCSADRAIN, &curttyb) < 0)
                perror("Hack (setctty)");
 {
        if (tcsetattr(0, TCSADRAIN, &curttyb) < 0)
                perror("Hack (setctty)");


@@ -176,7 +173,7 @@ setctty()
 
 
 void
 
 
 void

-setftty()
+setftty(void)

 {
        int             change = 0;
        flags.cbreak = ON;
 {
        int             change = 0;
        flags.cbreak = ON;


@@ -196,7 +193,7 @@ setftty()
        if (change) {
                setctty();
        }
        if (change) {
                setctty();
        }

-       start_screen();
+       startscreen();

 }
 
 
 }
 
 


@@ -209,7 +206,7 @@ error(const char *fmt, ...)
 
        va_start(ap, fmt);
        if (settty_needed)
 
        va_start(ap, fmt);
        if (settty_needed)

-               settty((char *) 0);
+               settty(NULL);

        vprintf(fmt, ap);
        va_end(ap);
        putchar('\n');
        vprintf(fmt, ap);
        va_end(ap);
        putchar('\n');


@@ -223,8 +220,7 @@ error(const char *fmt, ...)
  * resulting string is "\033".
  */
 void
  * resulting string is "\033".
  */
 void

-getlin(bufp)
-       char           *bufp;
+getlin(char *bufp)

 {
        char           *obufp = bufp;
        int             c;
 {
        char           *obufp = bufp;
        int             c;


@@ -246,7 +242,7 @@ getlin(bufp)
                                bufp--;
                                putstr("\b \b");        /* putsym converts \b */
                        } else
                                bufp--;
                                putstr("\b \b");        /* putsym converts \b */
                        } else

-                               bell();
+                               sound_bell();

                } else if (c == '\n') {
                        *bufp = 0;
                        return;
                } else if (c == '\n') {
                        *bufp = 0;
                        return;


@@ -267,19 +263,18 @@ getlin(bufp)
                                putstr("\b \b");
                        }
                } else
                                putstr("\b \b");
                        }
                } else

-                       bell();
+                       sound_bell();

        }
 }
 
 void
        }
 }
 
 void

-getret()
+getret(void)

 {
        cgetret("");
 }
 
 void
 {
        cgetret("");
 }
 
 void

-cgetret(s)
-       const char           *s;
+cgetret(const char *s)

 {
        putsym('\n');
        if (flags.standout)
 {
        putsym('\n');
        if (flags.standout)


@@ -294,9 +289,9 @@ cgetret(s)
 
 char            morc;          /* tell the outside world what char he used */
 
 
 char            morc;          /* tell the outside world what char he used */
 

+/* s = chars allowed besides space or return */

 void
 void

-xwaitforspace(s)
-       const char *s;  /* chars allowed besides space or return */
+xwaitforspace(const char *s)

 {
        int             c;
 
 {
        int             c;
 


@@ -310,13 +305,13 @@ xwaitforspace(s)
                                morc = c;
                                break;
                        }
                                morc = c;
                                break;
                        }

-                       bell();
+                       sound_bell();

                }
        }
 }
 
 char           *
                }
        }
 }
 
 char           *

-parse()
+parse(void)

 {
        static char     inputline[COLNO];
        int             foo;
 {
        static char     inputline[COLNO];
        int             foo;


@@ -352,7 +347,7 @@ parse()
 }
 
 char
 }
 
 char

-readchar()
+readchar(void)

 {
        int             sym;
 
 {
        int             sym;
 


@@ -383,7 +378,7 @@ noteof:     ;
 }
 
 void
 }
 
 void

-end_of_input()
+end_of_input(void)

 {
        settty("End of input?\n");
        clearlocks();
 {
        settty("End of input?\n");
        clearlocks();