src - FreeBSD source tree

diff options


context:
space:
mode:

author	svn2git <svn2git@FreeBSD.org>	1994-05-01 08:00:00 +0000
committer	svn2git <svn2git@FreeBSD.org>	1994-05-01 08:00:00 +0000
commit	a16f65c7d117419bd266c28a1901ef129a337569 (patch)
tree	2626602f66dc3551e7a7c7bc9ad763c3bc7ab40a /usr.bin/window
parent	8503f4f13f77abf7adc8f7e329c6f9c1d52b6a20 (diff)

Release FreeBSD 1.1upstream/1.1.0_cvs release/1.1.0_cvs

This commit was manufactured to restore the state of the 1.1-RELEASE image. Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs.

Diffstat (limited to 'usr.bin/window')

-rw-r--r--

usr.bin/window/Makefile

-rw-r--r--

usr.bin/window/char.c

-rw-r--r--

usr.bin/window/cmd.c

-rw-r--r--

usr.bin/window/cmd1.c

-rw-r--r--

usr.bin/window/ww.h

-rw-r--r--

usr.bin/window/wwgets.c

-rw-r--r--

usr.bin/window/wwinit.c

-rw-r--r--

usr.bin/window/wwinschar.c

-rw-r--r--

usr.bin/window/wwlabel.c

-rw-r--r--

usr.bin/window/wwwrite.c

10 files changed, 70 insertions, 59 deletions

diff --git a/usr.bin/window/Makefile b/usr.bin/window/Makefile
index 4019676f1be5..872912bc9565 100644
--- a/usr.bin/window/Makefile
+++ b/usr.bin/window/Makefile

@@ -1,7 +1,6 @@

# @(#)Makefile 5.7 (Berkeley) 5/11/90

PROG= window

-CFLAGS+=-R

SRCS= char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \

context.c error.c lcmd.c lcmd1.c lcmd2.c main.c mloop.c parser1.c \

parser2.c parser3.c parser4.c parser5.c scanner.c startup.c string.c \

diff --git a/usr.bin/window/char.c b/usr.bin/window/char.c
index df6e9914e9c8..886d5abe5daa 100644
--- a/usr.bin/window/char.c
+++ b/usr.bin/window/char.c

@@ -77,41 +77,41 @@ char _cmap[] = {

_P|_U, _P|_U, _P|_U, _P|_U,

_P|_U, _P|_U, _P|_U, _C|_U,

- _C|_U, _C|_U, _C|_U, _C|_U,

+ _P|_U, _P|_U, _P|_U, _P|_U,

- _C|_U, _C|_U, _C|_U, _C|_U,

+ _P|_U, _P|_U, _P|_U, _P|_U,

- _C|_U, _C|_U, _C|_U, _C|_U,

+ _P|_U, _P|_U, _P|_U, _P|_U,

- _C|_U, _C|_U, _C|_U, _C|_U,

- _C|_U, _C|_U, _C|_U, _C|_U

+ _P|_U, _P|_U, _P|_U, _P|_U,

+ _P|_U, _P|_U, _P|_U, _P|_U

};

char *_unctrl[] = {

@@ -131,20 +131,20 @@ char *_unctrl[] = {

"h", "i", "j", "k", "l", "m", "n", "o",

"p", "q", "r", "s", "t", "u", "v", "w",

"x", "y", "z", "{", "|", "}", "~", "^?",

- "\\200","\\201","\\202","\\203","\\204","\\205","\\206","\\207",

- "\\210","\\211","\\212","\\213","\\214","\\215","\\216","\\217",

- "\\220","\\221","\\222","\\223","\\224","\\225","\\226","\\227",

- "\\230","\\231","\\232","\\233","\\234","\\235","\\236","\\237",

- "\\240","\\241","\\242","\\243","\\244","\\245","\\246","\\247",

- "\\250","\\251","\\252","\\253","\\254","\\255","\\256","\\257",

- "\\260","\\261","\\262","\\263","\\264","\\265","\\266","\\267",

- "\\270","\\271","\\272","\\273","\\274","\\275","\\276","\\277",

- "\\300","\\301","\\302","\\303","\\304","\\305","\\306","\\307",

- "\\310","\\311","\\312","\\313","\\314","\\315","\\316","\\317",

- "\\320","\\321","\\322","\\323","\\324","\\325","\\326","\\327",

- "\\330","\\331","\\332","\\333","\\334","\\335","\\336","\\337",

- "\\340","\\341","\\342","\\343","\\344","\\345","\\346","\\347",

- "\\350","\\351","\\352","\\353","\\354","\\355","\\356","\\357",

- "\\360","\\361","\\362","\\363","\\364","\\365","\\366","\\367",

- "\\370","\\371","\\372","\\373","\\374","\\375","\\376","\\377"

+ "\200","\201","\202","\203","\204","\205","\206","\207",

+ "\210","\211","\212","\213","\214","\215","\216","\217",

+ "\220","\221","\222","\223","\224","\225","\226","\227",

+ "\230","\231","\232","\233","\234","\235","\236","\237",

+ "\240","\241","\242","\243","\244","\245","\246","\247",

+ "\250","\251","\252","\253","\254","\255","\256","\257",

+ "\260","\261","\262","\263","\264","\265","\266","\267",

+ "\270","\271","\272","\273","\274","\275","\276","\277",

+ "\300","\301","\302","\303","\304","\305","\306","\307",

+ "\310","\311","\312","\313","\314","\315","\316","\317",

+ "\320","\321","\322","\323","\324","\325","\326","\327",

+ "\330","\331","\332","\333","\334","\335","\336","\337",

+ "\340","\341","\342","\343","\344","\345","\346","\347",

+ "\350","\351","\352","\353","\354","\355","\356","\357",

+ "\360","\361","\362","\363","\364","\365","\366","\367",

+ "\370","\371","\372","\373","\374","\375","\376","\377"

};

diff --git a/usr.bin/window/cmd.c b/usr.bin/window/cmd.c
index 63630e6c1322..efbfbc97bbac 100644
--- a/usr.bin/window/cmd.c
+++ b/usr.bin/window/cmd.c

@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)cmd.c 3.40 (Berkeley) 6/6/90";

