diff options
-rw-r--r-- | usr.bin/top/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/top/commands.c | 2 | ||||
-rw-r--r-- | usr.bin/top/patchlevel.h | 2 | ||||
-rw-r--r-- | usr.bin/top/top.c | 6 | ||||
-rw-r--r-- | usr.bin/top/top.h | 2 | ||||
-rw-r--r-- | usr.bin/top/version.c | 28 |
6 files changed, 4 insertions, 38 deletions
diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile index 66b60c570ff6..87f1d7ae0618 100644 --- a/usr.bin/top/Makefile +++ b/usr.bin/top/Makefile @@ -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 diff --git a/usr.bin/top/commands.c b/usr.bin/top/commands.c index 4b8cc3788b13..c08f70a0fe54 100644 --- a/usr.bin/top/commands.c +++ b/usr.bin/top/commands.c @@ -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\ diff --git a/usr.bin/top/patchlevel.h b/usr.bin/top/patchlevel.h deleted file mode 100644 index 28db88951c1b..000000000000 --- a/usr.bin/top/patchlevel.h +++ /dev/null @@ -1,2 +0,0 @@ -#define PATCHLEVEL 5 -#define BETA "beta12" diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c index d9bd6fe76520..193bca8e4644 100644 --- a/usr.bin/top/top.c +++ b/usr.bin/top/top.c @@ -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); } } diff --git a/usr.bin/top/top.h b/usr.bin/top/top.h index e4f8c49bdb7d..685a647cd32b 100644 --- a/usr.bin/top/top.h +++ b/usr.bin/top/top.h @@ -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 diff --git a/usr.bin/top/version.c b/usr.bin/top/version.c deleted file mode 100644 index ea6b630f6dba..000000000000 --- a/usr.bin/top/version.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Top users/processes display for Unix - * Version 3 - * - * This program may be freely redistributed, - * but this entire comment MUST remain intact. - * - * Copyright (c) 1984, 1989, William LeFebvre, Rice University - * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University - */ - -#include <stdio.h> -#include <string.h> - -#include "top.h" -#include "patchlevel.h" - -static char version[16]; - -char *version_string() - -{ - sprintf(version, "%d.%d", VERSION, PATCHLEVEL); -#ifdef BETA - strcat(version, BETA); -#endif - return(version); -} |