X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils_string.c;h=8cda47272ffc9ee83cef43e2a55c2b7f416b78b4;hp=bb5677d46ebbcc5395d904b5918a815b40be53fc;hb=fa0bca0120fb5b219d8a97d969587e89471a4476;hpb=764ce7f2ab526c084f005186e0dcbabe59070247

diff --git a/udev_utils_string.c b/udev_utils_string.c
index bb5677d46..8cda47272 100644
--- a/udev_utils_string.c
+++ b/udev_utils_string.c
@@ -1,6 +1,4 @@
 /*
- * 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
@@ -14,7 +12,7 @@
  * 
  *	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.
  *
  */
 
@@ -30,64 +28,7 @@
 #include <syslog.h>
 #include <sys/utsname.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "logging.h"
-#include "udev_utils.h"
-#include "list.h"
-
-/* compare string with pattern (like fnmatch(), supports * ? [0-9] [!A-Z]) */
-int strcmp_pattern(const char *p, const char *s)
-{
-	if (s[0] == '\0') {
-		while (p[0] == '*')
-			p++;
-		return (p[0] != '\0');
-	}
-	switch (p[0]) {
-	case '[':
-		{
-			int not = 0;
-			p++;
-			if (p[0] == '!') {
-				not = 1;
-				p++;
-			}
-			while ((p[0] != '\0') && (p[0] != ']')) {
-				int match = 0;
-				if (p[1] == '-') {
-					if ((s[0] >= p[0]) && (s[0] <= p[2]))
-						match = 1;
-					p += 3;
-				} else {
-					match = (p[0] == s[0]);
-					p++;
-				}
-				if (match ^ not) {
-					while ((p[0] != '\0') && (p[0] != ']'))
-						p++;
-					if (p[0] == ']')
-						return strcmp_pattern(p+1, s+1);
-				}
-			}
-		}
-		break;
-	case '*':
-		if (strcmp_pattern(p, s+1))
-			return strcmp_pattern(p+1, s);
-		return 0;
-	case '\0':
-		if (s[0] == '\0') {
-			return 0;
-		}
-		break;
-	default:
-		if ((p[0] == s[0]) || (p[0] == '?'))
-			return strcmp_pattern(p+1, s+1);
-		break;
-	}
-	return 1;
-}
 
 int string_is_true(const char *str)
 {
@@ -100,7 +41,7 @@ int string_is_true(const char *str)
 	return 0;
 }
 
-void remove_trailing_char(char *path, char c)
+void remove_trailing_chars(char *path, char c)
 {
 	size_t len;
 
@@ -245,7 +186,7 @@ int replace_untrusted_chars(char *str)
 		if ((str[i] >= '0' && str[i] <= '9') ||
 		    (str[i] >= 'A' && str[i] <= 'Z') ||
 		    (str[i] >= 'a' && str[i] <= 'z') ||
-		    strchr(" #$%+-./:=?@_", str[i])) {
+		    strchr(" #$%+-./:=?@_,", str[i])) {
 			i++;
 			continue;
 		}