Attachment 153575 Details for Bug 237921 – Patch for the escaping problem

[patch] Patch for the escaping problem

hal-0.5.8.1-noescape.patch (text/plain), 1.14 KB, created by David Shaw on 2007-04-27 03:33:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Shaw

Created: 2007-04-27 03:33:26 UTC

Size: 1.14 KB

patch

obsolete

>--- hal-0.5.8.1/tools/hal-storage-mount.c.orig	2007-04-26 23:23:04.000000000 -0400
>+++ hal-0.5.8.1/tools/hal-storage-mount.c	2007-04-26 23:23:35.000000000 -0400
>@@ -832,7 +832,6 @@
> 	 *                      but it doesn't really matter much at this point */
> 	if (!is_remount) {
> 		FILE *hal_mtab;
>-		char *mount_dir_escaped;
> 		FILE *hal_mtab_orig;
> 		int hal_mtab_orig_len;
> 		int num_read;
>@@ -876,7 +875,6 @@
> 			hal_mtab_buf = g_strdup ("");
> 		}
> 		
>-		mount_dir_escaped = g_strescape (mount_dir, NULL);
> #ifdef DEBUG
> 		printf ("%d: XYA creating /media/.hal-mtab~\n", getpid ());
> #endif
>@@ -888,7 +886,7 @@
> 		hal_mtab_buf = g_strdup_printf ("%s%s\t%s\t0\t%s\t%s\t%s\n", 
> 						hal_mtab_buf_old,
> 						device, invoked_by_uid, mount_do_fstype, 
>-						mount_option_commasep, mount_dir_escaped);
>+						mount_option_commasep, mount_dir);
> 		g_free (hal_mtab_buf_old);
> 		if (hal_mtab_buf_old == NULL) {
> 			unknown_error ("Out of memory appending to /media/.hal-mtab~");
>@@ -898,7 +896,6 @@
> 		}
> 		fclose (hal_mtab);
> 		g_free (hal_mtab_buf);
>-		g_free (mount_dir_escaped);
> #ifdef DEBUG
> 		printf ("%d: XYA closing /media/.hal-mtab~\n", getpid ());
> #endif

Actions: View | Diff

Attachments on bug 237921: 153575 | 153652