Fix windows build

The big apps cleanup broke the windows build. This commit
fixes some miscellaneous issues so that it builds again.

Reviewed-by: Andy Polyakov <appro@openssl.org>

apps/apps.c

diff --git a/apps/apps.c b/apps/apps.c
index a93151c..ff832bd 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1837,7 +1837,7 @@
     n = X509_NAME_new();
     if (n == NULL)
         return NULL;
-    work = strdup(cp);
+    work = OPENSSL_strdup(cp);
     if (work == NULL)
         goto err;
 
@@ -1894,12 +1894,12 @@
             goto err;
     }
 
-    free(work);
+    OPENSSL_free(work);
     return n;
 
  err:
     X509_NAME_free(n);
-    free(work);
+    OPENSSL_free(work);
     return NULL;
 }
 

apps/opt.c

diff --git a/apps/opt.c b/apps/opt.c
index df2bea5..fbe4c4b 100644
--- a/apps/opt.c
+++ b/apps/opt.c
@@ -54,7 +54,7 @@
 #if !defined(OPENSSL_SYS_MSDOS)
 # include OPENSSL_UNISTD
 #endif
-#include <unistd.h>
+
 #include <stdlib.h>
 #include <errno.h>
 #include <ctype.h>
@@ -96,11 +96,11 @@
     /* Strip off trailing nonsense. */
     n = strlen(p);
     if (n > 4 &&
-        (strcmp(&p[n - 4], ".exe") == 0 || strcmp(&p[n - 4], ".EXE") == 0)
+        (strcmp(&p[n - 4], ".exe") == 0 || strcmp(&p[n - 4], ".EXE") == 0))
         n -= 4;
 #if defined(OPENSSL_SYS_NETWARE)
     if (n > 4 &&
-        (strcmp(&p[n - 4], ".nlm") == 0 || strcmp(&p[n - 4], ".NLM") == 0)
+        (strcmp(&p[n - 4], ".nlm") == 0 || strcmp(&p[n - 4], ".NLM") == 0))
         n -= 4;
 #endif
 
@@ -108,7 +108,7 @@
     if (n > sizeof prog - 1)
         n = sizeof prog - 1;
     for (q = prog, i = 0; i < n; i++, p++)
-        q++ = isupper(*p) ? tolower(*p) : *p;
+        *q++ = isupper(*p) ? tolower(*p) : *p;
     *q = '\0';
     return prog;
 }