hal/hald/linux block_class_device.c,1.86.2.4,1.86.2.5

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux
In directory gabe:/tmp/cvs-serv21841/hald/linux

Modified Files:
      Tag: hal-0_4-stable-branch
	block_class_device.c 
Log Message:
2004-12-31  David Zeuthen  <davidz at redhat.com>

	* hald/linux/block_class_device.c (etc_mtab_process_line): Several
	characters in mountpoints in /etc/mtab are encoded in octal form
	(space, tab, newline etc). Current hal uses that directly which
	confuses several other tools in the stack. Attached patch puts it
	back in plain text again. Patch from Sjoerd Simons <sjoerd at luon.net>.


2004-12-15  David Zeuthen  <davidz at redhat.com>

	* fdi/20freedesktop/usb-zip-drives.fdi: Only match on actual
	harddisks to avoid wrong detection of e.g. "Iomega ZipCD 650 USB CDRW"
	drives (Red Hat bug #143834)

	* fdi/20freedesktop/ide-drives.fdi: ditto



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.86.2.4
retrieving revision 1.86.2.5
diff -u -d -r1.86.2.4 -r1.86.2.5
--- block_class_device.c	9 Dec 2004 03:15:22 -0000	1.86.2.4
+++ block_class_device.c	31 Dec 2004 12:01:52 -0000	1.86.2.5
@@ -1924,8 +1924,10 @@
 	mount_points[num_mount_points].minor = minor;
 	strncpy (mount_points[num_mount_points].device, device,
 		 MOUNT_POINT_STRING_SIZE);
-	strncpy (mount_points[num_mount_points].mount_point, mount_point,
-		 MOUNT_POINT_STRING_SIZE);
+	p = g_strcompress(mount_point);
+	strncpy (mount_points[num_mount_points].mount_point, p, 
+		MOUNT_POINT_STRING_SIZE);
+	g_free(p);
 	strncpy (mount_points[num_mount_points].fs_type, fs_type,
 		 MOUNT_POINT_STRING_SIZE);