From 32b1587779c422bd10454433ffe1cd2c3144f47c Mon Sep 17 00:00:00 2001
From: Jason Downs <downsj@cvs.openbsd.org>
Date: Sun, 17 Aug 1997 01:02:01 +0000
Subject: some small fixes...

---
 usr.bin/top/Makefile    |  4 ++--
 usr.bin/top/loadavg.h   |  4 ++--
 usr.bin/top/sigconv.awk | 13 +++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile
index aa428c726f2..cc71f6d7a35 100644
--- a/usr.bin/top/Makefile
+++ b/usr.bin/top/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 1997/08/14 14:00:20 downsj Exp $
+#	$OpenBSD: Makefile,v 1.2 1997/08/17 01:01:59 downsj Exp $
 #
 # Makefile for OpenBSD top-3.4.
 
@@ -16,7 +16,7 @@ CLEANFILES+=	sigdesc.h
 
 .depend commands.o: sigdesc.h
 
-sigdesc.h:
+sigdesc.h:	sigconv.awk
 	awk -f ${.CURDIR}/sigconv.awk /usr/include/sys/signal.h > sigdesc.h
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/top/loadavg.h b/usr.bin/top/loadavg.h
index fee726e7307..0fdfe58dd3b 100644
--- a/usr.bin/top/loadavg.h
+++ b/usr.bin/top/loadavg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadavg.h,v 1.1 1997/08/14 14:00:22 downsj Exp $	*/
+/*	$OpenBSD: loadavg.h,v 1.2 1997/08/17 01:01:59 downsj Exp $	*/
 
 /*
  *  Top - a top users display for Berkeley Unix
@@ -21,7 +21,7 @@
  *
  * Defined types:  load_avg for load averages, pctcpu for cpu percentages.
  */
-#if defined(mips) && !defined(NetBSD)
+#if defined(mips) && !defined(__OpenBSD__)
 # include <sys/fixpoint.h>
 # if defined(FBITS) && !defined(FSCALE)
 #  define FSCALE (1 << FBITS)	/* mips */
diff --git a/usr.bin/top/sigconv.awk b/usr.bin/top/sigconv.awk
index 8c90d8dc749..d73fb18670f 100644
--- a/usr.bin/top/sigconv.awk
+++ b/usr.bin/top/sigconv.awk
@@ -2,7 +2,8 @@ BEGIN		{
 		    nsig = 0;
 		    j = 0;
 		    print "/* This file was automatically generated */"
-		    print "/* by the awk script \"sigconv.awk\".      */\n"
+		    print "/* by the awk script \"sigconv.awk\".      */"	
+		    print "/* $OpenBSD: sigconv.awk,v 1.2 1997/08/17 01:02:00 downsj Exp $ */\n"
 		    print "struct sigdesc {"
 		    print "    char *name;"
 		    print "    int  number;"
@@ -18,7 +19,7 @@ BEGIN		{
 				    if (nsig < j) 
 					nsig = j;
 
-				    siglist[j] = sprintf("\"%s\",\t%2d,", \
+				    siglist[j] = sprintf("\"%s\",\t%2d", \
 						substr(str, 4), j);
 				}
 /^#[ \t]*define[ \t][ \t]*SIG[A-Z]/	{
@@ -29,7 +30,7 @@ BEGIN		{
 				    if (nsig < j)
 					nsig = j;
 
-				    siglist[j] = sprintf("\"%s\",\t%2d,", \
+				    siglist[j] = sprintf("\"%s\",\t%2d", \
 						substr(str, 4), j);
 				}
 /^#[ \t]*define[ \t][ \t]*_SIG[A-Z]/	{
@@ -40,14 +41,14 @@ BEGIN		{
 				    if (nsig < j)
 					nsig = j;
 
-				    siglist[j] = sprintf("\"%s\",\t%2d,", \
+				    siglist[j] = sprintf("\"%s\",\t%2d", \
 					    substr(str, 5), j);
 				}
 
 END				{
 				    for (n = 1; n <= nsig; n++) 
 					if (siglist[n] != "")
-					    printf("    %s\n", siglist[n]);
+					    printf("    { %s },\n", siglist[n]);
 
-				    printf("    NULL,\t 0\n};\n");
+				    printf("    { NULL,\t 0 }\n};\n");
 				}
-- 
cgit v1.2.3