[syslinux:master] rosh: more: if it's the first line, dump it to screen for now even if it's too long

syslinux-bot for Gene Cumm gene.cumm at gmail.com
Fri Oct 8 13:57:15 PDT 2010


Commit-ID:  8f38bdc111eca5eb0683b8f385d5aa155f8f9e5a
Gitweb:     http://syslinux.zytor.com/commit/8f38bdc111eca5eb0683b8f385d5aa155f8f9e5a
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Thu, 1 Jul 2010 21:57:45 -0400
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Wed, 7 Jul 2010 09:58:56 -0400

rosh: more: if it's the first line, dump it to screen for now even if it's too long



---
 com32/rosh/rosh.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/com32/rosh/rosh.c b/com32/rosh/rosh.c
index b35b894..594c800 100644
--- a/com32/rosh/rosh.c
+++ b/com32/rosh/rosh.c
@@ -775,7 +775,6 @@ void rosh_dir(const char *cmdstr)
 /* Page through a buffer string
  *	buf	Buffer to page through
  */
-//HERE: minor pagination issue; sometimes prints 1 less than rows
 void rosh_more_buf(char *buf, int buflen, int rows, int cols)
 {
     char *bufp, *bufeol, *bufeol2;	/* Pointer to current and next
@@ -804,7 +803,9 @@ void rosh_more_buf(char *buf, int buflen, int rows, int cols)
 		i += elpl;
 		ROSH_DEBUG2("  %d/%d  ", elpl, i+1);
 		/* If this will not push too much, use it */
-		if (i < numln)
+		/* but if it's the first line, use it */
+		/* //HERE: We should probably snip the line off */
+		if ((i < numln) || ((i == elpl) && (i >= numln)))
 			bufeol = bufeol2 + 1;
 	    }
 	}



More information about the Syslinux-commits mailing list