From 3210047753e19fa10c2a78d438ba2b6a57d281b6 Mon Sep 17 00:00:00 2001 From: charnier Date: Wed, 7 Jan 1998 07:46:33 +0000 Subject: Sync usage and synopsis. Add rcsid. --- usr.bin/ncal/ncal.1 | 11 ++++++----- usr.bin/ncal/ncal.c | 20 ++++++++++++-------- 2 files changed, 18 insertions(+), 13 deletions(-) (limited to 'usr.bin/ncal') diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1 index f538a8b..9e13591 100644 --- a/usr.bin/ncal/ncal.1 +++ b/usr.bin/ncal/ncal.1 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: ncal.1,v 1.2 1997/12/19 21:41:21 helbig Exp $ +.\" $Id: ncal.1,v 1.3 1998/01/03 15:10:11 helbig Exp $ .\" .Dd December 16, 1997 .Dt CAL 1 @@ -37,7 +37,7 @@ .Op Oo Ar month Oc Ar \ year .Nm ncal .Op Fl jJpwy -.Op Fl s Ar country code +.Op Fl s Ar country_code .Op Oo Ar month Oc Ar \ year .Nm ncal .Op Fl Jeo @@ -51,8 +51,9 @@ The new format is a little cramped but it makes a year fit on a 25x80 terminal. If arguments are not specified, the current month is displayed. +.Pp The options are as follows: -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl J Display Julian Calendar, if combined with the .Fl e @@ -70,10 +71,10 @@ Calendar as they are assumed by .Nm ncal . The country code as determined from the local environment is marked with an asterisk. -.It Fl s Ar country-code +.It Fl s Ar country_code Assume the switch from Julian to Gregorian Calendar at the date associated with the -.Ar country-code . +.Ar country_code . If not specified, .Nm ncal tries to guess the switch date from the local environment or diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c index 6471007..24363d6 100644 --- a/usr.bin/ncal/ncal.c +++ b/usr.bin/ncal/ncal.c @@ -22,9 +22,13 @@ * 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. - * - * $Id: ncal.c,v 1.3 1998/01/03 15:10:11 helbig Exp $ */ + +#ifndef lint +static const char rcsid[] = + "$Id$"; +#endif /* not lint */ + #include #include #include @@ -170,7 +174,7 @@ date *sdate(int ndays, struct date * d); date *sdateb(int ndays, struct date * d); int sndays(struct date * d); int sndaysb(struct date * d); -void usage(void); +static void usage(void); int weekdayb(int nd); int @@ -331,14 +335,14 @@ main(int argc, char *argv[]) return (0); } -void +static void usage(void) { - fprintf(stderr, - "usage: cal [-jy] [month[year]]\n" - "usage: ncal [-Jjpwy] [-s country_code] [[month] year]\n" - "usage: ncal [-Jeo] [year]\n"); + fprintf(stderr, "%s\n%s\n%s\n", + "usage: cal [-jy] [month[year]]", + " ncal [-Jjpwy] [-s country_code] [[month] year]", + " ncal [-Jeo] [year]"); exit(EX_USAGE); } -- cgit v1.1