Fix warnings in test program logs

[sojka/lightdm.git] / tests / src / status.c

diff --git a/tests/src/status.c b/tests/src/status.c
index 67cd7cac20dfffc27f0422b075b23084e8f455fc..08258685c4b63d6e0d3babfad1455f3045528902 100644 (file)
--- a/tests/src/status.c
+++ b/tests/src/status.c
@@ -5,11 +5,13 @@
 #include <gio/gio.h>
 #include <gio/gunixsocketaddress.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #include "status.h"
 
 static GSocket *status_socket = NULL;
 static StatusRequestFunc request_func = NULL;
+static gchar *filter_id = NULL;
 
 static gboolean
 status_request_cb (GSocket *socket, GIOCondition condition, gpointer data)
@@ -17,32 +19,135 @@ status_request_cb (GSocket *socket, GIOCondition condition, gpointer data)
     int length;
     gchar buffer[1024];
     ssize_t n_read;
-    GError *error = NULL;  
+    const gchar *c, *start;
+    int l;
+    gchar *id, *name = NULL;
+    gboolean id_matches;
+    GHashTable *params;
+    GError *error = NULL;
 
     n_read = g_socket_receive (socket, (gchar *)&length, sizeof (length), NULL, &error);
     if (n_read > 0)
         n_read = g_socket_receive (socket, buffer, length, NULL, &error);
+    if (error)
+    {
+        if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED))
+            n_read = 0;
+        else
+            g_warning ("Error reading from socket: %s", error->message);
+    }
+    g_clear_error (&error);
     if (n_read == 0)
     {
         if (request_func)
-            request_func (NULL);
+            request_func (NULL, NULL);
         return FALSE;
     }
-    if (error)
-        g_warning ("Error reading from socket: %s", error->message);
-    g_clear_error (&error);
 
-    if (n_read > 0 && request_func)
+    if (n_read <= 0 || !request_func)
+        return TRUE;
+
+    buffer[n_read] = '\0';
+    c = buffer;
+    start = c;
+    l = 0;
+    while (*c && !isspace (*c))
     {
-        buffer[n_read] = '\0';
-        request_func (buffer);
+        c++;
+        l++;
+    }
+    id = g_strdup_printf ("%.*s", l, start);
+    id_matches = g_strcmp0 (id, filter_id) == 0;
+    g_free (id);
+    if (!id_matches)
+        return TRUE;
+
+    while (isspace (*c))
+        c++;
+    start = c;
+    l = 0;
+    while (*c && !isspace (*c))
+    {
+        c++;
+        l++;
+    }
+    name = g_strdup_printf ("%.*s", l, start);
+
+    params = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+    while (TRUE)
+    {
+        const gchar *start;
+        gchar *param_name, *param_value;
+
+        while (isspace (*c))
+            c++;
+        start = c;
+        while (*c && !isspace (*c) && *c != '=')
+            c++;
+        if (*c == '\0')
+            break;
+
+        param_name = g_strdup_printf ("%.*s", (int) (c - start), start);
+
+        if (*c == '=')
+        {
+            c++;
+            while (isspace (*c))
+                c++;
+            if (*c == '\"')
+            {
+                gboolean escaped = FALSE;
+                GString *value;
+
+                c++;
+                value = g_string_new ("");
+                while (*c)
+                {
+                    if (*c == '\\')
+                    {
+                        if (escaped)
+                        {
+                            g_string_append_c (value, '\\');
+                            escaped = FALSE;
+                        }
+                        else
+                            escaped = TRUE;
+                    }
+                    else if (!escaped && *c == '\"')
+                        break;
+                    if (!escaped)
+                        g_string_append_c (value, *c);
+                    c++;
+                }
+                param_value = value->str;
+                g_string_free (value, FALSE);
+                if (*c == '\"')
+                    c++;
+            }
+            else
+            {
+                start = c;
+                while (*c && !isspace (*c))
+                    c++;
+                param_value = g_strdup_printf ("%.*s", (int) (c - start), start);
+            }
+        }
+        else
+            param_value = g_strdup ("");
+
+        g_hash_table_insert (params, param_name, param_value);
     }
 
+    request_func (name, params);
+
+    g_free (name);
+    g_hash_table_unref (params);
+
     return TRUE;
 }
 
-void
-status_connect (StatusRequestFunc request_cb)
+gboolean
+status_connect (StatusRequestFunc request_cb, const gchar *id)
 {
     gchar *path;
     GSocketAddress *address;
@@ -51,13 +156,14 @@ status_connect (StatusRequestFunc request_cb)
     GError *error = NULL;
 
     request_func = request_cb;
+    filter_id = g_strdup (id);
 
     status_socket = g_socket_new (G_SOCKET_FAMILY_UNIX, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, &error);
     if (error)
         g_printerr ("Unable to open socket for status: %s\n", error->message);
     g_clear_error (&error);
     if (!status_socket)
-        return;
+        return FALSE;
 
     path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), ".s", NULL);
     address = g_unix_socket_address_new (path);
@@ -68,16 +174,24 @@ status_connect (StatusRequestFunc request_cb)
     g_clear_error (&error);
     g_free (path);
     if (!result)
-        return;
+    {
+        g_object_unref (status_socket);
+        status_socket = NULL;
+        return FALSE;
+    }
 
     source = g_socket_create_source (status_socket, G_IO_IN, NULL);
     g_source_set_callback (source, (GSourceFunc) status_request_cb, NULL, NULL);
-    g_source_attach (source, NULL);   
+    g_source_attach (source, NULL);
+
+    return TRUE;
 }
 
 void
 status_notify (const gchar *format, ...)
 {
+    gboolean written = FALSE;
+
     gchar status[1024];
     va_list ap;
 
@@ -91,12 +205,13 @@ status_notify (const gchar *format, ...)
         int length;
 
         length = strlen (status);
-        g_socket_send (status_socket, (gchar *) &length, sizeof (length), NULL, &error);
-        g_socket_send (status_socket, status, strlen (status), NULL, &error);
+        written = g_socket_send (status_socket, (gchar *) &length, sizeof (length), NULL, &error) == sizeof (length) &&
+                  g_socket_send (status_socket, status, strlen (status), NULL, &error) == strlen (status);
         if (error)
             g_printerr ("Failed to write to status socket: %s\n", error->message);
         g_clear_error (&error);
     }
-    else
+
+    if (!written)
         g_printerr ("%s\n", status);
 }