From 55c5024e9c779c340c1e562b69ee37bf75d5c0d0 Mon Sep 17 00:00:00 2001 From: Philippe Charnier Date: Mon, 15 Sep 1997 06:33:52 +0000 Subject: [PATCH] Put includes in alphabetical order. various cosmetics. --- usr.sbin/ckdist/ckdist.1 | 12 ++++++------ usr.sbin/ckdist/ckdist.c | 23 ++++++++++++----------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/usr.sbin/ckdist/ckdist.1 b/usr.sbin/ckdist/ckdist.1 index b9cef545f379..dd9b78ed149e 100644 --- a/usr.sbin/ckdist/ckdist.1 +++ b/usr.sbin/ckdist/ckdist.1 @@ -1,7 +1,7 @@ .\" Copyright (c) 1997 Robert Nordier .\" All rights reserved. .\" -.\" $Id: ckdist.1,v 1.2 1997/01/20 16:47:04 rnordier Exp $ +.\" $Id: ckdist.1,v 1.1.1.1 1997/01/21 12:58:53 jkh Exp $ .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -36,10 +36,10 @@ .Bq Fl d Ar dir .Bq Fl n Ar name .Bq Fl t Ar type -.Ar file ... +.Ar .Sh DESCRIPTION The -.Nm ckdist +.Nm utility reads "checksum" files (which are assumed to specify components of a software distribution) and verifies the integrity of the distribution by validating the checksum of each component file. @@ -75,8 +75,8 @@ Look for distribution components in the directory .It Fl n Ar name Access distribution components using the filename .Ar name . -(When accessing .inf file components, append the appropriate -extension to the filename.) +When accessing .inf file components, append the appropriate +extension to the filename. .It Fl t Ar type Assume that all specified checksum files are of the format .Ar type , @@ -92,5 +92,5 @@ a distribution, and 2 if usage errors, inaccessible input files, or other system errors were encountered. .Sh NOTES Both BSD and DOS versions of -.Nm ckdist +.Nm are available. diff --git a/usr.sbin/ckdist/ckdist.c b/usr.sbin/ckdist/ckdist.c index c0bb6df0492c..e71a581d7c14 100644 --- a/usr.sbin/ckdist/ckdist.c +++ b/usr.sbin/ckdist/ckdist.c @@ -2,8 +2,6 @@ * Copyright (c) 1997 Robert Nordier * All rights reserved. * - * $Id: ckdist.c,v 1.6 1997/01/20 16:47:06 rnordier Exp $ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -27,18 +25,22 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef lint +static const char rcsid[] = + "$Id$"; +#endif /* not lint */ + #include #include -#include -#include -#include #include -#include - #include +#include +#include +#include +#include #include #include -#include +#include extern int crc(int fd, u_long * cval, u_long * clen); @@ -131,7 +133,7 @@ main(int argc, char *argv[]) if (stat(opt_dir, &sb)) err(2, opt_dir); if (!S_ISDIR(sb.st_mode)) - errx(2, "%s: Not a directory", opt_dir); + errx(2, "%s: not a directory", opt_dir); } rval = 0; do { @@ -433,7 +435,6 @@ static void usage(void) { fprintf(stderr, - "usage: ckdist [-airsx] [-d dir] [-n name] [-t type] file" - " ...\n"); + "usage: ckdist [-airsx] [-d dir] [-n name] [-t type] file ...\n"); exit(2); }