From 5f6371f078dded41c6ad8583b4dded274e8015ed Mon Sep 17 00:00:00 2001
From: Martijn Dekker <martijn@inlv.org>
Date: Mon, 18 Jan 2021 09:33:26 +0000
Subject: [PATCH] main.c: tweak fixargs() macros: single point of truth

---
 src/cmd/ksh93/sh/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/cmd/ksh93/sh/main.c b/src/cmd/ksh93/sh/main.c
index 18876ee90..6e5bd1617 100644
--- a/src/cmd/ksh93/sh/main.c
+++ b/src/cmd/ksh93/sh/main.c
@@ -56,6 +56,7 @@ static void	chkmail(Shell_t *shp, char*);
     static void	fixargs(char**,int);
 #else
 #   define fixargs(a,b)
+#   define fixargs_disabled	1
 #endif
 
 #ifndef environ
@@ -697,7 +698,7 @@ static void chkmail(Shell_t *shp, char *files)
 #   define PSTAT	1
 #endif
 
-#if defined(_lib_fork) && !defined(_NEXT_SOURCE) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
+#if !defined(fixargs_disabled)
 /*
  * fix up command line for ps command
  *
@@ -757,4 +758,4 @@ static void fixargs(char **argv, int mode)
 #   endif /* PSTAT */
 #endif /* EXECARGS */
 }
-#endif /* _lib_fork */
+#endif /* !fixargs_disabled */