more.c:

Patch from Timothy Schepens <[email protected]>:
This is a patch to let more use the window size instead of the buffer size.

sort.c: fixed qsort warning

svn path=/trunk/; revision=6421

rosapps/cmdutils/more.c

@@ -5,6 +5,8 @@
  *
  * 26 Sep 1999 - Paolo Pantaleo <[email protected]>
  *     started 
+ * Oct 2003 - Timothy Schepens <tischepe at fastmail dot fm>
+ *     use window size instead of buffer size.
  */
 
 #include <windows.h>
@@ -29,11 +31,9 @@ GetScreenSize (PSHORT maxx, PSHORT maxy)
 	CONSOLE_SCREEN_BUFFER_INFO csbi;
 
 	GetConsoleScreenBufferInfo (hStdOut, &csbi);
+		*maxx = csbi.srWindow.Right;
+		*maxy = csbi.srWindow.Bottom;
 
-	if (maxx)
-		*maxx = csbi.dwSize.X;
-	if (maxy)
-		*maxy = csbi.dwSize.Y;
 }
 
 
@@ -126,7 +126,7 @@ int main (int argc, char **argv)
 			{
 				ch_count=0;
 				line_count++;
-				if (line_count == maxy-1)
+				if (line_count == maxy)
 				{
 					line_count = 0;
 					WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL);

rosapps/cmdutils/sort.c

@@ -34,7 +34,7 @@ int             sortcol;	/* sort column */
 int             err = 0;	/* error counter */
 
 int
-cmpr(void *a, void *b)
+cmpr(const void *a, const void *b)
 {
     char           *A, *B;