hal/drive_id drive_id.c,1.2,1.3

Kay Sievers kay at freedesktop.org
Fri Aug 12 15:28:32 PDT 2005


Update of /cvs/hal/hal/drive_id
In directory gabe:/tmp/cvs-serv11834/drive_id

Modified Files:
	drive_id.c 
Log Message:
2005-08-13  Kay Sievers  <kay.sievers at vrfy.org>

Sync up volume_id with the udev version.

        * drive_id/drive_id.c: (drive_id_open_dev_t):
        * volume_id/Makefile.am:
        * volume_id/cramfs.c: (volume_id_probe_cramfs):
        * volume_id/cramfs.h:
        * volume_id/dasd.c:
        * volume_id/dasd.h:
        * volume_id/ext.c: (volume_id_probe_ext):
        * volume_id/ext.h:
        * volume_id/fat.c: (get_attr_volume_id), (volume_id_probe_vfat):
        * volume_id/fat.h:
        * volume_id/hfs.c: (volume_id_probe_hfs_hfsplus):
        * volume_id/hfs.h:
        * volume_id/highpoint.c: (volume_id_probe_highpoint_37x_raid),
        (volume_id_probe_highpoint_45x_raid):
        * volume_id/highpoint.h:
        * volume_id/hpfs.c: (volume_id_probe_hpfs):
        * volume_id/hpfs.h:
        * volume_id/iso9660.c: (volume_id_probe_iso9660):
        * volume_id/iso9660.h:
        * volume_id/isw_raid.c: (volume_id_probe_intel_software_raid):
        * volume_id/isw_raid.h:
        * volume_id/jfs.c: (volume_id_probe_jfs):
        * volume_id/jfs.h:
        * volume_id/linux_raid.c: (volume_id_probe_linux_raid):
        * volume_id/linux_raid.h:
        * volume_id/linux_swap.c: (volume_id_probe_linux_swap):
        * volume_id/linux_swap.h:
        * volume_id/lsi_raid.c: (volume_id_probe_lsi_mega_raid):
        * volume_id/lsi_raid.h:
        * volume_id/luks.c: (volume_id_probe_luks):
        * volume_id/luks.h:
        * volume_id/lvm.c: (volume_id_probe_lvm1), (volume_id_probe_lvm2):
        * volume_id/lvm.h:
        * volume_id/mac.c: (volume_id_probe_mac_partition_map):
        * volume_id/mac.h:
        * volume_id/minix.c: (volume_id_probe_minix):
        * volume_id/minix.h:
        * volume_id/msdos.c: (volume_id_probe_msdos_part_table):
        * volume_id/msdos.h:
        * volume_id/ntfs.c: (volume_id_probe_ntfs):
        * volume_id/ntfs.h:
        * volume_id/nvidia_raid.c: (volume_id_probe_nvidia_raid):
        * volume_id/nvidia_raid.h:
        * volume_id/promise_raid.c: (volume_id_probe_promise_fasttrack_raid):
        * volume_id/promise_raid.h:
        * volume_id/reiserfs.c: (volume_id_probe_reiserfs):
        * volume_id/reiserfs.h:
        * volume_id/romfs.c: (volume_id_probe_romfs):
        * volume_id/romfs.h:
        * volume_id/silicon_raid.c: (volume_id_probe_silicon_medley_raid):
        * volume_id/silicon_raid.h:
        * volume_id/sysv.c: (volume_id_probe_sysv):
        * volume_id/sysv.h:
        * volume_id/udf.c: (volume_id_probe_udf):
        * volume_id/udf.h:
        * volume_id/ufs.c: (volume_id_probe_ufs):
        * volume_id/ufs.h:
        * volume_id/util.c: (volume_id_set_unicode16),
        (volume_id_set_label_raw),
        (volume_id_set_label_string), (volume_id_set_label_unicode16),
        (volume_id_set_uuid), (volume_id_get_buffer):
        * volume_id/util.h:
        * volume_id/via_raid.c: (volume_id_probe_via_raid):
        * volume_id/via_raid.h:
        * volume_id/volume_id.c: (volume_id_probe_all),
        (volume_id_open_dev_t):
        * volume_id/volume_id.h:
        * volume_id/xfs.c: (volume_id_probe_xfs):
        * volume_id/xfs.h:


Index: drive_id.c
===================================================================
RCS file: /cvs/hal/hal/drive_id/drive_id.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drive_id.c	26 Jul 2005 04:40:42 -0000	1.2
+++ drive_id.c	12 Aug 2005 22:28:30 -0000	1.3
@@ -115,7 +115,7 @@
 
 	snprintf((char *) tmp_node, DRIVE_ID_PATH_MAX,
 		 "/dev/.drive_id-%u-%u-%u", getpid(), major(devt), minor(devt));
-	tmp_node[DRIVE_ID_PATH_MAX] = '\0';
+	tmp_node[DRIVE_ID_PATH_MAX-1] = '\0';
 
 	/* create tempory node to open the block device */
 	unlink((char *) tmp_node);




More information about the hal-commit mailing list