Messages in this thread Patch in this message |  | | Date | Sun, 10 Sep 2000 20:23:13 +0200 (CEST) | From | Urban Widmark <> | Subject | Re: Linux 2.2.18pre4 (smbfs config.in patch) |
| |
A patch for the Config.in problems with smbfs.
/Urban
diff -ur -X exclude linux-2.2.18-pre4-orig/Documentation/Configure.help linux/Documentation/Configure.help --- linux-2.2.18-pre4-orig/Documentation/Configure.help Sun Sep 10 20:07:56 2000 +++ linux/Documentation/Configure.help Sun Sep 10 20:13:11 2000 @@ -7948,6 +7948,13 @@ want), say M here and read Documentation/modules.txt. The module will be called smbfs.o. Most people say N, however. +use nls by default +CONFIG_SMB_NLS_DEFAULT + Enabling this will make smbfs use nls translations by default. You + need to specify the local charset (CONFIG_NLS_DEFAULT) in the nls + settings and you need to give the default nls for the SMB server as + CONFIG_SMB_NLS_REMOTE. + nls support setting CONFIG_SMB_NLS_REMOTE This setting allows you to specify a default value for which diff -ur -X exclude linux-2.2.18-pre4-orig/fs/Config.in linux/fs/Config.in --- linux-2.2.18-pre4-orig/fs/Config.in Sun Sep 10 20:08:25 2000 +++ linux/fs/Config.in Sun Sep 10 20:14:18 2000 @@ -92,7 +92,10 @@ fi tristate 'SMB filesystem support (to mount WfW shares etc.)' CONFIG_SMB_FS if [ "$CONFIG_SMB_FS" != "n" ]; then - string 'Default Remote NLS Option' CONFIG_SMB_NLS_REMOTE "" + bool ' Use a default NLS' CONFIG_SMB_NLS_DEFAULT + if [ "$CONFIG_SMB_NLS_DEFAULT" = "y" ]; then + string ' Default Remote NLS Option' CONFIG_SMB_NLS_REMOTE "cp437" + fi fi fi if [ "$CONFIG_IPX" != "n" -o "$CONFIG_INET" != "n" ]; then diff -ur -X exclude linux-2.2.18-pre4-orig/fs/nls/Config.in linux/fs/nls/Config.in --- linux-2.2.18-pre4-orig/fs/nls/Config.in Sun Sep 10 20:08:25 2000 +++ linux/fs/nls/Config.in Sun Sep 10 20:16:26 2000 @@ -5,7 +5,7 @@ # msdos and Joliet want NLS if [ "$CONFIG_JOLIET" = "y" -o "$CONFIG_FAT_FS" != "n" \ -o "$CONFIG_NTFS_FS" != "n" -o "$CONFIG_NCPFS_NLS" = "y" \ - -o "$CONFIG_SMB_FS" != n ]; then + -o "$CONFIG_SMB_FS" != "n" ]; then define_bool CONFIG_NLS y else define_bool CONFIG_NLS n diff -ur -X exclude linux-2.2.18-pre4-orig/fs/smbfs/inode.c linux/fs/smbfs/inode.c --- linux-2.2.18-pre4-orig/fs/smbfs/inode.c Sun Sep 10 20:08:26 2000 +++ linux/fs/smbfs/inode.c Sun Sep 10 20:14:55 2000 @@ -32,6 +32,13 @@ #include "smb_debug.h" +/* Always pick a default string */ +#ifdef CONFIG_SMB_NLS_REMOTE +#define SMB_NLS_REMOTE CONFIG_SMB_NLS_REMOTE +#else +#define SMB_NLS_REMOTE "" +#endif + static void smb_read_inode(struct inode *); static void smb_put_inode(struct inode *); static void smb_delete_inode(struct inode *); @@ -383,7 +390,7 @@ memcpy(mnt, raw_data, sizeof(struct smb_mount_data)); strncpy(mnt->codepage.local_name, CONFIG_NLS_DEFAULT, SMB_NLS_MAXNAMELEN); - strncpy(mnt->codepage.remote_name, CONFIG_SMB_NLS_REMOTE, + strncpy(mnt->codepage.remote_name, SMB_NLS_REMOTE, SMB_NLS_MAXNAMELEN); /* FIXME: ** temp ** pass config flags in file mode */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/
|  |