hal/tools fstab-sync.c,1.8,1.9

[David Zeuthen]

Update of /cvs/hal/hal/tools
In directory pdx:/tmp/cvs-serv9220/tools

Modified Files:
	fstab-sync.c 
Log Message:
2004-08-17  David Zeuthen  <david at fubar.dk>

	* tools/fstab-sync.c (volume_new): Use vfat instead of msdos

	* hald/linux/volume_id/volume_id.c (probe_msdos): Revert ugly hack



Index: fstab-sync.c
===================================================================
RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fstab-sync.c	16 Aug 2004 18:52:39 -0000	1.8
+++ fstab-sync.c	17 Aug 2004 09:52:09 -0000	1.9
@@ -1019,9 +1019,16 @@
   volume->fs_type = get_hal_string_property (udi, "volume.fstype");
   if (volume->fs_type == NULL || strlen (volume->fs_type) == 0)
     {
+      free (volume->fs_type);
       volume->fs_type = strdup ("auto");
     }
 
+  if (strcmp (volume->fs_type, "msdos") == 0)
+    {
+      free (volume->fs_type);
+      volume->fs_type = strdup ("vfat");
+    }
+
   volume->label = get_hal_string_property (udi, "volume.label");
   if (volume->label == NULL)
     volume->label = strdup ("");