lib-program-client: Fix building with compilers that have no typeof()

diff --git a/src/lib-program-client/test-program-client-net.c b/src/lib-program-client/test-program-client-net.c
index 5799434bdc1c0fb5769ad73336d16f90f974b3ea..9878ed7226ab2b29b209518baf64c05caa5ce082 100644 (file)
--- a/src/lib-program-client/test-program-client-net.c
+++ b/src/lib-program-client/test-program-client-net.c
@@ -162,29 +162,30 @@ int test_program_input_handle(struct test_client *client, const char *line)
 static
 void test_program_run(struct test_client *client)
 {
-       const char *arg;
+       const char *const *args;
+       unsigned int count;
 
        struct ostream *os;
 
        timeout_remove(&test_globals.to);
        test_assert(array_is_created(&client->args));
        if (array_is_created(&client->args)) {
-               test_assert(array_count(&client->args) > 0);
-               if (array_count(&client->args) > 0) {
-                       arg = *array_idx(&client->args, 0);
-                       if (strcmp(arg, "test_program_success")==0) {
+               args = array_get(&client->args, &count);
+               test_assert(count > 0);
+               if (count > 0) {
+                       if (strcmp(args[0], "test_program_success")==0) {
                                /* return hello world */
+                               i_assert(count >= 3);
                                o_stream_nsend_str(client->out, t_strdup_printf(
                                                   "%s %s\r\n.\n+\n",
-                                                  *array_idx(&client->args, 1),
-                                                  *array_idx(&client->args, 2)));
-                       } else if (strcmp(arg, "test_program_io")==0) {
+                                                  args[1], args[2]));
+                       } else if (strcmp(args[0], "test_program_io")==0) {
                                os = o_stream_create_dot(client->out, FALSE);
                                o_stream_send_istream(os, client->body);
                                o_stream_flush(os);
                                o_stream_unref(&os);
                                o_stream_nsend_str(client->out, "+\n");
-                       } else if (strcmp(arg, "test_program_failure")==0) {
+                       } else if (strcmp(args[0], "test_program_failure")==0) {
                                o_stream_nsend_str(client->out, ".\n-\n");
                        }
                } else

diff --git a/src/lib-program-client/test-program-client-unix.c b/src/lib-program-client/test-program-client-unix.c
index 9cd31ce817c9dba102089bf4cad01ea72dacabfe..5f2585d15801493fa97bbfb6d88a6a3b7bd63f30 100644 (file)
--- a/src/lib-program-client/test-program-client-unix.c
+++ b/src/lib-program-client/test-program-client-unix.c
@@ -134,21 +134,22 @@ int test_program_input_handle(struct test_client *client, const char *line)
 static
 void test_program_run(struct test_client *client)
 {
-       const char *arg;
+       const char *const *args;
+       unsigned int count;
 
        timeout_remove(&test_globals.to);
 
-       test_assert(array_count(&client->args) > 0);
-       arg = *array_idx(&client->args, 0);
-       if (strcmp(arg, "test_program_success")==0) {
+       args = array_get(&client->args, &count);
+       test_assert(count > 0);
+       if (strcmp(args[0], "test_program_success")==0) {
                /* return hello world */
+               test_assert(count >= 3);
                o_stream_nsend_str(client->out, t_strdup_printf("%s %s\n+\n",
-                                  *array_idx(&client->args, 1),
-                                  *array_idx(&client->args, 2)));
-       } else if (strcmp(arg, "test_program_io")==0) {
+                                  args[1], args[2]));
+       } else if (strcmp(args[0], "test_program_io")==0) {
                o_stream_send_istream(client->out, client->body);
                o_stream_nsend_str(client->out, "+\n");
-       } else if (strcmp(arg, "test_program_failure")==0) {
+       } else if (strcmp(args[0], "test_program_failure")==0) {
                o_stream_nsend_str(client->out, "-\n");
        }
        test_program_client_destroy(&client);