From 02106f3f73c42b899872de183f4b8841b515607c Mon Sep 17 00:00:00 2001
From: Ali Gholami Rudi <ali@rudi.ir>
Date: Mon, 27 Sep 2021 14:17:15 +0330
Subject: [PATCH] sm*: clean up sml, smq, and smr

---
 sml |  6 +++---
 smq | 17 +++++++----------
 smr |  9 +++------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/sml b/sml
index 3580128..2e9f26a 100755
--- a/sml
+++ b/sml
@@ -1,9 +1,9 @@
 #!/bin/sh
+# List queued messages
 
-QDIR=$HOME/.smq
+QDIR="$HOME/.smq"
 
-for x in $QDIR/mail*
-do
+for x in $QDIR/mail*; do
 	egrep -h -s --color '^(From:|To:|Subject:)' "$x"
 	echo ""
 done
diff --git a/smq b/smq
index d2dbecd..5395b8f 100755
--- a/smq
+++ b/smq
@@ -1,21 +1,18 @@
 #!/bin/sh
+# Queue a message
 
-QDIR=$HOME/.smq
+QDIR="$HOME/.smq"
 
 umask 077
 
-if test ! -d "$QDIR"; then
-	mkdir -p "$QDIR" || exit 1
-fi
+mkdir -p "$QDIR" || exit 1
 cd "$QDIR" || exit 1
 
-PREF="mail"
 i=0
-while test -f "$PREF$i"
-do
+while test -f "mail$i"; do
 	i=`expr $i + 1`
 done
-MAIL=$PREF$i
+MAIL=mail$i
 
-echo "$@" > "$MAIL" || exit 1
-cat > "$MAIL" || exit 1
+echo "$@" >"$MAIL" || exit 1
+cat >"$MAIL" || exit 1
diff --git a/smr b/smr
index 4d57f0a..619943b 100755
--- a/smr
+++ b/smr
@@ -1,19 +1,16 @@
 #!/bin/sh
+# Send queued messages
 
 QDIR="$HOME/.smq"
 
-# change into $QDIR
 cd "$QDIR" || exit 1
-
-if test "`echo mail*`" = 'mail*'
-then
+if ! test -f "`ls mail* 2>/dev/null | head -n1`"; then
 	echo "no mail in $QDIR"
 	exit 0
 fi
 
 # process all mails
-for m in mail*
-do
+for m in mail*; do
 	if smtp <$m; then
 		rm "$m"
 		echo "$m sent successfully"
-- 
2.11.4.GIT