projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed problem with stab type for initialized static variables,
[unix-history]
/
usr
/
src
/
old
/
more
/
more.c
diff --git
a/usr/src/old/more/more.c
b/usr/src/old/more/more.c
index
f3e80ab
..
0aa5e04
100644
(file)
--- a/
usr/src/old/more/more.c
+++ b/
usr/src/old/more/more.c
@@
-1,4
+1,6
@@
-static char *sccsid = "@(#)more.c 4.12 (Berkeley) 83/06/25";
+#ifndef lint
+static char *sccsid = "@(#)more.c 4.15 (Berkeley) 83/07/07";
+#endif
/*
** more.c - General purpose tty output filter and file perusal program
/*
** more.c - General purpose tty output filter and file perusal program
@@
-17,12
+19,9
@@
static char *sccsid = "@(#)more.c 4.12 (Berkeley) 83/06/25";
#include <setjmp.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <setjmp.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <local/uparm.h>
-/* Help file will eventually go in libpath(more.help) on all systems */
-
-#define HELPFILE libpath(more.help)
-#define VI binpath(vi)
+#define HELPFILE "/usr/lib/more.help"
+#define VI "/usr/ucb/vi"
#define Fopen(s,m) (Currline = 0,file_pos=0,fopen(s,m))
#define Ftell(f) file_pos
#define Fopen(s,m) (Currline = 0,file_pos=0,fopen(s,m))
#define Ftell(f) file_pos
@@
-40,7
+39,7
@@
static char *sccsid = "@(#)more.c 4.12 (Berkeley) 83/06/25";
#define ESC '\033'
#define QUIT '\034'
#define ESC '\033'
#define QUIT '\034'
-struct sgttyb otty;
+struct sgttyb otty
, savetty
;
long file_pos, file_size;
int fnum, no_intty, no_tty, slow_tty;
int dum_opt, dlines, onquit(), end_it();
long file_pos, file_size;
int fnum, no_intty, no_tty, slow_tty;
int dum_opt, dlines, onquit(), end_it();
@@
-1326,7
+1325,7
@@
initterm ()
setbuf(stdout, obuf);
if (!(no_tty = gtty(1, &otty))) {
setbuf(stdout, obuf);
if (!(no_tty = gtty(1, &otty))) {
- if ((term = getenv("TERM"))
&&
tgetent(buf, term) <= 0) {
+ if ((term = getenv("TERM"))
== 0 ||
tgetent(buf, term) <= 0) {
dumb++; ul_opt = 0;
}
else {
dumb++; ul_opt = 0;
}
else {
@@
-1368,7
+1367,7
@@
initterm ()
if (padstr = tgetstr("pc", &clearptr))
PC = *padstr;
Home = tgetstr("ho",&clearptr);
if (padstr = tgetstr("pc", &clearptr))
PC = *padstr;
Home = tgetstr("ho",&clearptr);
- if (Home == 0
&&
*Home == '\0')
+ if (Home == 0
||
*Home == '\0')
{
if ((cursorm = tgetstr("cm", &clearptr)) != NULL) {
strcpy(cursorhome, tgoto(cursorm, 0, 0));
{
if ((cursorm = tgetstr("cm", &clearptr)) != NULL) {
strcpy(cursorhome, tgoto(cursorm, 0, 0));
@@
-1382,6
+1381,7
@@
initterm ()
}
no_intty = gtty(0, &otty);
gtty(2, &otty);
}
no_intty = gtty(0, &otty);
gtty(2, &otty);
+ savetty = otty;
ospeed = otty.sg_ospeed;
slow_tty = ospeed < B1200;
hardtabs = !(otty.sg_flags & XTABS);
ospeed = otty.sg_ospeed;
slow_tty = ospeed < B1200;
hardtabs = !(otty.sg_flags & XTABS);
@@
-1576,7
+1576,7
@@
reset_tty ()
{
otty.sg_flags |= ECHO;
otty.sg_flags &= ~MBIT;
{
otty.sg_flags |= ECHO;
otty.sg_flags &= ~MBIT;
- stty(2, &
o
tty);
+ stty(2, &
save
tty);
}
rdline (f)
}
rdline (f)