d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC df.c revision 1.66

Browse Source 
Based on The Open Group Base Specifications Issue 6 IEEE Std 1003.1, our
current implementation of df(1) is does not properly format the output under
certain conditions. Right now -kP and -Pk are not the same thing. Further,
when we set the BLOCKSIZE environment variable, we use "1k" instead of "1024",
making the header display incorrectly.
This commit is contained in:
csjp 2007-01-20 02:19:09 +00:00
parent bd48914a94
commit 2471a0fb78
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/df/df.c
View File

@ -93,7 +93,7 @@ imax(int a, int b)
return (a > b ? a : b);
}
static int aflag = 0, cflag, hflag, iflag, nflag;
static int aflag = 0, cflag, hflag, iflag, kflag, nflag;
static struct ufs_args mdev;
int
@ -123,6 +123,14 @@ main(int argc, char *argv[])
case 'b':
/* FALLTHROUGH */
case 'P':
/*
* POSIX specifically discusses the the behavior of
* both -k and -P. It states that the blocksize should
* be set to 1024. Thus, if this occurs, simply break
* rather than clobbering the old blocksize.
*/
if (kflag)
break;
putenv("BLOCKSIZE=512");
hflag = 0;
break;
@ -143,7 +151,8 @@ main(int argc, char *argv[])
iflag = 1;
break;
case 'k':
putenv("BLOCKSIZE=1k");
kflag++;
putenv("BLOCKSIZE=1024");
hflag = 0;
break;
case 'l':