X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=apps%2Fengine.c;h=25c86171079966bdfb7f23c67592f3e82b49d012;hb=54f51116b2fb12410fb17a1bfe6a400399e6456b;hp=953b4d97a21405470d746ae0304344fbaf53ed06;hpb=767712fa62eeff0ac6cb9ea6fdc186040f17279d;p=oweals%2Fopenssl.git

diff --git a/apps/engine.c b/apps/engine.c
index 953b4d97a2..25c8617107 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -72,7 +72,7 @@
 #undef PROG
 #define PROG	engine_main
 
-static char *engine_usage[]={
+static const char *engine_usage[]={
 "usage: engine opts [engine ...]\n",
 " -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
 "               -vv will additionally display each command's description\n",
@@ -123,8 +123,8 @@ static int append_buf(char **buf, const char *s, int *size, int step)
 		return 0;
 
 	if (**buf != '\0')
-		strcat(*buf, ", ");
-	strcat(*buf, s);
+		BUF_strlcat(*buf, ", ", *size);
+	BUF_strlcat(*buf, s, *size);
 
 	return 1;
 	}
@@ -344,7 +344,7 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 	int ret=1,i;
-	char **pp;
+	const char **pp;
 	int verbose=0, list_cap=0, test_avail=0, test_avail_noise = 0;
 	ENGINE *e;
 	STACK *engines = sk_new_null();
@@ -394,11 +394,15 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(*argv,"-pre") == 0)
 			{
 			argc--; argv++;
+			if (argc == 0)
+				goto skip_arg_loop;
 			sk_push(pre_cmds,*argv);
 			}
 		else if (strcmp(*argv,"-post") == 0)
 			{
 			argc--; argv++;
+			if (argc == 0)
+				goto skip_arg_loop;
 			sk_push(post_cmds,*argv);
 			}
 		else if ((strncmp(*argv,"-h",2) == 0) ||
@@ -520,13 +524,6 @@ skip_digests:
 
 	ret=0;
 end:
-#else
-
-# if PEDANTIC
-
-void *dummy=&dummy;
-
-# endif
 
 	ERR_print_errors(bio_err);
 	sk_pop_free(engines, identity);
@@ -536,4 +533,10 @@ void *dummy=&dummy;
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
+#else
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif