summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2007-02-20 13:52:23 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2007-02-20 13:52:23 +0000
commit8cc97ed4bef6d2245a9c7a1316826071a34e8048 (patch)
tree9bcaa71461aea4d1bae372d2d519c3cae9088632 /usr.bin
parent903dac4e279dc173ef762ba0a2e21cccb9314e24 (diff)
sort options and avoid line wrap; from Igor Sobrado
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/from/from.14
-rw-r--r--usr.bin/from/from.c7
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index fef312f8ac6..66e6c749b96 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: from.1,v 1.8 2003/06/03 02:56:08 millert Exp $
+.\" $OpenBSD: from.1,v 1.9 2007/02/20 13:52:22 jmc Exp $
.\" $NetBSD: from.1,v 1.4 1995/09/01 01:39:09 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -38,8 +38,8 @@
.Nd print names of those who have sent mail
.Sh SYNOPSIS
.Nm from
-.Op Fl s Ar sender
.Op Fl f Ar file
+.Op Fl s Ar sender
.Op Ar user
.Sh DESCRIPTION
.Nm
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index e4664407099..5310d6333f7 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: from.c,v 1.12 2006/03/14 19:39:49 moritz Exp $ */
+/* $OpenBSD: from.c,v 1.13 2007/02/20 13:52:22 jmc Exp $ */
/* $NetBSD: from.c,v 1.6 1995/09/01 01:39:10 jtc Exp $ */
/*
@@ -40,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: from.c,v 1.12 2006/03/14 19:39:49 moritz Exp $";
+static char rcsid[] = "$OpenBSD: from.c,v 1.13 2007/02/20 13:52:22 jmc Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -81,7 +81,8 @@ main(int argc, char *argv[])
break;
case '?':
default:
- fprintf(stderr, "usage: from [-f file] [-s sender] [user]\n");
+ fprintf(stderr,
+ "usage: from [-f file] [-s sender] [user]\n");
exit(1);
}
argv += optind;