Importing usr.bin/users

No Minix-specific changes needed.

Change-Id: I886ff43d1ec63c6c3393bc1307425676b107a274
This commit is contained in:
Thomas Cort 2013-10-15 11:23:27 -04:00
parent d091a404e8
commit 401bad1a4d
6 changed files with 185 additions and 1 deletions

View file

@ -520,6 +520,7 @@
./usr/bin/unzip minix-sys ./usr/bin/unzip minix-sys
./usr/bin/update minix-sys ./usr/bin/update minix-sys
./usr/bin/uptime minix-sys ./usr/bin/uptime minix-sys
./usr/bin/users minix-sys
./usr/bin/uud minix-sys ./usr/bin/uud minix-sys
./usr/bin/uudecode minix-sys ./usr/bin/uudecode minix-sys
./usr/bin/uue minix-sys ./usr/bin/uue minix-sys
@ -2073,6 +2074,7 @@
./usr/man/man1/unset.1 minix-sys ./usr/man/man1/unset.1 minix-sys
./usr/man/man1/unxz.1 minix-sys ./usr/man/man1/unxz.1 minix-sys
./usr/man/man1/unzip.1 minix-sys ./usr/man/man1/unzip.1 minix-sys
./usr/man/man1/users.1 minix-sys
./usr/man/man1/uud.1 minix-sys ./usr/man/man1/uud.1 minix-sys
./usr/man/man1/uue.1 minix-sys ./usr/man/man1/uue.1 minix-sys
./usr/man/man1/vi.1 minix-sys ./usr/man/man1/vi.1 minix-sys

View file

@ -200,6 +200,7 @@
2012/10/17 12:00:00,usr.bin/tsort 2012/10/17 12:00:00,usr.bin/tsort
2010/10/06 07:59:18,usr.bin/uniq 2010/10/06 07:59:18,usr.bin/uniq
2013/10/14 12:00:00,usr.bin/unzip 2013/10/14 12:00:00,usr.bin/unzip
2013/10/14 12:00:00,usr.bin/users
2012/10/17 12:00:00,usr.bin/wc 2012/10/17 12:00:00,usr.bin/wc
2013/03/22 12:00:00,usr.bin/whatis 2013/03/22 12:00:00,usr.bin/whatis
2013/03/15 12:00:00,usr.bin/who 2013/03/15 12:00:00,usr.bin/who

View file

@ -28,7 +28,7 @@ SUBDIR= \
tee tic tput \ tee tic tput \
tr tsort unexpand \ tr tsort unexpand \
toproto \ toproto \
uniq unzip \ uniq unzip users \
\ \
wc whatis who \ wc whatis who \
xargs xinstall yes xargs xinstall yes

12
usr.bin/users/Makefile Normal file
View file

@ -0,0 +1,12 @@
# $NetBSD: Makefile,v 1.5 2002/09/18 14:00:42 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
PROG= users
SRCS= users.c utmpentry.c
.PATH.c: ${NETBSDSRCDIR}/usr.bin/who
CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
.include <bsd.prog.mk>

57
usr.bin/users/users.1 Normal file
View file

@ -0,0 +1,57 @@
.\" $NetBSD: users.1,v 1.7 2003/08/07 11:16:57 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
.\" 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.
.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
.\"
.\" @(#)users.1 8.1 (Berkeley) 6/6/93
.\"
.Dd June 6, 1993
.Dt USERS 1
.Os
.Sh NAME
.Nm users
.Nd list current users
.Sh SYNOPSIS
.Nm
.Sh DESCRIPTION
.Nm
lists the login names of the users currently on the system,
in sorted order, space separated, on a single line.
.Sh FILES
.Bl -tag -width /var/run/utmp
.It Pa /var/run/utmp
.El
.Sh SEE ALSO
.Xr finger 1 ,
.Xr last 1 ,
.Xr who 1 ,
.Xr utmp 5
.Sh HISTORY
The
.Nm
command appeared in
.Bx 3.0 .

112
usr.bin/users/users.c Normal file
View file

@ -0,0 +1,112 @@
/* $NetBSD: users.c,v 1.16 2012/03/20 20:34:59 matt Exp $ */
/*
* Copyright (c) 1980, 1987, 1993
* The Regents of the University of California. All rights reserved.
*
* 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.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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/cdefs.h>
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1980, 1987, 1993\
The Regents of the University of California. All rights reserved.");
#endif /* not lint */
#ifndef lint
#if 0
static char sccsid[] = "@(#)users.c 8.1 (Berkeley) 6/6/93";
#endif
__RCSID("$NetBSD: users.c,v 1.16 2012/03/20 20:34:59 matt Exp $");
#endif /* not lint */
#include <sys/types.h>
#include <err.h>
#include <time.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "utmpentry.h"
int main(int, char **);
int
main(int argc, char **argv)
{
int ncnt = 0;
int ch;
struct utmpentry *from, *ehead, *save, **nextp;
while ((ch = getopt(argc, argv, "")) != -1)
switch(ch) {
case '?':
default:
(void)fprintf(stderr, "usage: %s\n", getprogname());
exit(1);
}
argc -= optind;
argv += optind;
ncnt = getutentries(NULL, &ehead);
if (ncnt == 0)
return 0;
/*
* XXX the utmp list belongs to getutentries and we shouldn't
* sort it in place. Since we don't call endutentries and we
* don't call getutentries again it doesn't matter, but it's
* untidy. Maybe give getutentries a sort function? It has to
* sort anyway if it's merging utmp and utmpx data.
*/
from = ehead;
ehead = NULL;
while (from != NULL) {
for (nextp = &ehead;
(*nextp) && strcmp(from->name, (*nextp)->name) > 0;
nextp = &(*nextp)->next)
continue;
save = from;
from = from->next;
save->next = *nextp;
*nextp = save;
}
save = ehead;
(void)printf("%s", ehead->name);
for (from = ehead->next; from; from = from->next)
if (strcmp(save->name, from->name) != 0) {
(void)printf(" %s", from->name);
save = from;
}
(void)printf("\n");
exit(0);
}