X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=ll-function;h=6deb916139e8988c80ef136ace26f2b2f23447b5;hb=f0fb727480e27b66697b300d4046e8148b5623aa;hp=c17ff3d36ef206bdf4ea68deef9646697c070349;hpb=9117f3393e33f02dab2b03fef6493e15965f4093;p=small-misc-bash

diff --git a/ll-function b/ll-function
index c17ff3d..6deb916 100644
--- a/ll-function
+++ b/ll-function
@@ -14,20 +14,21 @@
 # limitations under the License.
 
 
-# ls -lA with enhanced output
-# octal permissions
-# omited acl type specifier
-# better hard link count: number of subdirectories or number of linked files or omitted if 0
-# better human readable size
-# more natural date/time format for my American raised eyes
-# remove first line size summary
 ll() {
     case $1 in
         -h|--help)
             cat <<'EOF'
 usage: ll [ARGS_TO_LS]
-
 ls -lA with enhanced output
+
+* octal permissions
+* omited acl type specifier
+* better hard link count: number of subdirectories or the
+    number of linked files or omitted if it is 0
+* better human readable size
+* more natural date/time format for my American raised eyes
+* remove first line size summary
+
 EOF
             ;;
     esac
@@ -43,7 +44,7 @@ EOF
     #  + for any other kind of acl
     #  or blank for no other kind of acl
     #  I don't want to see this generally.
-    while read line; do
+    while read -r line; do
         # if we did want the first line, it would need to be stripped of non-printing chars:
 	#line=${line#$'\E[00m'}
         # lines like "total 123M", we don't want
@@ -81,35 +82,36 @@ EOF
     for index in "${!lines[@]}"; do
         line=${lines[index]}
         hardlinks=${hl[index]}
-	if ! [[ $line == [-dscbl][-r][-w][-xsS][-r][-w][-xsS][-r][-w][-xtT]* ]]; then
+        if [[ $line != [-a-zA-Z][-r][-w][-xsS][-r][-w][-xsS][-r][-w][-xtT]* ]]; then
+            # line we don't understand
 	    printf "%s\n" "$line"
-	else
-	    perm=0
-	    for (( x=0; x<=8; x++ )); do
-		y=${line:$(( -1*x + 9 )):1}
-		[[ $y == [tT] ]] && perm=$(( perm + 512 ))
-		if [[ $y == [sS] ]]; then
-		    [[ $x == 3 ]] && perm=$(( perm + 1024 ))
-		    [[ $x == 6 ]] && perm=$(( perm + 2048 ))
-		fi
-		[[ $y != [-ST] ]] && perm=$(( perm + 2**x ))
-	    done
-            if $aclchar; then
-	        y="${line:11}"
-            else
-                y="${line:10}"
-            fi
-	    middle=${y#*[^ ]* }
-	    size=${middle#*[^ ]* *[^ ]* }
-	    middle=${middle%"$size"}
-	    tail=${size#*[^ ]* }
-	    size=${size%"$tail"}
-	    declare -i sizePadding="${#size} - 1"
-	    size=( $size ) # remove spaces
-	    size=${size/.?/}
-
-	    printf "%s%4o%${hardlink_spacing}s%s%${sizePadding}s%s\n" \
-		   "${line:0:1}" $perm "$hardlinks" " $middle" "$size" " $tail"
+            continue
 	fi
+	perm=0
+	for (( x=0; x<=8; x++ )); do
+	    y=${line:$(( -1*x + 9 )):1}
+	    [[ $y == [tT] ]] && perm=$(( perm + 512 ))
+	    if [[ $y == [sS] ]]; then
+		[[ $x == 3 ]] && perm=$(( perm + 1024 ))
+		[[ $x == 6 ]] && perm=$(( perm + 2048 ))
+	    fi
+	    [[ $y != [-ST] ]] && perm=$(( perm + 2**x ))
+	done
+        if $aclchar; then
+	    y="${line:11}"
+        else
+            y="${line:10}"
+        fi
+	middle=${y#*[^ ]* }
+	size=${middle#*[^ ]* *[^ ]* }
+	middle=${middle%"$size"}
+	tail=${size#*[^ ]* }
+	size=${size%"$tail"}
+	declare -i sizePadding="${#size} - 1"
+	size=( $size ) # remove spaces
+	size=${size/.?/}
+
+	printf "%s%4o%${hardlink_spacing}s%s%${sizePadding}s%s\n" \
+	       "${line:0:1}" $perm "$hardlinks" " $middle" "$size" " $tail"
     done
 }