From 8a87f1b87a4a0d6522df6d5aaf82ab6fedd9ed6b Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Thu, 23 Jul 2015 22:05:03 +0200
Subject: [PATCH] ZakCgiMain::get_parameters now support variables with
multiple values (refs #943).
---
src/main.c | 60 ++++++++++++++++++++++++++++++---------------
tests/querystring.c | 23 ++++++++++++++---
2 files changed, 60 insertions(+), 23 deletions(-)
diff --git a/src/main.c b/src/main.c
index 6451161..894bf75 100644
--- a/src/main.c
+++ b/src/main.c
@@ -152,7 +152,7 @@ GHashTable
return g_hash_table_ref (priv->ht_env);
}
}
-
+
ht = g_hash_table_new (g_str_hash, g_str_equal);
if (zakcgimain != NULL)
{
@@ -238,7 +238,7 @@ GHashTable
if (priv->ht_cookies != NULL)
{
return g_hash_table_ref (priv->ht_cookies);
- }
+ }
}
ht = g_hash_table_new (g_str_hash, g_str_equal);
if (zakcgimain != NULL)
@@ -369,16 +369,17 @@ GHashTable
guint l;
GValue *gval;
+ GPtrArray *ar;
ht = NULL;
-
+
if (zakcgimain != NULL)
{
priv = ZAK_CGI_MAIN_GET_PRIVATE (zakcgimain);
if (priv->ht_parameters != NULL)
{
ht = g_hash_table_ref (priv->ht_parameters);
- }
+ }
}
if (ht == NULL)
@@ -402,16 +403,41 @@ GHashTable
l = g_strv_length (params);
for (i = 0; i < l; i++)
{
- gval = g_new0 (GValue, 1);
-
parts = g_strsplit (params[i], "=", 2);
- g_value_init (gval, G_TYPE_STRING);
- g_value_set_string (gval, g_strdup (parts[1] == NULL ? "" : parts[1]));
+ gval = (GValue *)g_hash_table_lookup (ht, parts[0]);
+ if (gval != NULL)
+ {
+ if (!G_VALUE_HOLDS (gval, G_TYPE_BOXED))
+ {
+ /* convert to GPtrArray */
+ ar = g_ptr_array_new ();
+
+ g_ptr_array_add (ar, g_strdup (g_value_get_string (gval)));
+ g_value_unset (gval);
- g_hash_table_replace (ht, g_strdup (parts[0]), gval);
- g_strfreev (parts);
+ g_value_init (gval, G_TYPE_PTR_ARRAY);
+ g_value_take_boxed (gval, ar);
+ g_hash_table_replace (ht, g_strdup (parts[0]), gval);
+ }
+ else
+ {
+ ar = (GPtrArray *)g_value_get_boxed (gval);
+ }
+ g_ptr_array_add (ar, g_strdup (parts[1] == NULL ? "" : parts[1]));
+ }
+ else
+ {
+ gval = g_new0 (GValue, 1);
+
+ g_value_init (gval, G_TYPE_STRING);
+ g_value_set_string (gval, g_strdup (parts[1] == NULL ? "" : parts[1]));
+
+ g_hash_table_replace (ht, g_strdup (parts[0]), gval);
+ g_strfreev (parts);
+ }
}
+ g_strfreev (params);
return ht;
}
@@ -428,7 +454,7 @@ gchar
gchar *ret;
ZakCgiMainPrivate *priv;
-
+
const gchar *env;
guint l;
gsize bytesread;
@@ -478,7 +504,7 @@ gchar
{
priv->stdin = g_strdup (ret);
}
-
+
return ret;
}
@@ -590,7 +616,6 @@ GHashTable
{
/* read line */
line = zak_cgi_main_read_line (buf, l, &i, TRUE, &bytesread);
- syslog (LOG_MAKEPRI(LOG_SYSLOG, LOG_DEBUG), "boundary: %s %d", line, bytesread);
if (g_strcmp0 (line, _boundary) == 0)
{
/* content-disposition */
@@ -606,7 +631,6 @@ GHashTable
GValue *gval;
content_disposition = zak_cgi_main_read_line (buf, l, &i, TRUE, &bytesread);
- syslog (LOG_MAKEPRI(LOG_SYSLOG, LOG_DEBUG), "content_disposition: %s", content_disposition);
v_content = g_strsplit (content_disposition, ";", -1);
l_v_content = g_strv_length (v_content);
@@ -621,12 +645,10 @@ GHashTable
parts = g_strsplit (v_content[2], "=", 2);
param_name_file = g_strndup (parts[1] + 1, strlen (parts[1]) - 2);
param_name_file[strlen (parts[1]) - 2] = '\0';
- syslog (LOG_MAKEPRI(LOG_SYSLOG, LOG_DEBUG), "param_name_file: %s", param_name_file);
g_strfreev (parts);
/* content-type */
content_type = zak_cgi_main_read_line (buf, l, &i, TRUE, &bytesread);
- syslog (LOG_MAKEPRI(LOG_SYSLOG, LOG_DEBUG), "content_type: %s", content_type);
g_free (content_type);
}
@@ -648,7 +670,6 @@ GHashTable
do
{
tmp = zak_cgi_main_read_line (buf, l, &i, FALSE, &bytesread);
- syslog (LOG_MAKEPRI(LOG_SYSLOG, LOG_DEBUG), "tmp: %s %d", tmp, bytesread);
if (memcmp (tmp, _boundary, strlen (_boundary)) == 0)
{
@@ -677,7 +698,6 @@ GHashTable
else
{
param_value = zak_cgi_main_read_line (buf, l, &i, TRUE, &bytesread);
- syslog (LOG_MAKEPRI(LOG_SYSLOG, LOG_DEBUG), "param_value: %s", param_value);
}
gval = g_new0 (GValue, 1);
@@ -722,10 +742,10 @@ GHashTable
g_free (line);
} while (i < l);
-
+
g_free (_boundary);
}
-
+
return ht;
}
diff --git a/tests/querystring.c b/tests/querystring.c
index 4b18d7e..8aa8f1f 100644
--- a/tests/querystring.c
+++ b/tests/querystring.c
@@ -41,8 +41,26 @@ main (int argc, char *argv[])
g_hash_table_iter_init (&iter, ht_env);
while (g_hash_table_iter_next (&iter, &key, &value))
{
- g_string_append_printf (str, "<tr><td>%s</td><td>%s</td></tr>\n",
- (gchar *)key, (gchar *)g_value_get_string ((GValue *)value));
+ if (G_VALUE_HOLDS ((GValue *)value, G_TYPE_BOXED))
+ {
+ guint i;
+ GPtrArray *ar = (GPtrArray *)g_value_get_boxed ((GValue *)value);
+ for (i = 0; i < ar->len; i++)
+ {
+ g_string_append_printf (str,
+ "<tr><td>%s[%d]</td><td>%s</td></tr>\n",
+ (gchar *)key,
+ i,
+ (gchar *)g_ptr_array_index (ar, i));
+ }
+ }
+ else
+ {
+ g_string_append_printf (str,
+ "<tr><td>%s</td><td>%s</td></tr>\n",
+ (gchar *)key,
+ (gchar *)g_value_get_string ((GValue *)value));
+ }
}
g_string_append_printf (str, "</table>\n");
@@ -55,4 +73,3 @@ main (int argc, char *argv[])
return 0;
}
-
--
2.49.0