cpt: remove cpt-stat and cpt-readlink, add _stat() and _readlinkf

cpt-readlink and cpt-stat were unnecessary additions for mundane tasks. Since
they were binaries instead of scripts, they added an extra layer of complexity
to the library.

These functions are now included inside the package manager library with the names
_readlinkf() and _stat().

FossilOrigin-Name: 7e15e2b57ddcb834c4286c8d1ac0a28031ae4f5d39f3c6a99f5b3aa0e9a83d43

4 files changed, 65 insertions, 18 deletions

diff --git a/src/cpt b/src/cpt
index ce4c70f..57e16b4 100755
--- a/src/cpt
+++ b/src/cpt
@@ -16,8 +16,8 @@ case "$arg" in
         done
 
         for path; do
-            # These are the files to be ignored.
-            contains "lib readlink stat" "$path" && continue
+            # Ignore the library.
+            [ lib = "$path" ] && continue
 
             printf "%b->%b %-${max}s  " "$colorb" "$colre" "${path#*/cpt-}"
             sed -n 's/^# *//;2p' "$(command -v "cpt-$path")"
diff --git a/src/cpt-checksum b/src/cpt-checksum
index 0a83ae0..cd1fa4e 100755
--- a/src/cpt-checksum
+++ b/src/cpt-checksum
@@ -22,8 +22,7 @@ for pkg; do
             tee "$repo_dir/checksums"
         else
             log "$pkg" "Need permissions to generate checksums"
-
-            user=$(cpt-stat "$repo_dir") as_root tee "$repo_dir/checksums"
+            user=$(_stat "$repo_dir") as_root tee "$repo_dir/checksums"
         fi
     }
 
diff --git a/src/cpt-lib.in b/src/cpt-lib.in
index 3d2b2f4..34af54b 100644
--- a/src/cpt-lib.in
+++ b/src/cpt-lib.in
@@ -44,6 +44,48 @@ trap_set() {
     esac
 }
 
+_stat() (
+    _user=; eval set -- "$(ls -ld "$1")"
+    id -u "${_user:=$3}" >/dev/null 2>&1 || _user=root
+    printf '%s' "$_user"
+)
+
+_readlinkf() (
+    # Public domain POSIX sh readlink function by Koichi Nakashima
+    [ "${1:-}" ] || return 1
+    max_symlinks=40
+    CDPATH='' # to avoid changing to an unexpected directory
+
+    target=$1
+    [ -e "${target%/}" ] || target=${1%"${1##*[!/]}"} # trim trailing slashes
+    [ -d "${target:-/}" ] && target="$target/"
+
+    cd -P . 2>/dev/null || return 1
+    while [ "$max_symlinks" -ge 0 ] && max_symlinks=$((max_symlinks - 1)); do
+        if [ ! "$target" = "${target%/*}" ]; then
+            case $target in
+                /*) cd -P "${target%/*}/" 2>/dev/null || break ;;
+                *) cd -P "./${target%/*}" 2>/dev/null || break ;;
+            esac
+            target=${target##*/}
+        fi
+
+        if [ ! -L "$target" ]; then
+            target="${PWD%/}${target:+/}${target}"
+            printf '%s\n' "${target:-/}"
+            return 0
+        fi
+
+        # `ls -dl` format: "%s %u %s %s %u %s %s -> %s\n",
+        #   <file mode>, <number of links>, <owner name>, <group name>,
+        #   <size>, <date and time>, <pathname of link>, <contents of link>
+        # https://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html
+        link=$(ls -dl -- "$target" 2>/dev/null) || break
+        target=${link#*" $target -> "}
+    done
+    return 1
+)
+
 # This is the public domain getoptions shell library. It also forms a usage
 # function.
 # URL: https://github.com/ko1nksm/getoptions (v2.0.1)
@@ -1145,14 +1187,11 @@ pkg_conflicts() {
         # Use $CPT_ROOT in filename so that we follow its symlinks.
         file=$CPT_ROOT/${file#/}
 
-        # We will only follow the symlinks of the directories, so we
-        # reserve the directory name in this 'dirname' value. cpt-readlink
-        # functions in a similar fashion to 'readlink -f', it makes sure
-        # every component except for the first one to be available on
-        # the directory structure. If we cannot find it in the system,
-        # we don't need to make this much more complex by trying so
-        # hard to find it. Simply use the original directory name.
-        dirname="$(cpt-readlink "${file%/*}" 2>/dev/null)" ||
+        # We will only follow the symlinks of the directories, so we reserve the
+        # directory name in this 'dirname' value. If we cannot find it in the
+        # system, we don't need to make this much more complex by trying so hard
+        # to find it. Simply use the original directory name.
+        dirname="$(_readlinkf "${file%/*}" 2>/dev/null)" ||
             dirname="${file%/*}"
 
 
@@ -1577,8 +1616,7 @@ pkg_fetch() {
                     # ownership of files and directories in the rare
                     # case that the repository is owned by a 3rd user.
                     (
-                        user=$(cpt-stat "$PWD")       || user=root
-                        id -u "$user" >/dev/null 2>&1 || user=root
+                        user=$(_stat "$PWD")
 
                         [ "$user" = root ] ||
                             log "Dropping permissions to $user for pull"
@@ -1614,8 +1652,7 @@ pkg_fetch() {
                     # We are going to do the same operation as above, to
                     # find the owner of the repository.
                     (
-                        user=$(cpt-stat "$PWD")       || user=root
-                        id -u "$user" >/dev/null 2>&1 || user=root
+                        user=$(_stat "$PWD")
 
                         [ "$user" = root ] ||
                             log "Dropping permissions to $user for pull"
@@ -1647,8 +1684,7 @@ pkg_fetch() {
                     # Similar to the git update, we find the owner of
                     # the repository and spawn rsync as that user.
                     (
-                        user=$(cpt-stat "$PWD")      || user=root
-                        id -u "$user" >/dev/null 2>&1 || user=root
+                        user=$(_stat "$PWD")
 
                         [ "$user" = root ] ||
                             log "Dropping permissions to $user for pull"
diff --git a/src/cpt-list b/src/cpt-list
index a161abf..363e22f 100755
--- a/src/cpt-list
+++ b/src/cpt-list
@@ -5,11 +5,23 @@ parser_definition() {
     setup REST help:usage -- "usage: ${0##*/} [-c] [pkg...]"
     msg -- '' 'Options:'
     flag CURRENT -c --current -- "Use the current directory as a package"
+    param PKG --check label:"    --check PKG TRUE FALSE" -- \
+          "Check if PKG exists and return the string of TRUE if"\
+          "it exists, and the string of FALSE if it doesn't." \
+          "Useful for optional packaging."
     global_options
 }
 
 if [ -f ./cpt-lib ]; then . ./cpt-lib; else . cpt-lib; fi
 
+if [ "$PKG" ]; then
+    if pkg_list "$PKG" >/dev/null 2>&1; then
+        printf %s "$1"
+    else
+        printf %s "$2"
+    fi
+else
 [ "$CURRENT" ] && set -- "${PWD##*/}"
 
 pkg_list "$@"
+fi