Re: [PATCH] symlink only rules support

[Andrey Borzenkov <arvidjaar@mail.ru>]

[-- Attachment #1: Type: text/plain, Size: 757 bytes --]

On Saturday 28 February 2004 04:04, Greg KH wrote:
> On Sun, Feb 22, 2004 at 12:50:13PM +0300, Andrey Borzenkov wrote:
> > On Tue, Feb 17, 2004 at 09:29:53AM -0800, Greg KH wrote:
> > > > What about the second part (allow symlink-only rules)?
> > >
> > > Yes, I think that would be good to have too.  Just split the patches up
> > > into two pieces, only one patch per feature/fix.
> >
> > Slightly modified version. It is less aggressive in that it just adds
> > symlink collection but otherwise behaves exactly like current code.
> >
> > the patch is relative to previous one (configuration directory support).
>
> Hm, as Kay modified that one, and things have changed enough, can you
> resend this against the 019 release?
>

attached

regdards

-andrey

[-- Attachment #2: udev019_symlink.patch --]
[-- Type: text/x-diff, Size: 1857 bytes --]

--- udev-019/namedev.c.symlink	2004-02-28 04:11:47.000000000 +0300
+++ udev-019/namedev.c	2004-02-28 17:49:42.621962496 +0300
@@ -816,17 +816,31 @@ int namedev_name_device(struct sysfs_cla
 	list_for_each_entry(dev, &config_device_list, node) {
 		dbg("process rule");
 		if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
-			if (dev->name[0] == '\0') {
+			if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
 				info("configured rule in '%s' at line %i applied, '%s' is ignored",
 				     udev_rules_filename, dev->config_line, udev->kernel_name);
 				return -1;
 			}
 
-			info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
-			     udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
-			strfieldcpy(udev->name, dev->name);
-			strfieldcpy(udev->symlink, dev->symlink);
-			goto found;
+			if (dev->symlink[0] != '\0') {
+				char temp[NAME_MAX];
+
+				info("configured rule in '%s' at line %i applied, added symlink '%s'",
+				     udev_rules_filename, dev->config_line, dev->symlink);
+				/* do not clobber dev */
+				strfieldcpy(temp, dev->symlink);
+				apply_format(udev, temp, sizeof(temp),
+					     class_dev, sysfs_device);
+				strfieldcat(udev->symlink, temp);
+				strfieldcat(udev->symlink, " ");
+			}
+
+			if (dev->name[0] != '\0') {
+				info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+				     udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
+				strfieldcpy(udev->name, dev->name);
+				goto found;
+			}
 		}
 	}
 
@@ -838,8 +852,6 @@ found:
 	/* substitute placeholder */
 	apply_format(udev, udev->name, sizeof(udev->name),
 		     class_dev, sysfs_device);
-	apply_format(udev, udev->symlink, sizeof(udev->symlink),
-		     class_dev, sysfs_device);
 	udev->partitions = dev->partitions;
 done:
 	perm = find_perm(udev->name);