changes from branch

This commit is contained in:
cgd 1994-01-24 08:36:38 +00:00
parent 4c580b5582
commit f2149bfd60
13 changed files with 47 additions and 51 deletions

View File

@ -1,5 +1,5 @@
# from: @(#)Makefile 8.2 (Berkeley) 8/21/93
# $Id: Makefile,v 1.5 1993/11/09 04:06:43 cgd Exp $
# from: @(#)Makefile 8.2 (Berkeley) 1/2/94
# $Id: Makefile,v 1.6 1994/01/24 08:36:38 cgd Exp $
CFLAGS+=#-DTFILE=\"/dev/ttyp0\"
CFLAGS+=-D_CURSES_PRIVATE -I${.CURDIR}

View File

@ -32,12 +32,11 @@
*/
#ifndef lint
/* from: static char sccsid[] = "@(#)addbytes.c 8.1 (Berkeley) 6/11/93"; */
static char *rcsid = "$Id: addbytes.c,v 1.8 1993/11/09 04:06:46 cgd Exp $";
/* from: static char sccsid[] = "@(#)addbytes.c 8.2 (Berkeley) 1/9/94"; */
static char *rcsid = "$Id: addbytes.c,v 1.9 1994/01/24 08:36:41 cgd Exp $";
#endif /* not lint */
#include <curses.h>
#include <termios.h>
#define SYNCH_IN {y = win->cury; x = win->curx;}
#define SYNCH_OUT {win->cury = y; win->curx = x;}

View File

@ -32,13 +32,12 @@
*/
#ifndef lint
/* from: static char sccsid[] = "@(#)cr_put.c 8.1 (Berkeley) 6/11/93"; */
static char *rcsid = "$Id: cr_put.c,v 1.6 1993/11/09 04:07:04 cgd Exp $";
/* from: static char sccsid[] = "@(#)cr_put.c 8.2 (Berkeley) 1/9/94"; */
static char *rcsid = "$Id: cr_put.c,v 1.7 1994/01/24 08:36:42 cgd Exp $";
#endif /* not lint */
#include <curses.h>
#include <string.h>
#include <termios.h>
#define HARDTABS 8

View File

@ -32,14 +32,14 @@
*/
#ifndef lint
/* from: static char sccsid[] = "@(#)ctrace.c 8.1 (Berkeley) 6/4/93"; */
static char *rcsid = "$Id: ctrace.c,v 1.2 1993/11/09 04:07:06 cgd Exp $";
/* from: static char sccsid[] = "@(#)ctrace.c 8.2 (Berkeley) 10/5/93"; */
static char *rcsid = "$Id: ctrace.c,v 1.3 1994/01/24 08:36:43 cgd Exp $";
#endif /* not lint */
#ifdef DEBUG
#include <stdio.h>
#if __STDC__
#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
@ -52,7 +52,7 @@ static char *rcsid = "$Id: ctrace.c,v 1.2 1993/11/09 04:07:06 cgd Exp $";
static FILE *tracefp; /* Curses debugging file descriptor. */
void
#if __STDC__
#ifdef __STDC__
__CTRACE(const char *fmt, ...)
#else
__CTRACE(fmt, va_alist)
@ -61,7 +61,7 @@ __CTRACE(fmt, va_alist)
#endif
{
va_list ap;
#if __STDC__
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);

View File

@ -32,8 +32,8 @@
*/
#ifndef lint
/* from: static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/4/93"; */
static char *rcsid = "$Id: cur_hash.c,v 1.2 1993/11/09 04:07:10 cgd Exp $";
/* from: static char sccsid[] = "@(#)cur_hash.c 8.1 (Berkeley) 6/4/93"; */
static char *rcsid = "$Id: cur_hash.c,v 1.3 1994/01/24 08:36:45 cgd Exp $";
#endif /* not lint */
#include <sys/types.h>

View File

