Fedora 30 packaging fix issu

[src/app-framework-binder.git] / src / main-afb-client-demo.c

diff --git a/src/main-afb-client-demo.c b/src/main-afb-client-demo.c
index bd0bbc4..1d05636 100644 (file)
--- a/src/main-afb-client-demo.c
+++ b/src/main-afb-client-demo.c
@@ -30,11 +30,24 @@
 
 #include <systemd/sd-event.h>
 #include <json-c/json.h>
+#if !defined(JSON_C_TO_STRING_NOSLASHESCAPE)
+#define JSON_C_TO_STRING_NOSLASHESCAPE 0
+#endif
 
 #include "afb-wsj1.h"
 #include "afb-ws-client.h"
 #include "afb-proto-ws.h"
 
+enum {
+       Exit_Success      = 0,
+       Exit_Error        = 1,
+       Exit_HangUp       = 2,
+       Exit_Input_Fail   = 3,
+       Exit_Bad_Arg      = 4,
+       Exit_Cant_Connect = 5
+};
+
+
 /* declaration of functions */
 static void on_wsj1_hangup(void *closure, struct afb_wsj1 *wsj1);
 static void on_wsj1_call(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg);
@@ -90,6 +103,7 @@ static int usein;
 static sd_event *loop;
 static sd_event_source *evsrc;
 static char *sessionid = "afb-client-demo";
+static int exitcode = 0;
 
 /* print usage of the program */
 static void usage(int status, char *arg0)
@@ -153,7 +167,7 @@ int main(int ac, char **av, char **env)
 
                        /* emit usage and exit */
                        else
-                               usage(!!strcmp(av[1], "--help"), a0);
+                               usage(strcmp(av[1], "--help") ? Exit_Bad_Arg : Exit_Success, a0);
                } else {
                        /* short option(s) */
                        for (rc = 1 ; av[1][rc] ; rc++)
@@ -165,7 +179,7 @@ int main(int ac, char **av, char **env)
                                case 'k': keeprun = 1; break;
                                case 's': synchro = 1; break;
                                case 'e': echo = 1; break;
-                               default: usage(av[1][rc] != 'h', a0);
+                               default: usage(av[1][rc] != 'h' ? Exit_Bad_Arg : Exit_Success, a0);
                                }
                }
                av++;
@@ -192,14 +206,14 @@ int main(int ac, char **av, char **env)
                pws = afb_ws_client_connect_api(loop, av[1], &pws_itf, NULL);
                if (pws == NULL) {
                        fprintf(stderr, "connection to %s failed: %m\n", av[1]);
-                       return 1;
+                       return Exit_Cant_Connect;
                }
                afb_proto_ws_on_hangup(pws, on_pws_hangup);
        } else {
                wsj1 = afb_ws_client_connect_wsj1(loop, av[1], &wsj1_itf, NULL);
                if (wsj1 == NULL) {
                        fprintf(stderr, "connection to %s failed: %m\n", av[1]);
-                       return 1;
+                       return Exit_Cant_Connect;
                }
        }
 
@@ -230,7 +244,7 @@ static void idle()
        for(;;) {
                if (!usein) {
                        if (!keeprun && !callcount)
-                               exit(0);
+                               exit(exitcode);
                        sd_event_run(loop, 30000000);
                }
                else if (!synchro || !callcount) {
@@ -247,7 +261,7 @@ static void dec_callcount()
 {
        callcount--;
        if (exonrep && !callcount)
-               exit(0);
+               exit(exitcode);
 }
 
 /* called when wsj1 hangsup */
@@ -255,7 +269,7 @@ static void on_wsj1_hangup(void *closure, struct afb_wsj1 *wsj1)
 {
        printf("ON-HANGUP\n");
        fflush(stdout);
-       exit(0);
+       exit(Exit_HangUp);
 }
 
 /* called when wsj1 receives a method invocation */
@@ -267,7 +281,7 @@ static void on_wsj1_call(void *closure, const char *api, const char *verb, struc
        if (human)
                printf("ON-CALL %s/%s:\n%s\n", api, verb,
                                json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
-                                                       JSON_C_TO_STRING_PRETTY));
+                                                       JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
        fflush(stdout);
        rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", NULL);
        if (rc < 0)
@@ -282,20 +296,22 @@ static void on_wsj1_event(void *closure, const char *event, struct afb_wsj1_msg
        if (human)
                printf("ON-EVENT %s:\n%s\n", event,
                                json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
-                                                       JSON_C_TO_STRING_PRETTY));
+                                                       JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
        fflush(stdout);
 }
 
 /* called when wsj1 receives a reply */
 static void on_wsj1_reply(void *closure, struct afb_wsj1_msg *msg)
 {
+       int iserror = !afb_wsj1_msg_is_reply_ok(msg);
+       exitcode = iserror ? Exit_Error : Exit_Success;
        if (raw)
                printf("%s\n", afb_wsj1_msg_object_s(msg));
        if (human)
                printf("ON-REPLY %s: %s\n%s\n", (char*)closure,
-                               afb_wsj1_msg_is_reply_ok(msg) ? "OK" : "ERROR",
+                               iserror ? "ERROR" : "OK",
                                json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
-                                                       JSON_C_TO_STRING_PRETTY));
+                                                       JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
        fflush(stdout);
        free(closure);
        dec_callcount();
@@ -374,13 +390,13 @@ static int process_stdin()
                if (errno == EAGAIN)
                        return 0;
                fprintf(stderr, "read error: %m\n");
-               exit(1);
+               exit(Exit_Input_Fail);
        }
        if (rc == 0) {
                usein = count != 0;
                if (!usein && !keeprun) {
                        if (!callcount)
-                               exit(0);
+                               exit(exitcode);
                        exonrep = 1;
                }
        }
