From 11cb2a607f5cb69fa92e711a19328dcba3579574 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Fri, 6 Jun 2014 14:14:27 -0700 Subject: [PATCH] fix regression --- ll-function | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/ll-function b/ll-function index 4c8b3e8..862b762 100644 --- a/ll-function +++ b/ll-function @@ -40,31 +40,33 @@ ll() { # lines like "total 123M", we don't want if [[ ! $line =~ ^total\ [0-9][^\ ]*$ ]]; then lines+=("$line") - [[ ! ${line:10:1} == " " ]] && aclchar=true - - # we also need to parse the hardlinks on the first pass, because for - # example ls could see the highest count as 11, and thus use 3 - # places for hardlinks, " 10", but then we use 9 or 8 for a more - # useful count, and would then use 2 places. So we have to look - # through them all because we can't rely on the spacing that ls - # decided on. - y="${line:11}" - initial_space="${y%%[![:space:]]*}" - hardlinks="${y#$initial_space}" # remove any initial spaces - hardlinks="${hardlinks%%[[:space:]]*}" # remove everything beyond first word - # ignore the hardlinks that files/dirs always have - if [[ ${line:0:1} == d ]]; then - hardlinks=$(( hardlinks - 2 )) + if ! [[ $line == [-dscbl][-r][-w][-xsS][-r][-w][-xsS][-r][-w][-xtT]* ]]; then + hardlinks= else - hardlinks=$(( hardlinks - 1 )) - fi - [[ $hardlinks == 0 ]] && hardlinks= - if (( ${#hardlinks} > max_hl_digits )); then - max_hl_digits=${#hardlinks} + [[ ! ${line:10:1} == " " ]] && aclchar=true + + # we also need to parse the hardlinks on the first pass, because for + # example ls could see the highest count as 11, and thus use 3 + # places for hardlinks, " 10", but then we use 9 or 8 for a more + # useful count, and would then use 2 places. So we have to look + # through them all because we can't rely on the spacing that ls + # decided on. + y="${line:11}" + initial_space="${y%%[![:space:]]*}" + hardlinks="${y#$initial_space}" # remove any initial spaces + hardlinks="${hardlinks%%[[:space:]]*}" # remove everything beyond first word + # ignore the hardlinks that files/dirs always have + if [[ ${line:0:1} == d ]]; then + hardlinks=$(( hardlinks - 2 )) + else + hardlinks=$(( hardlinks - 1 )) + fi + [[ $hardlinks == 0 ]] && hardlinks= + if (( ${#hardlinks} > max_hl_digits )); then + max_hl_digits=${#hardlinks} + fi fi - hl+=("$hardlinks") - fi done< <( "$binls" -lAh --color=always "--time-style=+%m-%d %Y %m-%d %I:%M %P" "$@" ) -- 2.30.2