Style cleanup on previous commit

README

@@ -87,11 +87,10 @@ EXAMPLES
      As usual with pipes, the sky is the limit.
 
 CONCEPTS
-     mblaze deals with messages (which are files), folders (which are
+     mblaze deals with messages (which are files), folders (which are Maildir
-     Maildir folders), sequences (which are newline-separated lists of
+     folders), sequences (which are newline-separated lists of messages,
-     messages, possibly persisted on disk in
+     possibly persisted on disk in ~/.mblaze/seq), and the current message
-     ${MBLAZE:-$HOME/.mblaze}/seq), and the current message
+     (kept as a symlink in ~/.mblaze/cur).
-     (kept as a symlink in ${MBLAZE:-$HOME/.mblaze}/cur).
 
      Messages in the persisted sequence can be referred to using special
      syntax as explained in mmsg(7).

man/mcom.1

@@ -50,7 +50,7 @@ Editor used to compose mail.
 .It Ev MBLAZE
 Directory containing mblaze configuration.
 (Default:
-.Pa $HOME/.mblaze)
+.Pa $HOME/.mblaze )
 .El
 .Sh FILES
 .Bl -tag -width Ds

man/mseq.1

@@ -71,7 +71,7 @@ and exit.
 .It Ev MBLAZE
 Directory containing mblaze configuration.
 (Default:
-.Pa $HOME/.mblaze)
+.Pa $HOME/.mblaze )
 .It Ev MAILCUR
 Symbolic link referring to the current message.
 (Default:

mcom

@@ -19,7 +19,7 @@ msgdate() {
 }
 
 MBLAZE=${MBLAZE:-$HOME/.mblaze}
-outbox=$(mhdr -h outbox $MBLAZE/profile)
+outbox=$(mhdr -h outbox "$MBLAZE/profile")
 if [ -z "$outbox" ]; then
 	i=0
 	while [ -f "snd.$i" ]; do
@@ -44,9 +44,9 @@ fi
 		echo "Cc: "
 		echo "Bcc: "
 		echo "Subject: "
-		from=$(mhdr -h local-mailbox $MBLAZE/profile)
+		from=$(mhdr -h local-mailbox "$MBLAZE/profile")
 		[ "$from" ] && echo "From: $from"
-		cat $MBLAZE/headers 2>/dev/null
+		cat "$MBLAZE/headers" 2>/dev/null
 		msgid
 		msgdate
 		echo
@@ -60,7 +60,7 @@ fi
 		echo "Cc: $(mhdr -d -A -h to:cc: "$1" | commajoin)"
 		echo "Bcc: "
 		echo "Subject: Re: $(mscan -f '%S' "$1")"
-		cat $MBLAZE/headers 2>/dev/null
+		cat "$MBLAZE/headers" 2>/dev/null
 		mid=$(mhdr -h message-id "$1")
 		if [ "$mid" ]; then
 			echo -n "References:"
@@ -78,17 +78,15 @@ fi
 		echo
 	esac
 
-	if [ -f $MBLAZE/signature ]; then
+	if [ -f "$MBLAZE/signature" ]; then
-		SIGNATURE=$MBLAZE/signature
+		SIGNATURE="$MBLAZE/signature"
-	elif [ -f $HOME/.mblaze/signature ]; then
-		SIGNATURE=$HOME/.mblaze/signature
 	elif [ -f ~/.signature ]; then
-		SIGNATURE=$HOME/.signature
+		SIGNATURE="$HOME/.signature"
 	fi
 
-	if [ ! -z $SIGNATURE ]; then
+	if [ -n "$SIGNATURE" ]; then
 		printf '%s\n' '-- '
-		cat $SIGNATURE
+		cat "$SIGNATURE"
 	fi
 } >$draft