back out changes that should not have escaped my local tree

1 files changed, 17 insertions, 21 deletions

diff --git a/usr.bin/top/display.c b/usr.bin/top/display.c
index 5c2848252d3..93b65b07ee3 100644
--- a/usr.bin/top/display.c
+++ b/usr.bin/top/display.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: display.c,v 1.3 1999/03/06 20:19:21 millert Exp $	*/
+/*	$OpenBSD: display.c,v 1.4 1999/03/06 20:27:42 millert Exp $	*/
 
 /*
  *  Top users/processes display for Unix
@@ -57,7 +57,7 @@ static int display_width = MAX_COLS;
 
 static char *cpustates_tag __P((void));
 static int string_count __P((char **));
-static void summary_format __P((char *, size_t, int *, char **));
+static void summary_format __P((char *, int *, char **));
 static void line_update __P((char *, char *, int, int));
 
 #define lineindex(l) ((l)*display_width)
@@ -305,8 +305,7 @@ int *brkdn;
     }
 
     /* format and print the process state summary */
-    summary_format(procstates_buffer, sizeof(procstates_buffer), brkdn,
-	procstate_names);
+    summary_format(procstates_buffer, brkdn, procstate_names);
     fputs(procstates_buffer, stdout);
 
     /* save the numbers for next time */
@@ -355,7 +354,7 @@ int *brkdn;
     if (memcmp(lprocstates, brkdn, num_procstates * sizeof(int)) != 0)
     {
 	/* format and update the line */
-	summary_format(new, sizeof(new), brkdn, procstate_names);
+	summary_format(new, brkdn, procstate_names);
 	line_update(procstates_buffer, new, x_brkdn, y_brkdn);
 	memcpy(lprocstates, brkdn, num_procstates * sizeof(int));
     }
@@ -523,7 +522,7 @@ int *stats;
     lastline++;
 
     /* format and print the memory summary */
-    summary_format(memory_buffer, sizeof(memory_buffer), stats, memory_names);
+    summary_format(memory_buffer, stats, memory_names);
     fputs(memory_buffer, stdout);
 }
 
@@ -535,7 +534,7 @@ int *stats;
     static char new[MAX_COLS];
 
     /* format the new line */
-    summary_format(new, sizeof(new), stats, memory_names);
+    summary_format(new, stats, memory_names);
     line_update(memory_buffer, new, x_mem, y_mem);
 }
 
@@ -936,22 +935,19 @@ register char **pp;
     return(cnt);
 }
 
-static void summary_format(str, siz, numbers, names)
+static void summary_format(str, numbers, names)
 
 char *str;
-size_t siz;
 int *numbers;
 register char **names;
 
 {
+    register char *p;
     register int num;
     register char *thisname;
 
-    if (siz == 0)
-	return;
-
     /* format each number followed by its string */
-    *str = '\0';
+    p = str;
     while ((thisname = *names++) != NULL)
     {
 	/* get the number to format */
@@ -964,30 +960,30 @@ register char **names;
 	    if (thisname[0] == 'K')
 	    {
 		/* yes: format it as a memory value */
-		strlcat(str, format_k(num), siz);
+		p = strecpy(p, format_k(num));
 
 		/* skip over the K, since it was included by format_k */
-		strlcat(str, thisname+1, siz);
+		p = strecpy(p, thisname+1);
 	    }
 	    else
 	    {
-		strlcat(str, itoa(num), siz);
-		strlcat(str, thisname, siz);
+		p = strecpy(p, itoa(num));
+		p = strecpy(p, thisname);
 	    }
 	}
 
 	/* ignore negative numbers, but display corresponding string */
 	else if (num < 0)
 	{
-	    strlcat(str, thisname, siz);
+	    p = strecpy(p, thisname);
 	}
     }
 
     /* if the last two characters in the string are ", ", delete them */
-    thisname = str + strlen(str) - 2;
-    if (thisname >= str && thisname[0] == ',' && thisname[1] == ' ')
+    p -= 2;
+    if (p >= str && p[0] == ',' && p[1] == ' ')
     {
-	*thisname = '\0';
+	*p = '\0';
     }
 }