/*
- * udev_utils_string.c - string manipulation
- *
* Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
path[--len] = '\0';
}
+size_t path_encode(char *s, size_t len)
+{
+ char t[(len * 3)+1];
+ size_t i, j;
+
+ t[0] = '\0';
+ for (i = 0, j = 0; s[i] != '\0'; i++) {
+ if (s[i] == '/') {
+ memcpy(&t[j], "\\x2f", 4);
+ j += 4;
+ } else if (s[i] == '\\') {
+ memcpy(&t[j], "\\x5c", 4);
+ j += 4;
+ } else {
+ t[j] = s[i];
+ j++;
+ }
+ }
+ t[j] = '\0';
+ strncpy(s, t, len);
+ return j;
+}
+
+size_t path_decode(char *s)
+{
+ size_t i, j;
+
+ for (i = 0, j = 0; s[i] != '\0'; j++) {
+ if (memcmp(&s[i], "\\x2f", 4) == 0) {
+ s[j] = '/';
+ i += 4;
+ }else if (memcmp(&s[i], "\\x5c", 4) == 0) {
+ s[j] = '\\';
+ i += 4;
+ } else {
+ s[j] = s[i];
+ i++;
+ }
+ }
+ s[j] = '\0';
+ return j;
+}
+
/* count of characters used to encode one unicode char */
static int utf8_encoded_expected_len(const char *str)
{
return len;
}
-/* replace everything but whitelisted plain ascii and valid utf8 */
-int replace_untrusted_chars(char *str)
+/* allow chars in whitelist, plain ascii, hex-escaping and valid utf8 */
+int replace_chars(char *str, const char *white)
{
size_t i = 0;
int replaced = 0;
while (str[i] != '\0') {
int len;
- /* valid printable ascii char */
+ /* accept whitelist */
+ if (white != NULL && strchr(white, str[i]) != NULL) {
+ i++;
+ continue;
+ }
+
+ /* accept plain ascii char */
if ((str[i] >= '0' && str[i] <= '9') ||
(str[i] >= 'A' && str[i] <= 'Z') ||
- (str[i] >= 'a' && str[i] <= 'z') ||
- strchr(" #$%+-./:=?@_,", str[i])) {
+ (str[i] >= 'a' && str[i] <= 'z')) {
i++;
continue;
}
- /* valid utf8 is accepted */
+
+ /* accept hex encoding */
+ if (str[i] == '\\' && str[i+1] == 'x') {
+ i += 2;
+ continue;
+ }
+
+ /* accept valid utf8 */
len = utf8_encoded_valid_unichar(&str[i]);
if (len > 1) {
i += len;
continue;
}
- /* everything else is garbage */
+ /* if space is allowed, replace whitespace with ordinary space */
+ if (isspace(str[i]) && strchr(white, ' ') != NULL) {
+ str[i] = ' ';
+ i++;
+ replaced++;
+ continue;
+ }
+
+ /* everything else is replaced with '_' */
str[i] = '_';
i++;
replaced++;