Attachment 91806 Details for Bug 119900

[patch] gnome-volume-manager-vfat-flags.patch

gnome-volume-manager-vfat-flags.patch (text/plain), 1.67 KB, created by Stanislav Brabec on 2006-06-27 16:34:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislav Brabec

Created: 2006-06-27 16:34:59 UTC

Size: 1.67 KB

patch

obsolete

>--- src/manager.c
>+++ src/manager.c
>@@ -1417,6 +1417,7 @@
> 	MOUNT_UID        = (1 << 14),
> 	MOUNT_UMASK      = (1 << 15),
> 	MOUNT_UTF8       = (1 << 16),
>+	MOUNT_FMASK      = (1 << 17),
> };
> 
> static struct {
>@@ -1426,7 +1427,7 @@
> 	{ "codepage=",  MOUNT_CODEPAGE   },  /* vfat */
> 	{ "data=",      MOUNT_DATA       },  /* ext3 */
> 	{ "dirsync",    MOUNT_DIRSYNC    },
>-	{ "dmask=",     MOUNT_DMASK      },  /* ntfs */
>+	{ "dmask=",     MOUNT_DMASK      },  /* vfat, ntfs */
> 	{ "flush",      MOUNT_FLUSH      },  /* vfat */
> 	{ "iocharset=", MOUNT_IOCHARSET  },  /* vfat, iso9660 */
> 	{ "mode=",      MOUNT_MODE       },  /* iso9660 */
>@@ -1440,6 +1441,7 @@
> 	{ "uid=",       MOUNT_UID        },  /* vfat, ntfs, udf, iso9660 */
> 	{ "umask=",     MOUNT_UMASK      },  /* vfat, ntfs, udf */
> 	{ "utf8",       MOUNT_UTF8       },  /* vfat, iso9660 */
>+	{ "fmask=",     MOUNT_FMASK      },  /* vfat, ntfs */
> };
> 
> 
>@@ -1640,7 +1642,7 @@
> 			guint32 opts = 0;
> 			char uid[32];
> 			size_t i, j;
>-			
>+
> 			if ((moptions = libhal_device_get_property_strlist (hal_ctx, udi, "volume.mount.valid_options", NULL))) {
> 				for (i = 0; moptions[i]; i++) {
> 					for (j = 0; j < G_N_ELEMENTS (mount_options); j++) {
>@@ -1669,8 +1671,13 @@
> 						g_ptr_array_add (options, "sync");
> 				}
> 				
>-				if (opts & MOUNT_SHORTNAME)
>-					g_ptr_array_add (options, "shortname=winnt");
>+				if (opts & MOUNT_FMASK) {
>+					mode_t mask = umask (0);
>+					umask (mask);
>+					char mask_str[12];
>+					sprintf (mask_str, "fmask=%#o", mask | 0111);
>+					g_ptr_array_add (options, mask_str);
>+				}
> 			} else if (!strcmp (fstype, "iso9660")) {
> 				/* only care about uid= and iocharset= */
> 			} else if (!strcmp (fstype, "udf")) {

Actions: View | Diff

Attachments on bug 119900: 91800 | 91801 | 91806