Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 19 May 2018 23:04:42 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r333901 - head/usr.bin/top
Message-ID:  <201805192304.w4JN4gaI006465@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: eadler
Date: Sat May 19 23:04:42 2018
New Revision: 333901
URL: https://svnweb.freebsd.org/changeset/base/333901

Log:
  top(1): unconditionally provide 'FreeBSD' as a version

Deleted:
  head/usr.bin/top/patchlevel.h
  head/usr.bin/top/version.c
Modified:
  head/usr.bin/top/Makefile
  head/usr.bin/top/commands.c
  head/usr.bin/top/top.c
  head/usr.bin/top/top.h

Modified: head/usr.bin/top/Makefile
==============================================================================
--- head/usr.bin/top/Makefile	Sat May 19 22:59:58 2018	(r333900)
+++ head/usr.bin/top/Makefile	Sat May 19 23:04:42 2018	(r333901)
@@ -2,7 +2,7 @@
 
 PROG=	top
 SRCS=	commands.c display.c machine.c screen.c top.c \
-	username.c utils.c version.c 
+	username.c utils.c
 SRCS+=	sigdesc.h top.local.h
 CFLAGS+= -I ${.OBJDIR}
 MAN=	top.1

Modified: head/usr.bin/top/commands.c
==============================================================================
--- head/usr.bin/top/commands.c	Sat May 19 22:59:58 2018	(r333900)
+++ head/usr.bin/top/commands.c	Sat May 19 23:04:42 2018	(r333901)
@@ -56,7 +56,7 @@ void
 show_help()
 
 {
-    printf("Top version %s, %s\n", version_string(), copyright);
+    printf("Top version FreeBSD, %s\n", copyright);
     fputs("\n\n\
 A top users display for Unix\n\
 \n\

Modified: head/usr.bin/top/top.c
==============================================================================
--- head/usr.bin/top/top.c	Sat May 19 22:59:58 2018	(r333900)
+++ head/usr.bin/top/top.c	Sat May 19 23:04:42 2018	(r333901)
@@ -380,8 +380,7 @@ char *argv[];
 	    switch(i)
 	    {
 	      case 'v':			/* show version number */
-		fprintf(stderr, "%s: version %s\n",
-			myname, version_string());
+		fprintf(stderr, "%s: version FreeBSD\n", myname);
 		exit(1);
 		break;
 
@@ -516,10 +515,9 @@ char *argv[];
 
 	      default:
 		fprintf(stderr,
-"Top version %s\n"
 "Usage: %s [-abCHIijnPqStuvwz] [-d count] [-m io | cpu] [-o field] [-s time]\n"
 "       [-J jail] [-U username] [number]\n",
-			version_string(), myname);
+			myname);
 		exit(1);
 	    }
 	}

Modified: head/usr.bin/top/top.h
==============================================================================
--- head/usr.bin/top/top.h	Sat May 19 22:59:58 2018	(r333900)
+++ head/usr.bin/top/top.h	Sat May 19 23:04:42 2018	(r333901)
@@ -25,8 +25,6 @@ extern int Header_lines;	/* 7 */
 char *itoa();
 char *itoa7();
 
-char *version_string();
-
 /* Special atoi routine returns either a non-negative number or one of: */
 #define Infinity	-1
 #define Invalid		-2

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805192304.w4JN4gaI006465>