diff options
| -rw-r--r-- | usr.bin/top/Makefile | 5 | ||||
| -rw-r--r-- | usr.bin/top/patchlevel.h | 3 | ||||
| -rw-r--r-- | usr.bin/top/top.h | 5 | ||||
| -rw-r--r-- | usr.bin/top/version.c | 44 |
4 files changed, 3 insertions, 54 deletions
diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile index 65759057f27..9da281a6ac8 100644 --- a/usr.bin/top/Makefile +++ b/usr.bin/top/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2007/05/29 00:56:56 otto Exp $ +# $OpenBSD: Makefile,v 1.14 2007/09/25 06:02:36 otto Exp $ # # Makefile for OpenBSD top-3.4. PROG= top CFLAGS+=-I. -Wall -g -Wmissing-prototypes -SRCS= commands.c display.c machine.c screen.c top.c username.c utils.c \ - version.c +SRCS= commands.c display.c machine.c screen.c top.c username.c utils.c DPADD= ${LIBCURSES} LDADD= -lcurses diff --git a/usr.bin/top/patchlevel.h b/usr.bin/top/patchlevel.h deleted file mode 100644 index 9fc4a61610c..00000000000 --- a/usr.bin/top/patchlevel.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: patchlevel.h,v 1.1 1997/08/14 14:00:24 downsj Exp $ */ - -#define PATCHLEVEL 4 diff --git a/usr.bin/top/top.h b/usr.bin/top/top.h index 4abc4661189..f9609c0e18e 100644 --- a/usr.bin/top/top.h +++ b/usr.bin/top/top.h @@ -1,4 +1,4 @@ -/* $OpenBSD: top.h,v 1.10 2007/05/29 00:56:56 otto Exp $ */ +/* $OpenBSD: top.h,v 1.11 2007/09/25 06:02:36 otto Exp $ */ /* * Top users/processes display for Unix @@ -82,6 +82,3 @@ extern void quit(int); /* username.c */ extern char *username(uid_t); extern uid_t userid(char *); - -/* version.c */ -extern char *version_string(void); diff --git a/usr.bin/top/version.c b/usr.bin/top/version.c deleted file mode 100644 index 0993d14a2fe..00000000000 --- a/usr.bin/top/version.c +++ /dev/null @@ -1,44 +0,0 @@ -/* $OpenBSD: version.c,v 1.6 2003/06/12 23:09:30 deraadt Exp $ */ - -/* - * Top users/processes display for Unix - * Version 3 - * - * Copyright (c) 1984, 1989, William LeFebvre, Rice University - * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR OR HIS EMPLOYER BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <sys/types.h> -#include <stdio.h> - -#include "top.h" -#include "patchlevel.h" - -char * -version_string(void) -{ - static char version[16]; - - snprintf(version, sizeof(version), "%d.%d", VERSION, PATCHLEVEL); - return(version); -} |