diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index affcc01d4..1e502071b 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -335,6 +335,7 @@ ./usr/bin/loadramdisk minix-sys ./usr/bin/logger minix-sys ./usr/bin/login minix-sys +./usr/bin/logname minix-sys ./usr/bin/look minix-sys ./usr/bin/lorder minix-sys ./usr/bin/lp minix-sys @@ -1321,6 +1322,7 @@ ./usr/man/man1/local.1 minix-sys ./usr/man/man1/logger.1 minix-sys ./usr/man/man1/login.1 minix-sys +./usr/man/man1/logname.1 minix-sys ./usr/man/man1/look.1 minix-sys ./usr/man/man1/lorder.1 minix-sys ./usr/man/man1/lp.1 minix-sys diff --git a/releasetools/nbsd_ports b/releasetools/nbsd_ports index fc01df8ac..348539b17 100644 --- a/releasetools/nbsd_ports +++ b/releasetools/nbsd_ports @@ -143,6 +143,7 @@ 2012/10/17 12:00:00,usr.bin/join 2011/01/17 18:11:10,usr.bin/ldd 2012/02/10 16:16:12,usr.bin/login +2013/05/30 12:00:00,usr.bin/logname 2012/10/17 12:00:00,usr.bin/lorder 2012/10/17 12:00:00,usr.bin/m4 2012/10/17 12:00:00,usr.bin/make diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 0861ec757..b4872e11a 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -14,7 +14,7 @@ SUBDIR= \ genassym getopt head \ indent infocmp join \ ldd \ - login lorder m4 \ + login logname lorder m4 \ make man \ mkdep mktemp \ \ diff --git a/usr.bin/logname/Makefile b/usr.bin/logname/Makefile new file mode 100644 index 000000000..ff6a8e1b7 --- /dev/null +++ b/usr.bin/logname/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.3 1994/12/22 06:33:38 jtc Exp $ +# @(#)Makefile 8.1 (Berkeley) 6/9/93 + +PROG= logname + +.include diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1 new file mode 100644 index 000000000..8c57897b4 --- /dev/null +++ b/usr.bin/logname/logname.1 @@ -0,0 +1,74 @@ +.\" $NetBSD: logname.1,v 1.12 2003/08/07 11:14:26 agc Exp $ +.\" +.\" Copyright (c) 1991, 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" This code is derived from software contributed to Berkeley by +.\" the Institute of Electrical and Electronics Engineers, Inc. +.\" +.\" 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. +.\" +.\" @(#)logname.1 8.1 (Berkeley) 6/9/93 +.\" +.Dd June 9, 1993 +.Dt LOGNAME 1 +.Os +.Sh NAME +.Nm logname +.Nd display user's login name +.Sh SYNOPSIS +.Nm +.Sh DESCRIPTION +The +.Nm +utility writes the user's login name to standard output followed by +a newline. +.Pp +The +.Nm +utility explicitly ignores the +.Ev LOGNAME +and +.Ev USER +environment variables +because the environment cannot be trusted. +.Pp +The +.Nm +utility exits 0 on success, and \*[Gt]0 if an error occurs. +.Sh SEE ALSO +.Xr who 1 , +.Xr whoami 1 , +.Xr getlogin 2 +.Sh STANDARDS +The +.Nm +utility conforms to +.St -p1003.2-92 . +.Sh HISTORY +The +.Nm +command appeared in +.Bx 4.4 . diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c new file mode 100644 index 000000000..77f10094b --- /dev/null +++ b/usr.bin/logname/logname.c @@ -0,0 +1,85 @@ +/* $NetBSD: logname.c,v 1.10 2011/09/04 20:29:12 joerg Exp $ */ + +/*- + * Copyright (c) 1991, 1993, 1994 + * 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 +#ifndef lint +__COPYRIGHT("@(#) Copyright (c) 1991, 1993, 1994\ + The Regents of the University of California. All rights reserved."); +#endif /* not lint */ + +#ifndef lint +#if 0 +static char sccsid[] = "@(#)logname.c 8.2 (Berkeley) 4/3/94"; +#endif +__RCSID("$NetBSD: logname.c,v 1.10 2011/09/04 20:29:12 joerg Exp $"); +#endif /* not lint */ + +#include +#include +#include +#include +#include + +__dead static void usage(void); + +int +main(int argc, char *argv[]) +{ + int ch; + char *p; + + setlocale(LC_ALL, ""); + + while ((ch = getopt(argc, argv, "")) != -1) + switch (ch) { + case '?': + default: + usage(); + /* NOTREACHED */ + } + + if (argc != optind) { + usage(); + /* NOTREACHED */ + } + + if ((p = getlogin()) == NULL) + err(1, "getlogin"); + (void)printf("%s\n", p); + exit(0); +} + +static void +usage(void) +{ + (void)fprintf(stderr, "usage: logname\n"); + exit(1); +}