journald: properly unescape messages from /dev/kmsg

[elogind.git] / src / shared / util.c

diff --git a/src/shared/util.c b/src/shared/util.c
index af975956dbca755091ca60981e5432e37b8328a4..946b7d53f95c1144b44705a4082a4e458ed24443 100644 (file)
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1562,19 +1562,25 @@ char *cescape(const char *s) {
         return r;
 }
 
         return r;
 }
 

-char *cunescape_length(const char *s, size_t length) {
+char *cunescape_length_with_prefix(const char *s, size_t length, const char *prefix) {

         char *r, *t;
         const char *f;
         char *r, *t;
         const char *f;

+        size_t pl;

 
         assert(s);
 
 
         assert(s);
 

-        /* Undoes C style string escaping */
+        /* Undoes C style string escaping, and optionally prefixes it. */
+
+        pl = prefix ? strlen(prefix) : 0;

 
 

-        r = new(char, length+1);
+        r = new(char, pl+length+1);

         if (!r)
                 return r;
 
         if (!r)
                 return r;
 

-        for (f = s, t = r; f < s + length; f++) {
+        if (prefix)
+                memcpy(r, prefix, pl);
+
+        for (f = s, t = r + pl; f < s + length; f++) {

 
                 if (*f != '\\') {
                         *(t++) = *f;
 
                 if (*f != '\\') {
                         *(t++) = *f;


@@ -1685,7 +1691,13 @@ finish:
         return r;
 }
 
         return r;
 }
 

+char *cunescape_length(const char *s, size_t length) {
+        return cunescape_length_with_prefix(s, length, NULL);
+}
+

 char *cunescape(const char *s) {
 char *cunescape(const char *s) {

+        assert(s);
+

         return cunescape_length(s, strlen(s));
 }
 
         return cunescape_length(s, strlen(s));
 }