From 9170aa51fd4e8336cc34db3a1aa29989a024b50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 23 Oct 2017 23:20:31 +0300
Subject: Avoid some unnecessary stat calls

---
 rc.d/init.d/functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rc.d/init.d')

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 63686737..2e3da964 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -59,7 +59,7 @@ systemctl_redirect () {
 [ -z "${COLUMNS:-}" ] && COLUMNS=80
 
 if [ -z "${CONSOLETYPE:-}" ]; then
-    if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then
+    if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then
         CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
     else
         CONSOLETYPE="serial"
@@ -194,7 +194,7 @@ __pids_var_run() {
     local pid_dir=$(/usr/bin/dirname $pid_file > /dev/null)
     local binary=$3
 
-    [ -d "$pid_dir" -a ! -r "$pid_dir" ] && return 4
+    [ -d "$pid_dir" ] && [ ! -r "$pid_dir" ] && return 4
 
     pid=
     if [ -f "$pid_file" ] ; then
-- 
cgit v1.2.1