Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WARNSify, fix .Nm usage, getopt returns -1 not EOF

This commit is contained in:
lukem 1997-10-18 13:21:42 +00:00
parent 13ba69e21a
commit 6c98363c96
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/du/du.1
View File

@ -1,4 +1,4 @@
.\" $NetBSD: du.1,v 1.6 1996/10/18 07:20:31 thorpej Exp $
.\" $NetBSD: du.1,v 1.7 1997/10/18 13:21:42 lukem Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@ -40,14 +40,14 @@
.Nm du
.Nd display disk usage statistics
.Sh SYNOPSIS
.Nm du
.Nm
.Op Fl H | Fl L | Fl P
.Op Fl a | Fl s
.Op Fl ckx
.Op Ar file ...
.Sh DESCRIPTION
The
.Nm du
.Nm
utility displays the file system block usage for each file argument
and for each directory in the file hierarchy rooted in each directory
argument.
@ -67,7 +67,7 @@ No symbolic links are followed.
Display an entry for each file in the file hierarchy.
.It Fl k
By default,
.Nm du
.Nm
displays the number of blocks as returned by the
.Xr stat 2
system call, i.e. 512-byte blocks.
@ -84,7 +84,7 @@ Display only the grand total for the specified files.
Filesystem mount points are not traversed.
.El
.Pp
.Nm Du
.Nm
counts the storage used by symbolic links and not the files they
reference unless the
.Fl H
@ -107,7 +107,7 @@ by the last one specified.
.Pp
Files having multiple hard links are counted (and displayed) a single
time per
.Nm du
.Nm
execution.
.Sh ENVIRONMENT VARIABLES
.Bl -tag -width BLOCKSIZE
@ -126,6 +126,6 @@ size block.
.Xr quot 8
.Sh HISTORY
A
.Nm du
.Nm
command appeared in
.At v6 .

23
usr.bin/du/du.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $ */
/* $NetBSD: du.c,v 1.12 1997/10/18 13:21:51 lukem Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@ -36,17 +36,17 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#ifndef lint
static char copyright[] =
"@(#) Copyright (c) 1989, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n";
__COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n");
#endif /* not lint */
#ifndef lint
#if 0
static char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95";
#else
static char rcsid[] = "$NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $";
__RCSID("$NetBSD: du.c,v 1.12 1997/10/18 13:21:51 lukem Exp $");
#endif
#endif /* not lint */
@ -62,8 +62,9 @@ static char rcsid[] = "$NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $";
#include <string.h>
#include <unistd.h>
int linkchk __P((FTSENT *));
void usage __P((void));
int linkchk __P((FTSENT *));
int main __P((int, char **));
void usage __P((void));
int
main(argc, argv)
@ -81,7 +82,7 @@ main(argc, argv)
Hflag = Lflag = Pflag = aflag = cflag = kflag = sflag = 0;
totalblocks = 0;
ftsoptions = FTS_PHYSICAL;
while ((ch = getopt(argc, argv, "HLPacksx")) != EOF)
while ((ch = getopt(argc, argv, "HLPacksx")) != -1)
switch (ch) {
case 'H':
Hflag = 1;
@ -159,7 +160,7 @@ main(argc, argv)
blocksize /= 512;
if ((fts = fts_open(argv, ftsoptions, NULL)) == NULL)
err(1, NULL);
err(1, "fts_open `%s'", *argv);
for (rval = 0; (p = fts_read(fts)) != NULL;)
switch (p->fts_info) {
@ -175,7 +176,7 @@ main(argc, argv)
* or directories and this is post-order of the
* root of a traversal, display the total.
*/
if (listdirs || !listfiles && !p->fts_level)
if (listdirs || (!listfiles && !p->fts_level))
(void)printf("%ld\t%s\n",
howmany(p->fts_number, blocksize),
p->fts_path);
@ -235,7 +236,7 @@ linkchk(p)
if (nfiles == maxfiles && (files = realloc((char *)files,
(u_int)(sizeof(ID) * (maxfiles += 128)))) == NULL)
err(1, "");
err(1, "realloc");
files[nfiles].inode = ino;
files[nfiles].dev = dev;
++nfiles;