posix: use tail -1, not tail -n 1, prefer gsed for Solaris compat

Non-XPG4 version of `tail` fails if you call it as `tail -n 1`, but `tail -1` works everywhere and is portable. ``` % ssh solaris Last login: Sun Oct 20 12:20:56 2024 from 192.168.64.1 Oracle Solaris 11.4.42.111.0 Assembled December 2021 root@solaris:~# tail -n 1 .profile usage: tail [+/-[n][lbc][f]] [file] tail [+/-[n][l][r|f]] [file] root@solaris:~# tail -1 .profile root@solaris:~# head -n 1 .profile root@solaris:~# head -1 .profile root@solaris:~# /usr/xpg4/bin/tail -n 1 .profile ``` Signed-off-by: Yury V. Zaytsev <[email protected]>
MidnightCommander · Oct 20, 2024 · 3e64bd0 · 3e64bd0
1 parent 8cec053
commit 3e64bd0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/vfs/extfs/helpers/changesetfs b/src/vfs/extfs/helpers/changesetfs
@@ -57,7 +57,7 @@ changesetfs_copyout_git()
     [ -z "$GIT_DIR" ] && GIT_DIR=$WORK_DIR
 
     filecommit=`git  --git-dir="$GIT_DIR" show --raw --pretty=tformat:%h "$chset" -- "$fname"| \
-        tail -n1 | \
+        tail -1 | \
         sed 's@^::[0-9]*\s*[0-9]*\s*[0-9]*\s*@@' | \
         sed 's@^:[0-9]*\s*[0-9]*\s*@@' | \
         cut -d'.' -f 1`
@@ -98,8 +98,8 @@ command=$1; shift
 tmp_file=$1; shift
 
 WORK_DIR=`head -n1 $tmp_file`
-fname=`tail -n2 $tmp_file | head -n1`
-VCS_type=`tail -n1 $tmp_file`
+fname=`tail -2 $tmp_file | head -n1`
+VCS_type=`tail -1 $tmp_file`
 
 case "$command" in
   list) changesetfs_list "$VCS_type" "$WORK_DIR" "$fname" ;;

diff --git a/src/vfs/extfs/helpers/iso9660.in b/src/vfs/extfs/helpers/iso9660.in
@@ -97,10 +97,10 @@ xorriso_list() (
     fi
 
     # The first line is /, skip it
-    tail -n+2 "$temp_ls" |
+    sed 1,1d "$temp_ls" |
         # disk_ops.c:Xorriso_format_ls_l() prints the boot catalog file as of
         # type "e". Make it a generic file
-        sed -E 's,^e,-,' |
+        sed 's,^e,-,' |
         @AWK@ "$awk_xorriso_unesc"
 
     rm -f "$temp_ls"

diff --git a/src/vfs/extfs/helpers/patchsetfs b/src/vfs/extfs/helpers/patchsetfs
@@ -93,8 +93,8 @@ command=$1; shift
 tmp_file=$1; shift
 
 WORK_DIR=`head -n1 $tmp_file`
-fname=`tail -n2 $tmp_file | head -n1`
-VCS_type=`tail -n1 $tmp_file`
+fname=`tail -2 $tmp_file | head -n1`
+VCS_type=`tail -1 $tmp_file`
 
 case "$command" in
   list) patchsetfs_list "$VCS_type" "$WORK_DIR" "$fname" ;;

diff --git a/src/vfs/extfs/helpers/rpm b/src/vfs/extfs/helpers/rpm
@@ -69,7 +69,9 @@ fi
 RPM_QUERY_FMT="$RPM -qp --qf"
 RPM2CPIO="rpm2cpio"
 
-SED="sed"
+# Prefer `gsed` on Solaris due to complex regex
+SED=`command -v gsed 2>/dev/null` \
+    || SED=`command -v sed 2>/dev/null`
 
 param=$1; shift
 rpm_filename=$1; shift

diff --git a/src/vfs/shell/shelldef.h b/src/vfs/shell/shelldef.h
@@ -192,7 +192,7 @@
 "if `ls -Q / >/dev/null 2>&1` ; then\n"                                   \
 "    res=`expr $res + 16`\n"                                              \
 "fi\n"                                                                    \
-"dat=`ls -lan / 2>/dev/null | head -n 3 | tail -n 1 | (\n"                \
+"dat=`ls -lan / 2>/dev/null | head -n 3 | tail -1 | (\n"                  \
 "    while read p l u g s rec; do\n"                                      \
 "        if [ -n \"$g\" ]; then\n"                                        \
 "            if [ -n \"$l\" ]; then\n"                                    \