From 39dfacb5b4f69e62c943d09a85c4029adf56ec88 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Mon, 1 Dec 2003 19:10:29 +0000
Subject: Do something sensible if both -h and -k are given.

Approved by:	re(scottl)
---
 bin/ls/ls.1 | 8 ++++++++
 bin/ls/ls.c | 1 +
 2 files changed, 9 insertions(+)

(limited to 'bin')

diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index fc3154e..e2a826a 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -186,6 +186,14 @@ option is specified, print the file size allocation in kilobytes,
 not blocks.
 This option overrides the environment variable
 .Ev BLOCKSIZE .
+Note that
+.Fl k
+is mutually exclusive to
+.Fl h
+and later
+.Fl k
+will nullify earlier
+.Fl h .
 .It Fl l
 (The lowercase letter
 .Dq ell . )
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 53d6608..28eb59a 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':
-- 
cgit v1.1