1 files changed, 31 insertions, 34 deletions

diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h
index 3eeee9672a4a..6eb567ac56bc 100644
--- a/include/linux/string_helpers.h
+++ b/include/linux/string_helpers.h
@@ -20,40 +20,6 @@ int string_get_size(u64 size, enum string_size_units units,
 #define UNESCAPE_ANY            \
         (UNESCAPE_SPACE | UNESCAPE_OCTAL | UNESCAPE_HEX | UNESCAPE_SPECIAL)
 
-/**
- * string_unescape - unquote characters in the given string
- * @src:        source buffer (escaped)
- * @dst:        destination buffer (unescaped)
- * @size:       size of the destination buffer (0 to unlimit)
- * @flags:      combination of the flags (bitwise OR):
- *      %UNESCAPE_SPACE:
- *              '\f' - form feed
- *              '\n' - new line
- *              '\r' - carriage return
- *              '\t' - horizontal tab
- *              '\v' - vertical tab
- *      %UNESCAPE_OCTAL:
- *              '\NNN' - byte with octal value NNN (1 to 3 digits)
- *      %UNESCAPE_HEX:
- *              '\xHH' - byte with hexadecimal value HH (1 to 2 digits)
- *      %UNESCAPE_SPECIAL:
- *              '\"' - double quote
- *              '\\' - backslash
- *              '\a' - alert (BEL)
- *              '\e' - escape
- *      %UNESCAPE_ANY:
- *              all previous together
- *
- * Returns amount of characters processed to the destination buffer excluding
- * trailing '\0'.
- *
- * Because the size of the output will be the same as or less than the size of
- * the input, the transformation may be performed in place.
- *
- * Caller must provide valid source and destination pointers. Be aware that
- * destination buffer will always be NULL-terminated. Source string must be
- * NULL-terminated as well.
- */
 int string_unescape(char *src, char *dst, size_t size, unsigned int flags);
 
 static inline int string_unescape_inplace(char *buf, unsigned int flags)
@@ -71,4 +37,35 @@ static inline int string_unescape_any_inplace(char *buf)
         return string_unescape_any(buf, buf, 0);
 }
 
+#define ESCAPE_SPACE            0x01
+#define ESCAPE_SPECIAL          0x02
+#define ESCAPE_NULL             0x04
+#define ESCAPE_OCTAL            0x08
+#define ESCAPE_ANY              \
+        (ESCAPE_SPACE | ESCAPE_OCTAL | ESCAPE_SPECIAL | ESCAPE_NULL)
+#define ESCAPE_NP               0x10
+#define ESCAPE_ANY_NP           (ESCAPE_ANY | ESCAPE_NP)
+#define ESCAPE_HEX              0x20
+
+int string_escape_mem(const char *src, size_t isz, char **dst, size_t osz,
+                unsigned int flags, const char *esc);
+
+static inline int string_escape_mem_any_np(const char *src, size_t isz,
+                char **dst, size_t osz, const char *esc)
+{
+        return string_escape_mem(src, isz, dst, osz, ESCAPE_ANY_NP, esc);
+}
+
+static inline int string_escape_str(const char *src, char **dst, size_t sz,
+                unsigned int flags, const char *esc)
+{
+        return string_escape_mem(src, strlen(src), dst, sz, flags, esc);
+}
+
+static inline int string_escape_str_any_np(const char *src, char **dst,
+                size_t sz, const char *esc)
+{
+        return string_escape_str(src, dst, sz, ESCAPE_ANY_NP, esc);
+}
+
 #endif