summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b6f9e3c)
raw | patch | inline | side by side (parent: b6f9e3c)
author | Florian Forster <ff@octo.it> | |
Tue, 6 Jul 2010 20:20:08 +0000 (22:20 +0200) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Tue, 6 Jul 2010 20:20:08 +0000 (22:20 +0200) |
src/utils_cgi.c | patch | blob | history | |
src/utils_cgi.h | patch | blob | history |
diff --git a/src/utils_cgi.c b/src/utils_cgi.c
index fbabda6a4f50685e26cfb59e655ae7a7d0a0625b..0b63daf6ae89a3103fbdaf2fa9f7f5eb6cc9d59a 100644 (file)
--- a/src/utils_cgi.c
+++ b/src/utils_cgi.c
return (strdup (buffer));
} /* }}} char *uri_escape */
+#define COPY_ENTITY(e) do { \
+ size_t len = strlen (e); \
+ if (dest_size < (len + 1)) \
+ break; \
+ strcpy (dest_ptr, (e)); \
+ dest_ptr += len; \
+ dest_size -= len; \
+} while (0)
+
+char *json_escape_copy (char *dest, const char *src, size_t n) /* {{{ */
+{
+ char *dest_ptr;
+ size_t dest_size;
+ size_t pos;
+
+ dest[0] = 0;
+ dest_ptr = dest;
+ dest_size = n;
+ for (pos = 0; src[pos] != 0; pos++)
+ {
+ if (src[pos] == '"')
+ COPY_ENTITY ("\\\"");
+ else if (src[pos] == '\\')
+ COPY_ENTITY ("\\\\");
+ else if (((uint8_t) src[pos]) < 32)
+ {
+ if (src[pos] == '\n')
+ COPY_ENTITY ("\\n");
+ else if (src[pos] == '\r')
+ COPY_ENTITY ("\\r");
+ else if (src[pos] == '\t')
+ COPY_ENTITY ("\\t");
+ else if (src[pos] == '\b')
+ COPY_ENTITY ("\\b");
+ else if (src[pos] == '\f')
+ COPY_ENTITY ("\\f");
+ else
+ {
+ char buffer[8];
+ sprintf (buffer, "\\u%04"PRIx8, (uint8_t) src[pos]);
+ buffer[sizeof (buffer) - 1] = 0;
+ COPY_ENTITY (buffer);
+ }
+ }
+ else
+ {
+ *dest_ptr = src[pos];
+ dest_ptr++;
+ dest_size--;
+ *dest_ptr = 0;
+ }
+
+ if (dest_size <= 1)
+ break;
+ }
+
+ return (dest);
+} /* }}} char *json_escape_copy */
+
+#undef COPY_ENTITY
+
+char *json_escape_buffer (char *buffer, size_t buffer_size)
+{
+ char temp[buffer_size];
+
+ json_escape_copy (temp, buffer, buffer_size);
+ memcpy (buffer, temp, buffer_size);
+
+ return (buffer);
+} /* }}} char *json_escape_buffer */
+
+char *json_escape (const char *string) /* {{{ */
+{
+ char buffer[4096];
+
+ if (string == NULL)
+ return (NULL);
+
+ json_escape_copy (buffer, string, sizeof (buffer));
+
+ return (strdup (buffer));
+} /* }}} char *json_escape */
+
const char *script_name (void) /* {{{ */
{
char *ret;
#define COPY_ENTITY(e) do { \
size_t len = strlen (e); \
- if (dest_size < (len + 1)) \
+ if (dest_size < (len + 1)) \
break; \
- strcpy (dest_ptr, (e)); \
- dest_ptr += len; \
- dest_size -= len; \
+ strcpy (dest_ptr, (e)); \
+ dest_ptr += len; \
+ dest_size -= len; \
} while (0)
char *html_escape_copy (char *dest, const char *src, size_t n) /* {{{ */
diff --git a/src/utils_cgi.h b/src/utils_cgi.h
index 08d66d353cde83241a7ef993e5872e873ebb6231..a14acdbd463a4c95cf6a60cd279b9d660b2ce5e4 100644 (file)
--- a/src/utils_cgi.h
+++ b/src/utils_cgi.h
char *uri_escape_buffer (char *buffer, size_t buffer_size);
char *uri_escape_copy (char *dest, const char *src, size_t n);
+char *json_escape (const char *string);
+char *json_escape_buffer (char *buffer, size_t buffer_size);
+char *json_escape_copy (char *dest, const char *src, size_t n);
+
const char *script_name (void);
int time_to_rfc1123 (time_t t, char *buffer, size_t buffer_size);