docmd()

{

- register char c;

+ register c;

char out = 0;

diff --git a/usr.bin/window/cmd1.c b/usr.bin/window/cmd1.c
index 8be41db3bede..d9bc3aed48b1 100644
--- a/usr.bin/window/cmd1.c
+++ b/usr.bin/window/cmd1.c

@@ -115,7 +115,7 @@ int maxrow, maxcol;

{

static int scount;

int count;

- char c;

+ int c;

int oldrow = *row, oldcol = *col;

while ((c = wwgetc()) >= 0) {

diff --git a/usr.bin/window/ww.h b/usr.bin/window/ww.h
index 9acbc8e3b347..ca6b49533f77 100644
--- a/usr.bin/window/ww.h
+++ b/usr.bin/window/ww.h

@@ -256,8 +256,8 @@ char *wwib; /* input (keyboard) buffer */

char *wwibe; /* wwib + sizeof buffer */

char *wwibp; /* current read position in buffer */

char *wwibq; /* current write position in buffer */

-#define wwgetc() (wwibp < wwibq ? *wwibp++ & 0x7f : -1)

-#define wwpeekc() (wwibp < wwibq ? *wwibp & 0x7f : -1)

+#define wwgetc() (wwibp < wwibq ? *wwibp++ & 0xff : -1)

+#define wwpeekc() (wwibp < wwibq ? *wwibp & 0xff : -1)

#define wwungetc(c) (wwibp > wwib ? *--wwibp = (c) : -1)

/* things for short circuiting wwiomux() */

diff --git a/usr.bin/window/wwgets.c b/usr.bin/window/wwgets.c
index 111e52dba33c..b53bae177137 100644
--- a/usr.bin/window/wwgets.c
+++ b/usr.bin/window/wwgets.c

@@ -47,7 +47,7 @@ int n;

{

- register char c;

+ register c;

char uc = w->ww_unctrl;

static void rub();

diff --git a/usr.bin/window/wwinit.c b/usr.bin/window/wwinit.c
index 033864c00328..609cdcee0c18 100644
--- a/usr.bin/window/wwinit.c
+++ b/usr.bin/window/wwinit.c

@@ -104,6 +104,8 @@ wwinit()

wwnewtty.ww_termios.c_lflag = 0;

for (i = 0; i < NCCS; i++)

wwnewtty.ww_termios.c_cc[i] = _POSIX_VDISABLE;

+ wwnewtty.ww_termios.c_cc[VMIN] = 1;

+ wwnewtty.ww_termios.c_cc[VTIME] = 0;

#endif

wwnewtty.ww_fflags = wwoldtty.ww_fflags | FASYNC;

if (wwsettty(0, &wwnewtty) < 0)

@@ -180,6 +182,16 @@ wwinit()

#endif

wwbaud = 38400;

break;

+#ifdef B57600

+ case B57600:

+ wwbaud = 57600;

+ break;

+#endif

+#ifdef B115200

+ case B115200:

+ wwbaud = 115200;

+ break;

+#endif

}

if (xxinit() < 0)

diff --git a/usr.bin/window/wwinschar.c b/usr.bin/window/wwinschar.c
index 8b32fc918949..9c8a2c6527b1 100644
--- a/usr.bin/window/wwinschar.c
+++ b/usr.bin/window/wwinschar.c

@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)wwinschar.c 3.20 (Berkeley) 6/6/90";

wwinschar(w, row, col, c, m)

-char c, m;

+unsigned char c, m;

{

int nvis;

diff --git a/usr.bin/window/wwlabel.c b/usr.bin/window/wwlabel.c
index bdff90d7aaf0..0b1998d03a76 100644
--- a/usr.bin/window/wwlabel.c
+++ b/usr.bin/window/wwlabel.c

@@ -60,7 +60,7 @@ char *l;

char touched;

- char *p;

+ unsigned char *p;

if (f->ww_fmap == 0)

return;

diff --git a/usr.bin/window/wwwrite.c b/usr.bin/window/wwwrite.c
index 39269a05b780..3b8b6bb0a6dc 100644
--- a/usr.bin/window/wwwrite.c
+++ b/usr.bin/window/wwwrite.c

@@ -58,12 +58,12 @@ static char sccsid[] = "@(#)wwwrite.c 3.33 (Berkeley) 6/6/90";

wwwrite(w, p, n)

-register char *p;

+register unsigned char *p;

int n;

{

char hascursor;

- char *savep = p;

- char *q = p + n;

+ unsigned char *savep = p;

+ unsigned char *q = p + n;

char *r = 0;

char *s;