Fix application exit

Author: codeation

call.c

@@ -14,10 +14,11 @@ static void commandVersion() {
 
 // exit
 
-static void commandExit() {
-    pipe_unwatch();
-    commandVersion();
-    g_application_quit(G_APPLICATION(app));
+static void commandExit(pipe_buffer *target) {
+    io_stop(target);
+    if (io_exited()) {
+        g_application_quit(G_APPLICATION(app));
+    }
 }
 
 // clear command
@@ -410,7 +411,7 @@ void callcommand(char command, pipe_buffer *target) {
         commandTitle(target);
         break;
     case 'X':
-        commandExit();
+        commandExit(target);
         break;
     case 'V':
         commandVersion();

io.c

@@ -13,22 +13,14 @@ typedef struct pipe_buffer {
     int32_t alloc_length;
     char *data;
     void (*last_func)(void *);
+    guint in_id;
+    guint hup_id;
 } pipe_buffer;
 
 static pipe_buffer sync_chan, stream_chan;
 
 static void reset_buffer(pipe_buffer *target);
 
-pipe_buffer *io_input() {
-    reset_buffer(&sync_chan);
-    return &sync_chan;
-}
-
-pipe_buffer *io_stream() {
-    reset_buffer(&stream_chan);
-    return &stream_chan;
-}
-
 static void call_func(pipe_buffer *target) {
     reset_buffer(target);
     target->call_func();
@@ -104,3 +96,28 @@ gboolean async_read_chan(GIOChannel *source, GIOCondition condition, gpointer da
     }
     return TRUE;
 }
+
+gboolean chan_error_func(GIOChannel *source, GIOCondition condition, gpointer data) {
+    perror("connection has been broken");
+    exit(EXIT_FAILURE);
+    return TRUE;
+}
+
+static void io_start(FILE *source, pipe_buffer *target) {
+    reset_buffer(target);
+    GIOChannel *chan = g_io_channel_unix_new(fileno(source));
+    target->in_id = g_io_add_watch(chan, G_IO_IN, async_read_chan, target);
+    target->hup_id = g_io_add_watch(chan, G_IO_HUP, chan_error_func, target);
+    g_io_channel_unref(chan);
+}
+
+void io_input_start(FILE *source) { io_start(source, &sync_chan); }
+void io_stream_start(FILE *source) { io_start(source, &stream_chan); }
+
+void io_stop(pipe_buffer *target) {
+    g_source_remove(target->hup_id);
+    g_source_remove(target->in_id);
+    target->in_id = 0;
+}
+
+gboolean io_exited() { return sync_chan.in_id == 0 && stream_chan.in_id == 0; }

pipe.c

@@ -28,35 +28,13 @@ static FILE *pipe_open(char *name, char *suffix, char *filemode) {
     return handle;
 }
 
-gboolean pipe_error_func(GIOChannel *source, GIOCondition condition, gpointer data) {
-    perror("connection has been broken");
-    exit(EXIT_FAILURE);
-    return TRUE;
-}
-
-static guint chan_input_in_id;
-static guint chan_input_hup_id;
-static guint chan_stream_in_id;
-static guint chan_stream_hup_id;
-
 void pipe_init(char *pipe_suffix, GIOFunc func) {
     handle_output = pipe_open(FIFO_OUTPUT_PATH, pipe_suffix, "w");
     handle_event = pipe_open(FIFO_EVENT_PATH, pipe_suffix, "w");
     handle_input = pipe_open(FIFO_INPUT_PATH, pipe_suffix, "r");
     handle_stream = pipe_open(FIFO_STREAM_PATH, pipe_suffix, "r");
-    GIOChannel *chan_input = g_io_channel_unix_new(fileno(handle_input));
-    chan_input_in_id = g_io_add_watch(chan_input, G_IO_IN, func, io_input());
-    chan_input_hup_id = g_io_add_watch(chan_input, G_IO_HUP, pipe_error_func, NULL);
-    GIOChannel *chan_stream = g_io_channel_unix_new(fileno(handle_stream));
-    chan_stream_in_id = g_io_add_watch(chan_stream, G_IO_IN, func, io_stream());
-    chan_stream_hup_id = g_io_add_watch(chan_stream, G_IO_HUP, pipe_error_func, NULL);
-}
-
-void pipe_unwatch() {
-    g_source_remove(chan_input_in_id);
-    g_source_remove(chan_input_hup_id);
-    g_source_remove(chan_stream_in_id);
-    g_source_remove(chan_stream_hup_id);
+    io_input_start(handle_input);
+    io_stream_start(handle_stream);
 }
 
 void pipe_done() {

terminal.h

@@ -17,7 +17,6 @@ extern GMenu *barmenu;
 
 void pipe_init(char *pipe_suffix, GIOFunc func);
 void pipe_done();
-void pipe_unwatch();
 void pipe_output_write(const void *data, const int length);
 void pipe_output_write_string(const char *data);
 void pipe_output_flush();
@@ -28,11 +27,13 @@ void pipe_event_flush();
 // io
 
 typedef struct pipe_buffer pipe_buffer;
-pipe_buffer *io_input();
-pipe_buffer *io_stream();
 void parameters_to_call(pipe_buffer *target, void *buffer, int size, void (*f)());
 void parameters_alloc_to_call(pipe_buffer *target, void *buffer, int size, void (*f)(void *));
 gboolean async_read_chan(GIOChannel *source, GIOCondition condition, gpointer data);
+void io_input_start(FILE *source);
+void io_stream_start(FILE *source);
+void io_stop(pipe_buffer *target);
+gboolean io_exited();
 
 // event
 

version.c

@@ -1 +1 @@
-char *it_version = "0.4.1";
+char *it_version = "0.4.2";