Commit a3ed492f authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix windows build 



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

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent fb456902

apps/apps.c

+3 −3
Original line number Diff line number Diff line
@@ -1837,7 +1837,7 @@ X509_NAME *parse_name(const char *cp, long chtype, int canmulti) 
    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 @@ X509_NAME *parse_name(const char *cp, long chtype, int canmulti) 
            goto err;

    }



    free(work);

    OPENSSL_free(work);

    return n;



 err:

    X509_NAME_free(n);

    free(work);

    OPENSSL_free(work);

    return NULL;

}

apps/opt.c

+4 −4
Original line number Diff line number Diff line
@@ -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 @@ char *opt_progname(const char *argv0) 
    /* 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 @@ char *opt_progname(const char *argv0) 
    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;

}