first cut at new makefile; file reorg, new depend

[unix-history] / usr / src / usr.bin / more / position.c

diff --git a/usr/src/usr.bin/more/position.c b/usr/src/usr.bin/more/position.c
index e646525..8e5d368 100644 (file)
--- a/usr/src/usr.bin/more/position.c
+++ b/usr/src/usr.bin/more/position.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)position.c 5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)position.c 5.4 (Berkeley) %G%";

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


@@ -31,13 +31,13 @@ static char sccsid[] = "@(#)position.c      5.2 (Berkeley) %G%";
  *    and just change a couple of pointers. }}
  */
 
  *    and just change a couple of pointers. }}
  */
 

-#include "less.h"
-#include "position.h"
+#include <sys/types.h>
+#include <less.h>

 
 #define        NPOS    100             /* {{ sc_height must be less than NPOS }} */
 
 #define        NPOS    100             /* {{ sc_height must be less than NPOS }} */

-static POSITION table[NPOS];   /* The position table */
+static off_t table[NPOS];      /* The position table */

 
 

-extern int sc_width, sc_height;
+extern int sc_height;

 
 /*
  * Return the starting file position of a line displayed on the screen.
 
 /*
  * Return the starting file position of a line displayed on the screen.


@@ -48,7 +48,7 @@ extern int sc_width, sc_height;
  *     the bottom line on the screen
  *     the line after the bottom line on the screen
  */
  *     the bottom line on the screen
  *     the line after the bottom line on the screen
  */

-       public POSITION
+off_t

 position(where)
        int where;
 {
 position(where)
        int where;
 {


@@ -69,9 +69,8 @@ position(where)
 /*
  * Add a new file position to the bottom of the position table.
  */
 /*
  * Add a new file position to the bottom of the position table.
  */

-       public void

 add_forw_pos(pos)
 add_forw_pos(pos)

-       POSITION pos;
+       off_t pos;

 {
        register int i;
 
 {
        register int i;
 


@@ -86,9 +85,8 @@ add_forw_pos(pos)
 /*
  * Add a new file position to the top of the position table.
  */
 /*
  * Add a new file position to the top of the position table.
  */

-       public void

 add_back_pos(pos)
 add_back_pos(pos)

-       POSITION pos;
+       off_t pos;

 {
        register int i;
 
 {
        register int i;
 


@@ -100,10 +98,20 @@ add_back_pos(pos)
        table[0] = pos;
 }
 
        table[0] = pos;
 }
 

+copytable()
+{
+       register int a, b;
+
+       for (a = 0; a < sc_height && table[a] == NULL_POSITION; a++);
+       for (b = 0; a < sc_height; a++, b++) {
+               table[b] = table[a];
+               table[a] = NULL_POSITION;
+       }
+}
+

 /*
  * Initialize the position table, done whenever we clear the screen.
  */
 /*
  * Initialize the position table, done whenever we clear the screen.
  */

-       public void

 pos_clear()
 {
        register int i;
 pos_clear()
 {
        register int i;


@@ -117,9 +125,8 @@ pos_clear()
  * Check the position table to see if the position falls within its range.
  * Return the position table entry if found, -1 if not.
  */
  * Check the position table to see if the position falls within its range.
  * Return the position table entry if found, -1 if not.
  */

-       public int

 onscreen(pos)
 onscreen(pos)

-       POSITION pos;
+       off_t pos;

 {
        register int i;
 
 {
        register int i;