more random patches. who knows.

[patches.git] / mdev.patch

diff -Naur busybox.orig/util-linux/Config.in busybox/util-linux/Config.in
--- busybox.orig/util-linux/Config.in	2008-03-22 09:11:36 +0000
+++ busybox/util-linux/Config.in	2008-03-22 15:25:22 +0000
@@ -321,6 +321,13 @@
 
 	  For more information, please see docs/mdev.txt
 
+config FEATURE_MDEV_RENAME_REGEXP
+	bool "Support regular expressions substitutions when renaming device"
+	default n
+	depends on FEATURE_MDEV_RENAME
+	help
+	  Add support for regular expressions substitutions when renaming device.
+
 config FEATURE_MDEV_EXEC
 	bool "Support command execution at device addition/removal"
 	default n
diff -Naur busybox.orig/util-linux/mdev.c busybox/util-linux/mdev.c
--- busybox.orig/util-linux/mdev.c	2008-03-17 18:23:37 +0000
+++ busybox/util-linux/mdev.c	2008-03-22 19:15:10 +0000
@@ -21,6 +21,25 @@
 
 #define MAX_SYSFS_DEPTH 3 /* prevent infinite loops in /sys symlinks */
 
+#if ENABLE_FEATURE_MDEV_RENAME_REGEXP
+static char *strsubst(const char *s, const char *str, regmatch_t *vals)
+{
+	char *buf = xzalloc(PATH_MAX), *p = buf;
+	while (*s) {
+		if ('%' == *s) {
+			int i = (*++s-'0');
+			int n = vals[i].rm_eo-vals[i].rm_so;
+			strncpy(p, str+vals[i].rm_so, n);
+			p += n;
+		} else {
+			*p++ = *s;
+		}
+		s++;
+	}
+	return buf;
+}
+#endif
+
 /* mknod in /dev based on a path like "/sys/block/hda/hda1" */
 static void make_device(char *path, int delete)
 {
@@ -70,6 +89,9 @@
 
 		while ((vline = line = xmalloc_getline(fp)) != NULL) {
 			int field;
+#if ENABLE_FEATURE_MDEV_RENAME_REGEXP
+			regmatch_t off[10];
+#endif
 
 			/* A pristine copy for command execution. */
 			char *orig_line;
@@ -98,16 +120,26 @@
 
 					/* Regex to match this device */
 					regex_t match;
+#if !ENABLE_FEATURE_MDEV_RENAME_REGEXP
 					regmatch_t off;
+#endif
 					int result;
 
 					/* Is this it? */
 					xregcomp(&match, val, REG_EXTENDED);
+#if ENABLE_FEATURE_MDEV_RENAME_REGEXP
+					result = regexec(&match, device_name, 10, off, 0);
+#else
 					result = regexec(&match, device_name, 1, &off, 0);
+#endif
 					regfree(&match);
 
 					/* If not this device, skip rest of line */
+#if ENABLE_FEATURE_MDEV_RENAME_REGEXP
+					if (result || off[0].rm_so || off[0].rm_eo != strlen(device_name))
+#else
 					if (result || off.rm_so || off.rm_eo != strlen(device_name))
+#endif
 						goto next_line;
 
 				} else if (field == 1) {
@@ -144,8 +176,14 @@
 
 					if (*val != '>')
 						++field;
-					else
+					else {
+#if ENABLE_FEATURE_MDEV_RENAME_REGEXP
+						// substitute %1..9 with off[1..9], if any
+						alias = strsubst(val + 1, device_name, off);
+#else
 						alias = xstrdup(val + 1);
+#endif
+					}
 
 				}
 
@@ -209,6 +247,21 @@
 				char *dest;
 
 				temp = strrchr(alias, '/');
+#if ENABLE_FEATURE_MDEV_RENAME_REGEXP
+				// directory given ->
+				if (temp && temp[1] == '\0') {
+					// make it
+					bb_make_directory(alias, 0755, FILEUTILS_RECUR);
+					// compose device new location
+					dest = concat_path_file(alias, device_name);
+				// filename given ->
+				} else {
+					// save it
+					dest = xstrdup(alias);
+					// create parent directories
+					bb_make_directory(dirname(alias), 0755, FILEUTILS_RECUR);
+				}
+#else
 				if (temp) {
 					if (temp[1] != '\0')
 						/* given a file name, so rename it */
@@ -217,7 +270,7 @@
 					dest = concat_path_file(alias, device_name);
 				} else
 					dest = alias;
-
+#endif
 				rename(device_name, dest); // TODO: xrename?
 				symlink(dest, device_name);