From: Matt Caswell <matt@openssl.org>
Date: Mon, 19 Mar 2018 11:29:06 +0000 (+0000)
Subject: Fix no-posix-io compile failure
X-Git-Tag: OpenSSL_1_1_1-pre3~13
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=1a54618ba6ec09b85f00f5ca12ef275b429ff18a;ds=sidebyside

Fix no-posix-io compile failure

The fix in conf_include_test.c  seems to be required because some
compilers give an error if you give an empty string for the second
argument to strpbrk(). It doesn't really make sense to send an empty
string for this argument anyway, so make sure it has at least one character
in it.

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5666)
---

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 82c11e8b60..ed2281a596 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -36,7 +36,8 @@ NON_EMPTY_TRANSLATION_UNIT
 # include <openssl/x509v3.h>
 # include <openssl/rand.h>
 
-# if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_NO_SOCK)
+# if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_NO_SOCK) \
+     && !defined(OPENSSL_NO_POSIX_IO)
 #  define OCSP_DAEMON
 #  include <sys/types.h>
 #  include <sys/wait.h>
diff --git a/test/conf_include_test.c b/test/conf_include_test.c
index 41e4da04eb..7f99d3b15f 100644
--- a/test/conf_include_test.c
+++ b/test/conf_include_test.c
@@ -30,7 +30,7 @@
 #else
 /* the test does not work without chdir() */
 # define chdir(x) (-1);
-# define DIRSEP ""
+# define DIRSEP "/"
 #  define DIRSEP_PRESERVE 0
 #endif