rename origtermio to be __orig_termios

SCCS-vsn: lib/libcurses/addbytes.c 5.17
SCCS-vsn: lib/libcurses/cr_put.c 5.16
SCCS-vsn: lib/libcurses/scroll.c 5.11

diff --git a/usr/src/lib/libcurses/addbytes.c b/usr/src/lib/libcurses/addbytes.c
index 8fdfedc..85a94fa 100644 (file)
--- a/usr/src/lib/libcurses/addbytes.c
+++ b/usr/src/lib/libcurses/addbytes.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)addbytes.c 5.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)addbytes.c 5.17 (Berkeley) %G%";

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


@@ -121,7 +121,7 @@ newline:                    if (y == win->maxy - 1) {
                        SYNCH_OUT;
                        wclrtoeol(win);
                        SYNCH_IN;
                        SYNCH_OUT;
                        wclrtoeol(win);
                        SYNCH_IN;

-                       if (origtermio.c_oflag & ONLCR)
+                       if (__orig_termios.c_oflag & ONLCR)

                                x = 0;
                        goto newline;
                case '\r':
                                x = 0;
                        goto newline;
                case '\r':

diff --git a/usr/src/lib/libcurses/cr_put.c b/usr/src/lib/libcurses/cr_put.c
index 1639e92..0fb5a20 100644 (file)
--- a/usr/src/lib/libcurses/cr_put.c
+++ b/usr/src/lib/libcurses/cr_put.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)cr_put.c   5.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)cr_put.c   5.16 (Berkeley) %G%";

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


@@ -251,7 +251,8 @@ plod(cnt)
         * If we will later need a \n which will turn into a \r\n by the
         * system or the terminal, then don't bother to try to \r.
         */
         * If we will later need a \n which will turn into a \r\n by the
         * system or the terminal, then don't bother to try to \r.
         */

-       if ((!(origtermio.c_oflag & ONLCR) || !__pfast) && outline < destline)
+       if ((!(__orig_termios.c_oflag & ONLCR) ||
+           !__pfast) && outline < destline)

                goto dontcr;
 
        /*
                goto dontcr;
 
        /*


@@ -292,7 +293,7 @@ dontcr:     while (outline < destline) {
                        plodput('\n');
                if (plodcnt < 0)
                        goto out;
                        plodput('\n');
                if (plodcnt < 0)
                        goto out;

-               if (!(origtermio.c_oflag & ONLCR) || __pfast == 0)
+               if (!(__orig_termios.c_oflag & ONLCR) || __pfast == 0)

                        outcol = 0;
        }
        if (BT)
                        outcol = 0;
        }
        if (BT)

diff --git a/usr/src/lib/libcurses/scroll.c b/usr/src/lib/libcurses/scroll.c
index 951df3a..3b3e7b1 100644 (file)
--- a/usr/src/lib/libcurses/scroll.c
+++ b/usr/src/lib/libcurses/scroll.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)scroll.c   5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)scroll.c   5.11 (Berkeley) %G%";

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


@@ -36,7 +36,7 @@ scroll(win)
 
        if (win == curscr) {
                putchar('\n');
 
        if (win == curscr) {
                putchar('\n');

-               if (origtermio.c_oflag & ONLCR)
+               if (__orig_termios.c_oflag & ONLCR)

                        win->curx = 0;
 #ifdef DEBUG
                __TRACE("scroll: win == curscr\n");
                        win->curx = 0;
 #ifdef DEBUG
                __TRACE("scroll: win == curscr\n");