Make `openssl version' output lines consistent.

[openssl.git] / apps / version.c

diff --git a/apps/version.c b/apps/version.c
index fcf1f08cfb3867e6125f625a4e22d9f509787fac..0de9c495a875a9830c64e7096aee35f7b1accaa3 100644 (file)
--- a/apps/version.c
+++ b/apps/version.c
@@ -71,7 +71,7 @@ int argc;
 char **argv;
        {
        int i,ret=0;
 char **argv;
        {
        int i,ret=0;

-       int cflags=0,version=0,date=0,options=0;
+       int cflags=0,version=0,date=0,options=0,platform=0;

 
        apps_startup();
 
 
        apps_startup();
 


@@ -90,11 +90,13 @@ char **argv;
                        cflags=1;
                else if (strcmp(argv[i],"-o") == 0)
                        options=1;
                        cflags=1;
                else if (strcmp(argv[i],"-o") == 0)
                        options=1;

+               else if (strcmp(argv[i],"-p") == 0)
+                       platform=1;

                else if (strcmp(argv[i],"-a") == 0)
                else if (strcmp(argv[i],"-a") == 0)

-                       date=version=cflags=options=1;
+                       date=version=cflags=options=platform=1;

                else
                        {
                else
                        {

-                       BIO_printf(bio_err,"usage:version [-a] [-v] [-b] [-o] [-f]\n");
+                       BIO_printf(bio_err,"usage:version -[avbofp]\n");

                        ret=1;
                        goto end;
                        }
                        ret=1;
                        goto end;
                        }


@@ -102,9 +104,10 @@ char **argv;
 
        if (version) printf("%s\n",SSLeay_version(SSLEAY_VERSION));
        if (date)    printf("%s\n",SSLeay_version(SSLEAY_BUILT_ON));
 
        if (version) printf("%s\n",SSLeay_version(SSLEAY_VERSION));
        if (date)    printf("%s\n",SSLeay_version(SSLEAY_BUILT_ON));

+       if (platform) printf("%s\n",SSLeay_version(SSLEAY_PLATFORM));

        if (options) 
                {
        if (options) 
                {

-               printf("options:");
+               printf("options:  ");

                printf("%s ",BN_options());
 #ifndef NO_MD2
                printf("%s ",MD2_options());
                printf("%s ",BN_options());
 #ifndef NO_MD2
                printf("%s ",MD2_options());