aboutsummaryrefslogtreecommitdiff
path: root/bin/ls/ls.c
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2003-12-01 19:10:29 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2003-12-01 19:10:29 +0000
commitd5f9f41c7bc4e4340ea20dd156fc32dc50db0cbf (patch)
tree3dc0a83b78d87ba5d1a31c04d2a2dbc9c4ae7b9b /bin/ls/ls.c
parentda6f8233bc410099fbcf7702a2e24bcc8ae9bc62 (diff)
downloadsrc-d5f9f41c7bc4e4340ea20dd156fc32dc50db0cbf.tar.gz
src-d5f9f41c7bc4e4340ea20dd156fc32dc50db0cbf.zip
Do something sensible if both -h and -k are given.
Approved by: re(scottl)
Notes
Notes: svn path=/head/; revision=123089
Diffstat (limited to 'bin/ls/ls.c')
-rw-r--r--bin/ls/ls.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 53d6608e4353..28eb59ab873c 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -267,6 +267,7 @@ main(int argc, char *argv[])
f_inode = 1;
break;
case 'k':
+ f_humanval = 0;
f_kblocks = 1;
break;
case 'm':