@ -32,8 +32,8 @@
*/
#ifndef lint
/* from: static char sccsid[] = "@(#)curses.c 8.2 (Berkeley) 11/29/93"; */
static char *rcsid = "$Id: curses.c,v 1.6 1993/12/04 23:03:43 cgd Exp $";
/* from: static char sccsid[] = "@(#)curses.c 8.2 (Berkeley) 1/2/94"; */
static char *rcsid = "$Id: curses.c,v 1.7 1994/01/24 08:36:50 cgd Exp $";
#endif /* not lint */
#include <curses.h>
@ -73,4 +73,3 @@ char *Def_term = "unknown"; /* Default terminal type. */
char GT; /* Gtty indicates tabs. */
char NONL; /* Term can't hack LF doing a CR. */
char UPPERCASE; /* Terminal is uppercase only. */

View File

@ -30,8 +30,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* from: @(#)curses.h 8.2 (Berkeley) 11/29/93
* $Id: curses.h,v 1.10 1993/12/04 23:03:46 cgd Exp $
* from: @(#)curses.h 8.2 (Berkeley) 1/2/94
* $Id: curses.h,v 1.11 1994/01/24 08:36:51 cgd Exp $
*/
#ifndef _CURSES_H_

View File

@ -32,13 +32,13 @@
*/
#ifndef lint
/* from: static char sccsid[] = "@(#)printw.c 8.1 (Berkeley) 6/4/93"; */
static char *rcsid = "$Id: printw.c,v 1.6 1993/11/09 04:08:31 cgd Exp $";
/* from: static char sccsid[] = "@(#)printw.c 8.2 (Berkeley) 10/5/93"; */
static char *rcsid = "$Id: printw.c,v 1.7 1994/01/24 08:36:54 cgd Exp $";
#endif /* not lint */
#include <curses.h>
#if __STDC__
#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
@ -58,7 +58,7 @@ static int __winwrite __P((void *, const char *, int));
* Printf on the standard screen.
*/
int
#if __STDC__
#ifdef __STDC__
printw(const char *fmt, ...)
#else
printw(fmt, va_alist)
@ -69,7 +69,7 @@ printw(fmt, va_alist)
va_list ap;
int ret;
#if __STDC__
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
@ -84,7 +84,7 @@ printw(fmt, va_alist)
* Printf on the given window.
*/
int
#if __STDC__
#ifdef __STDC__
wprintw(WINDOW * win, const char *fmt, ...)
#else
wprintw(win, fmt, va_alist)
@ -112,7 +112,7 @@ wprintw(win, fmt, va_alist)
* arguments, they cannot be macros. Sigh....
*/
int
#if __STDC__
#ifdef __STDC__
mvprintw(register int y, register int x, const char *fmt, ...)
#else
mvprintw(y, x, fmt, va_alist)
@ -124,7 +124,7 @@ mvprintw(y, x, fmt, va_alist)
va_list ap;
int ret;
#if __STDC__
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
@ -137,7 +137,7 @@ mvprintw(y, x, fmt, va_alist)
}
int
#if __STDC__
#ifdef __STDC__
mvwprintw(register WINDOW * win, register int y, register int x,
const char *fmt, ...)
#else
@ -151,7 +151,7 @@ mvwprintw(win, y, x, fmt, va_alist)
va_list ap;
int ret;
#if __STDC__
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);

View File

