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>

diff --git a/apps/apps.c b/apps/apps.c
index a93151c831540323b14cbc5e778c8c638f961ef7..ff832bd0be410f91e36f95f9e75a53ccdc60697d 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1837,7 +1837,7 @@ X509_NAME *parse_name(const char *cp, long chtype, int canmulti)
     n = X509_NAME_new();
     if (n == NULL)
         return NULL;
     n = X509_NAME_new();
     if (n == NULL)
         return NULL;

-    work = strdup(cp);
+    work = OPENSSL_strdup(cp);

     if (work == NULL)
         goto err;
 
     if (work == NULL)
         goto err;
 


@@ -1894,12 +1894,12 @@ X509_NAME *parse_name(const char *cp, long chtype, int canmulti)
             goto err;
     }
 
             goto err;
     }
 

-    free(work);
+    OPENSSL_free(work);

     return n;
 
  err:
     X509_NAME_free(n);
     return n;
 
  err:
     X509_NAME_free(n);

-    free(work);
+    OPENSSL_free(work);

     return NULL;
 }
 
     return NULL;
 }
 

diff --git a/apps/opt.c b/apps/opt.c
index df2bea5504bbf74bff27b791b005835735e6bcd2..fbe4c4bebcd0eff46101b60e61acd731fbf10188 100644 (file)
--- a/apps/opt.c
+++ b/apps/opt.c
@@ -54,7 +54,7 @@
 #if !defined(OPENSSL_SYS_MSDOS)
 # include OPENSSL_UNISTD
 #endif
 #if !defined(OPENSSL_SYS_MSDOS)
 # include OPENSSL_UNISTD
 #endif

-#include <unistd.h>
+

 #include <stdlib.h>
 #include <errno.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <ctype.h>


@@ -96,11 +96,11 @@ char *opt_progname(const char *argv0)
     /* Strip off trailing nonsense. */
     n = strlen(p);
     if (n > 4 &&
     /* 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 &&
         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
 
         n -= 4;
 #endif
 


@@ -108,7 +108,7 @@ char *opt_progname(const char *argv0)
     if (n > sizeof prog - 1)
         n = sizeof prog - 1;
     for (q = prog, i = 0; i < n; i++, p++)
     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;
 }
     *q = '\0';
     return prog;
 }