lkml.org 
[lkml]   [2000]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Error in fs/nls/Config.in in 2.2.18-pre3
On Thu, 7 Sep 2000, Marcelo Tosatti wrote:

> oldconfig always ask about CONFIG_SMB_NLS_REMOTE in case it
> was set CONFIG_SMB_NLS_REMOTE="" in the previous config.
>
> This is expected?

It's certainly annoying, especially for people building packages (At
least the rpms specs I have looked at).

The reason for having a default of "" was only to make it easy to set the
default to nothing (which would be unchanged behaviour, no nls
translation). I thought I was clever. Having a separate flag should work
better.

Something like this perhaps?
(except that this is from a non-standard directory level, has no
Configure.help and is mostly untested).

/Urban

--- fs/Config.in.orig Thu Sep 7 23:46:55 2000
+++ fs/Config.in Fri Sep 8 00:11:23 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
--- fs/nls/Config.in.orig Thu Sep 7 18:12:43 2000
+++ fs/nls/Config.in Thu Sep 7 23:59:31 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
--- fs/smbfs/inode.c.orig Thu Sep 7 23:56:31 2000
+++ fs/smbfs/inode.c Fri Sep 8 00:18:19 2000
@@ -32,6 +32,14 @@

#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 +391,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/

\
 
 \ /
  Last update: 2005-03-22 12:38    [from the cache]
©2003-2011 Jasper Spaans