@ -32,8 +32,8 @@
*/
#ifndef lint
/* from: static char sccsid[] = "@(#)scanw.c 8.1 (Berkeley) 6/4/93"; */
static char *rcsid = "$Id: scanw.c,v 1.5 1993/11/09 04:08:37 cgd Exp $";
/* from: static char sccsid[] = "@(#)scanw.c 8.2 (Berkeley) 10/5/93"; */
static char *rcsid = "$Id: scanw.c,v 1.6 1994/01/24 08:36:55 cgd Exp $";
#endif /* not lint */
/*
@ -42,7 +42,7 @@ static char *rcsid = "$Id: scanw.c,v 1.5 1993/11/09 04:08:37 cgd Exp $";
#include <curses.h>
#if __STDC__
#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
@ -53,7 +53,7 @@ static char *rcsid = "$Id: scanw.c,v 1.5 1993/11/09 04:08:37 cgd Exp $";
* Implement a scanf on the standard screen.
*/
int
#if __STDC__
#ifdef __STDC__
scanw(const char *fmt, ...)
#else
scanw(fmt, va_alist)
@ -64,7 +64,7 @@ scanw(fmt, va_alist)
va_list ap;
int ret;
#if __STDC__
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
@ -79,7 +79,7 @@ scanw(fmt, va_alist)
* Implements a scanf on the given window.
*/
int
#if __STDC__
#ifdef __STDC__
wscanw(WINDOW *win, const char *fmt, ...)
#else
wscanw(win, fmt, va_alist)
@ -91,7 +91,7 @@ wscanw(win, fmt, va_alist)
va_list ap;
int ret;
#if __STDC__
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
@ -107,7 +107,7 @@ wscanw(win, fmt, va_alist)
* arguments, they cannot be macros. Another sigh....
*/
int
#if __STDC__
#ifdef __STDC__
mvscanw(register int y, register int x, const char *fmt,...)
#else
mvscanw(y, x, fmt, va_alist)
@ -121,7 +121,7 @@ mvscanw(y, x, fmt, va_alist)
if (move(y, x) != OK)
return (ERR);
#if __STDC__
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
@ -132,7 +132,7 @@ mvscanw(y, x, fmt, va_alist)
}
int
#if __STDC__
#ifdef __STDC__
mvwscanw(register WINDOW * win, register int y, register int x,
const char *fmt, ...)
#else
@ -148,7 +148,7 @@ mvwscanw(win, y, x, fmt, va_alist)
if (move(y, x) != OK)
return (ERR);
#if __STDC__
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);

View File

@ -32,12 +32,11 @@
*/
#ifndef lint
/* from: static char sccsid[] = "@(#)scroll.c 8.1 (Berkeley) 6/11/93"; */
static char *rcsid = "$Id: scroll.c,v 1.5 1993/11/09 04:08:42 cgd Exp $";
/* from: static char sccsid[] = "@(#)scroll.c 8.2 (Berkeley) 1/9/94"; */
static char *rcsid = "$Id: scroll.c,v 1.6 1994/01/24 08:36:56 cgd Exp $";
#endif /* not lint */
#include <curses.h>
#include <termios.h>
/*
* scroll --

View File

@ -32,8 +32,8 @@
*/
#ifndef lint
/* from: static char sccsid[] = "@(#)setterm.c 8.2 (Berkeley) 11/29/93"; */
static char *rcsid = "$Id: setterm.c,v 1.4 1993/12/04 23:03:48 cgd Exp $";
/* from: static char sccsid[] = "@(#)setterm.c 8.3 (Berkeley) 1/2/94"; */
static char *rcsid = "$Id: setterm.c,v 1.5 1994/01/24 08:36:57 cgd Exp $";
#endif /* not lint */
#include <sys/ioctl.h>
@ -115,7 +115,7 @@ setterm(type)
}
/* POSIX 1003.2 requires that the environment override. */
if ((p = getenv("ROWS")) != NULL)
if ((p = getenv("LINES")) != NULL)
LINES = strtol(p, NULL, 10);
if ((p = getenv("COLUMNS")) != NULL)
COLS = strtol(p, NULL, 10);

View File

@ -32,8 +32,8 @@
*/
#ifndef lint
/* from: static char sccsid[] = "@(#)tstp.c 8.2 (Berkeley) 11/2/93"; */
static char *rcsid = "$Id: tstp.c,v 1.6 1993/11/09 04:08:55 cgd Exp $";
/* from: static char sccsid[] = "@(#)tstp.c 8.2 (Berkeley) 1/2/94"; */
static char *rcsid = "$Id: tstp.c,v 1.7 1994/01/24 08:36:58 cgd Exp $";
#endif /* not lint */
#include <curses.h>

View File

@ -32,8 +32,8 @@
*/
#ifndef lint
/* from: static char sccsid[] = "@(#)tty.c 8.2 (Berkeley) 10/27/93"; */
static char *rcsid = "$Id: tty.c,v 1.3 1993/11/09 04:08:56 cgd Exp $";
/* from: static char sccsid[] = "@(#)tty.c 8.2 (Berkeley) 1/2/94"; */
static char *rcsid = "$Id: tty.c,v 1.4 1994/01/24 08:36:59 cgd Exp $";
#endif /* not lint */
#include <sys/ioctl.h>