Attachment 45931 Details for Bug 74614

patch for mount-subfs.c to get iocharset value by invoking submount-get-iocharset script.

mount-subfs-iocharset.diff (text/x-patch), 1.61 KB, created by Zhe Su on 2005-08-12 15:13:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zhe Su

Created: 2005-08-12 15:13:30 UTC

Size: 1.61 KB

patch

obsolete

>--- mount-subfs.c	2005-08-12 22:47:33.000000000 +0800
>+++ mount-subfs.c.new	2005-08-12 22:49:33.000000000 +0800
>@@ -43,6 +43,38 @@
> 
> static const char char_white_list[] = "_-+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
> 
>+static const char *
>+get_iocharset ()
>+{
>+    static const char *valid_iocharsets [] = 
>+    {
>+	"utf8", "cp950", "cp950", "cp950", "cp1251", "euc-jp", "cp949", "cp936", "cp936", "cp936",
>+	"iso8859-1", "iso8859-2", "iso8859-3", "iso8859-4", "iso8859-5", "iso8859-6", "iso8859-7",
>+	"iso8859-9", "iso8859-13", "iso8859-14", "iso8859-15",
>+	"koi8-r", "koi8-u", "cp932", "cp874", NULL
>+    };
>+
>+    char buf [256];
>+    FILE *fp;
>+    int chars_read;
>+    size_t i;
>+
>+    if ((fp = popen ("/bin/sh /usr/sbin/submount-get-iocharset", "r")) != NULL) {
>+	chars_read = fread (buf, sizeof(char), 255, fp);
>+	pclose (fp);
>+	if (chars_read > 0) {
>+	    if (buf [chars_read - 1] == '\n')
>+		buf [chars_read - 1] = 0;
>+
>+	    for (i = 0; valid_iocharsets [i] != NULL; ++i)
>+		if (strcmp (valid_iocharsets [i], buf) == 0)
>+		    return valid_iocharsets [i];
>+	}
>+    }
>+
>+    return "utf8";
>+}
>+
> int
> main (int argc, const char *argv[])
> {
>@@ -338,8 +370,7 @@
>         }
> 
>         mkdir (mount_point, 0775);
>-        snprintf( cmd, MOUNT_LENGTH, "/bin/mount -t subfs -o %snosuid,nodev,exec %s \"%s\"", subfs_type, device_file, mount_point );
>-       
>+        snprintf( cmd, MOUNT_LENGTH, "/bin/mount -t subfs -o %snosuid,nodev,exec,iocharset=%s %s \"%s\"", subfs_type, get_iocharset (), device_file, mount_point );
>  
>         syslog (LOG_INFO, "registered at resmgrd and called(%d) %s ", system(cmd), cmd);
>

Actions: View

Attachments on bug 74614: 45851 | 45852 | 45853 | 45857 | 45930 | 45931 | 45961