@@ -428,7 +444,7 @@ static int process_stdin()
        count -= pos;
        if (count == sizeof line) {
                fprintf(stderr, "overflow\n");
-               exit(1);
+               exit(Exit_Input_Fail);
        }
        if (count)
                memmove(line, line + pos, count);
@@ -449,6 +465,8 @@ static int on_stdin(sd_event_source *src, int fd, uint32_t revents, void *closur
 
 static void on_pws_reply(void *closure, void *request, struct json_object *result, const char *error, const char *info)
 {
+       int iserror = !!error;
+       exitcode = iserror ? Exit_Error : Exit_Success;
        error = error ?: "success";
        if (raw) {
                /* TODO: transitionnal: fake the structured response */
@@ -461,11 +479,11 @@ static void on_pws_reply(void *closure, void *request, struct json_object *resul
                if (result)
                        json_object_object_add(x, "response", json_object_get(result));
 
-               printf("%s\n", json_object_to_json_string(x));
+               printf("%s\n", json_object_to_json_string_ext(x, JSON_C_TO_STRING_NOSLASHESCAPE));
                json_object_put(x);
        }
        if (human)
-               printf("ON-REPLY %s: %s %s\n%s\n", (char*)request, error, info ?: "", json_object_to_json_string_ext(result, JSON_C_TO_STRING_PRETTY));
+               printf("ON-REPLY %s: %s %s\n%s\n", (char*)request, error, info ?: "", json_object_to_json_string_ext(result, JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
        fflush(stdout);
        free(request);
        dec_callcount();
@@ -498,18 +516,18 @@ static void on_pws_event_unsubscribe(void *closure, void *request, const char *e
 static void on_pws_event_push(void *closure, const char *event_name, int event_id, struct json_object *data)
 {
        if (raw)
-               printf("ON-EVENT-PUSH: [%d:%s]\n%s\n", event_id, event_name, json_object_to_json_string_ext(data, 0));
+               printf("ON-EVENT-PUSH: [%d:%s]\n%s\n", event_id, event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_NOSLASHESCAPE));
        if (human)
-               printf("ON-EVENT-PUSH: [%d:%s]\n%s\n", event_id, event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY));
+               printf("ON-EVENT-PUSH: [%d:%s]\n%s\n", event_id, event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
        fflush(stdout);
 }
 
 static void on_pws_event_broadcast(void *closure, const char *event_name, struct json_object *data)
 {
        if (raw)
-               printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, 0));
+               printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_NOSLASHESCAPE));
        if (human)
-               printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY));
+               printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE));
        fflush(stdout);
 }
 
@@ -520,6 +538,7 @@ static void pws_call(const char *verb, const char *object)
        char *key;
        int rc;
        struct json_object *o;
+       enum json_tokener_error jerr;
 
        /* allocates an id for the request */
        rc = asprintf(&key, "%d:%s", ++num, verb);
@@ -530,11 +549,11 @@ static void pws_call(const char *verb, const char *object)
 
        /* send the request */
        callcount++;
-       if (object == NULL || object[0] == 0 || !strcmp(object, "null"))
+       if (object == NULL || object[0] == 0)
                o = NULL;
        else {
-               o = json_tokener_parse(object);
-               if (!o)
+               o = json_tokener_parse_verbose(object, &jerr);
+               if (jerr != json_tokener_success)
                        o = json_object_new_string(object);
        }
        rc = afb_proto_ws_client_call(pws, verb, o, sessionid, key, NULL);
@@ -552,5 +571,5 @@ static void on_pws_hangup(void *closure)
 {
        printf("ON-HANGUP\n");
        fflush(stdout);
-       exit(0);
+       exit(Exit_HangUp);
 }