From owner-svn-src-head@freebsd.org Sat May 19 23:04:44 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 160FBEE7AFE; Sat, 19 May 2018 23:04:44 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5F9EB83F7A; Sat, 19 May 2018 23:04:43 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 40F385E7E; Sat, 19 May 2018 23:04:43 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4JN4h34006469; Sat, 19 May 2018 23:04:43 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4JN4gaI006465; Sat, 19 May 2018 23:04:42 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201805192304.w4JN4gaI006465@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 19 May 2018 23:04:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333901 - head/usr.bin/top X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/usr.bin/top X-SVN-Commit-Revision: 333901 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2018 23:04:44 -0000 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