From 1d4c0ebe0f4cf675c560a467218f4d8d7b17be20 Mon Sep 17 00:00:00 2001 From: Thomas Cort Date: Fri, 22 Mar 2013 20:05:41 +0000 Subject: [PATCH] Importing usr.bin/from --- distrib/sets/lists/minix/mi | 2 + releasetools/nbsd_ports | 1 + usr.bin/Makefile | 2 +- usr.bin/from/Makefile | 8 ++ usr.bin/from/from.1 | 81 +++++++++++++++++++ usr.bin/from/from.c | 153 ++++++++++++++++++++++++++++++++++++ 6 files changed, 246 insertions(+), 1 deletion(-) create mode 100644 usr.bin/from/Makefile create mode 100644 usr.bin/from/from.1 create mode 100644 usr.bin/from/from.c diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index ce90878ab..4123fc536 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -280,6 +280,7 @@ ./usr/bin/fold minix-sys ./usr/bin/format minix-sys ./usr/bin/fortune minix-sys +./usr/bin/from minix-sys ./usr/bin/fstat minix-sys ./usr/bin/ftp minix-sys ./usr/bin/gcore minix-sys @@ -1262,6 +1263,7 @@ ./usr/man/man1/for.1 minix-sys ./usr/man/man1/format.1 minix-sys ./usr/man/man1/fortune.1 minix-sys +./usr/man/man1/from.1 minix-sys ./usr/man/man1/fsck.mfs.1 minix-sys ./usr/man/man1/ftp.1 minix-sys ./usr/man/man1/genassym.1 minix-sys diff --git a/releasetools/nbsd_ports b/releasetools/nbsd_ports index 208d2e13e..5410a4210 100644 --- a/releasetools/nbsd_ports +++ b/releasetools/nbsd_ports @@ -130,6 +130,7 @@ 2012/10/17 12:00:00,usr.bin/col 2012/10/17 12:00:00,usr.bin/ctags 2011/09/01 13:37:33,usr.bin/du +2013/03/22 12:00:00,usr.bin/from 2013/03/18 12:00:00,usr.bin/head 2012/10/17 12:00:00,usr.bin/genassym 2013/03/09 12:00:00,usr.bin/getopt diff --git a/usr.bin/Makefile b/usr.bin/Makefile index d9ab2b595..665422f1a 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -10,7 +10,7 @@ SUBDIR= \ col ctags \ du \ \ - \ + from \ genassym getopt head \ indent infocmp join \ ldd \ diff --git a/usr.bin/from/Makefile b/usr.bin/from/Makefile new file mode 100644 index 000000000..4f1617870 --- /dev/null +++ b/usr.bin/from/Makefile @@ -0,0 +1,8 @@ +# @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $NetBSD: Makefile,v 1.4 2007/05/28 12:06:26 tls Exp $ + +USE_FORT?=yes # data-driven bugs? + +PROG= from + +.include diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1 new file mode 100644 index 000000000..b9085a32b --- /dev/null +++ b/usr.bin/from/from.1 @@ -0,0 +1,81 @@ +.\" $NetBSD: from.1,v 1.8 2003/08/07 11:13:49 agc Exp $ +.\" +.\" Copyright (c) 1980, 1990, 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. +.\" +.\" @(#)from.1 8.2 (Berkeley) 12/30/93 +.\" +.Dd December 30, 1993 +.Dt FROM 1 +.Os +.Sh NAME +.Nm from +.Nd print names of those who have sent mail +.Sh SYNOPSIS +.Nm +.Op Fl s Ar sender +.Op Fl f Ar file +.Op Ar user +.Sh DESCRIPTION +.Nm +prints +out the mail header lines from the invoker's mailbox. +.Pp +Options: +.Bl -tag -width Fl +.It Fl f Ar file +The supplied file +is examined instead of the invoker's mailbox. +If the +.Fl f +option is used, the +.Ar user +argument should not be used. +.It Fl s Ar sender +Only mail from addresses containing +the +supplied string are printed. +.El +.Pp +If +.Ar user +is given, the +.Ar user Ns 's +mailbox, is examined instead of the invoker's own mailbox. +(Privileges are required.) +.Sh FILES +.Bl -tag -width /var/mail/* -compact +.It Pa /var/mail/* +.El +.Sh SEE ALSO +.Xr biff 1 , +.Xr mail 1 +.Sh HISTORY +The +.Nm +command appeared in +.Bx 3.0 . diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c new file mode 100644 index 000000000..8fffeb757 --- /dev/null +++ b/usr.bin/from/from.c @@ -0,0 +1,153 @@ +/* $NetBSD: from.c,v 1.17 2008/07/21 14:19:22 lukem Exp $ */ + +/* + * Copyright (c) 1980, 1988, 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 +#ifndef lint +__COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\ + The Regents of the University of California. All rights reserved."); +#endif /* not lint */ + +#ifndef lint +#if 0 +static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93"; +#endif +__RCSID("$NetBSD: from.c,v 1.17 2008/07/21 14:19:22 lukem Exp $"); +#endif /* not lint */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int main (int, char **); +int match (const char *, const char *); + +int +main(int argc, char **argv) +{ + struct passwd *pwd; + int ch, newline; + char *file, *sender, *p; +#if MAXPATHLEN > BUFSIZ + char buf[MAXPATHLEN]; +#else + char buf[BUFSIZ]; +#endif + + file = sender = NULL; + while ((ch = getopt(argc, argv, "f:s:")) != -1) + switch((char)ch) { + case 'f': + file = optarg; + break; + case 's': + sender = optarg; + for (p = sender; *p; ++p) + *p = tolower((unsigned char)*p); + break; + default: + fprintf(stderr, "usage: from [-f file] [-s sender] [user]\n"); + exit(1); + } + argv += optind; + + /* + * We find the mailbox by: + * 1 -f flag + * 2 user + * 2 MAIL environment variable + * 3 _PATH_MAILDIR/file + */ + if (!file) { + if (!(file = *argv)) { + if (!(file = getenv("MAIL"))) { + if (!(pwd = getpwuid(getuid()))) + errx(1, "no password file entry for you"); + if ((file = getenv("LOGNAME")) != NULL || + (file = getenv("USER")) != NULL) { + (void)snprintf(buf, sizeof(buf), + "%s/%s", _PATH_MAILDIR, file); + file = buf; + } else + (void)snprintf(file = buf, sizeof(buf), + "%s/%s", + _PATH_MAILDIR, pwd->pw_name); + } + } else { + (void)snprintf(buf, sizeof(buf), "%s/%s", + _PATH_MAILDIR, file); + file = buf; + } + } + if (!freopen(file, "r", stdin)) + err(1, "can't read %s", file); + + for (newline = 1; fgets(buf, sizeof(buf), stdin);) { + if (*buf == '\n') { + newline = 1; + continue; + } + if (newline && !strncmp(buf, "From ", 5) && + (!sender || match(buf + 5, sender))) + printf("%s", buf); + newline = 0; + } + exit(0); +} + +int +match(const char *line, const char *sender) +{ + char ch, pch, first; + const char *p, *t; + + for (first = *sender++;;) { + if (isspace((unsigned char)(ch = *line))) + return(0); + ++line; + ch = tolower((unsigned char)ch); + if (ch != first) + continue; + for (p = sender, t = line;;) { + if (!(pch = *p++)) + return(1); + ch = tolower((unsigned char)*t++); + if (ch != pch) + break; + } + } + /* NOTREACHED */ +}