From nobody@FreeBSD.org  Fri Jan  6 04:03:27 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3639D106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  6 Jan 2012 04:03:27 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 23E6C8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  6 Jan 2012 04:03:27 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q0643QcN025864
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 6 Jan 2012 04:03:26 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q0643Q5i025854;
	Fri, 6 Jan 2012 04:03:26 GMT
	(envelope-from nobody)
Message-Id: <201201060403.q0643Q5i025854@red.freebsd.org>
Date: Fri, 6 Jan 2012 04:03:26 GMT
From: Gabor Fischer <Gabor.Fischer@gmx.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] German filename conversion scheme for mount_nwfs
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         163847
>Category:       bin
>Synopsis:       [PATCH] German filename conversion scheme for mount_nwfs(8)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 06 04:10:08 UTC 2012
>Closed-Date:    Fri Jun 22 05:37:28 UTC 2012
>Last-Modified:  Fri Jun 22 07:01:27 UTC 2012
>Originator:     Gabor Fischer
>Release:        8.2-RELEASE
>Organization:
>Environment:
FreeBSD freebsd.fischer.lan 8.2-RELEASE #0: Mon Dec 19 00:41:49 CET 2011     root@freebsd.fischer.lan:/usr/obj/usr/src/sys/MYKERNEL   i386
>Description:
I am using mount_nwfs on FreeBSD 8.2-RELEASE. I use mount_nwfs to access a Novell NetWare 6.5 server. I noticed that there is no scheme for german filename translation, only swedish and koi8-r. After some searching, I found out that the source code for these conversions are in /usr/src/lib/libncp/ncpl_nls.c. So I created a scheme for german filename conversion.

The patch is attached. It changes the files /usr/src/lib/libncp/ncpl_nls.c and /usr/include/netncp/ncp_nls.h. Then libncp can be recompiled and the german scheme for filename conversion is available. It works perfectly for me.

I also noticed that there is another file ncp_nls.h in /usr/src/sys/netncp. I don't know how this file is related to the one in /usr/include/netncp, but probably the same change should be applied to that file too.

Apparently, NetWare uses the old IBM codepage 437 for character encoding. I use ISO 8859-1 on FreeBSD (locale de_DE.ISO8859-1). My translation table should work for other languages that use ISO 8859-1 as well, but I only tested it with german.

My patch has been reviewed by Boris Popov (bp@freebsd.org) and he found it ok.
>How-To-Repeat:
Mount a NetWare volume with mount_nwfs, which has files with german special characters in the filenames. On FreeBSD, these characters are incorrect.
>Fix:
Apply my patch to /usr/src/lib/libncp/ncpl_nls.c and /usr/include/netncp/ncp_nls.h. Then recompile libncp (simply execute make in /usr/src/lib/libncp). Copy the newly created libncp.so.4 to /usr/lib (backup original first!).

Then mount_nwfs can be executed with the option "-w de" to mount the NetWare volume again. The german special characters in the filenames are ok now.

Patch attached with submission follows:

--- /usr/src/lib/libncp/ncpl_nls.c.orig	2012-01-02 02:34:55.000000000 +0100
+++ /usr/src/lib/libncp/ncpl_nls.c	2012-01-02 02:36:15.000000000 +0100
@@ -200,6 +200,79 @@
 	0x9c, 0x9b, 0x87, 0x98, 0x9d, 0x99, 0x97, 0x9a
 };
 
+/*
+ * Characters mapping for codepages used in Germany.
+ */
+static u_int8_t de_nw2unix[] = {
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x00 */
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+	0x5f, 0x5f, 0x5f, 0x5f, 0xb6, 0xa7, 0x5f, 0x5f, /* 0x10 */
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
+	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 
+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
+	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 
+	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
+	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 
+	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
+	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 
+	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
+	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 
+	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
+	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 
+	0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7, /* 0x80 */
+	0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5, 
+	0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9, /* 0x90 */
+	0xff, 0xd6, 0xdc, 0xa2, 0xa3, 0xa5, 0x5f, 0x5f, 
+	0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba, /* 0xA0 */
+	0xbf, 0x5f, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb, 
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xB0 */
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xC0 */
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xD0 */
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
+	0x5f, 0xdf, 0x5f, 0x5f, 0x5f, 0x5f, 0xb5, 0x5f, /* 0xE0 */
+	0x5f, 0x5f, 0x5f, 0xf0, 0x5f, 0xf8, 0x5f, 0x5f, 
+	0x5f, 0xb1, 0x5f, 0x5f, 0x5f, 0x5f, 0xf7, 0x5f, /* 0xF0 */
+	0xb0, 0x5f, 0xb7, 0x5f, 0x5f, 0xb2, 0x5f, 0xa0
+};
+
+static u_int8_t de_unix2nw[] = {
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x00 */
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x10 */
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
+	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 
+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
+	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 
+	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
+	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 
+	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
+	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 
+	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
+	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 
+	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
+	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x80 */
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x90 */
+	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
+	0xff, 0xad, 0x9b, 0x9c, 0x5f, 0x9d, 0x5f, 0x15, /* 0xA0 */
+	0x5f, 0x5f, 0xa6, 0xae, 0xaa, 0x5f, 0x5f, 0x5f, 
+	0xf8, 0xf1, 0xfd, 0x5f, 0x5f, 0xe6, 0x14, 0xfa, /* 0xB0 */
+	0x5f, 0x5f, 0xa7, 0xaf, 0xac, 0xab, 0x5f, 0xa8, 
+	0x5f, 0x5f, 0x5f, 0x5f, 0x8e, 0x8f, 0x92, 0x80, /* 0xC0 */
+	0x5f, 0x90, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
+	0x5f, 0xa5, 0x5f, 0x5f, 0x5f, 0x5f, 0x99, 0x5f, /* 0xD0 */
+	0x5f, 0x5f, 0x5f, 0x5f, 0x9a, 0x5f, 0x5f, 0xe1, 
+	0x85, 0xa0, 0x83, 0x5f, 0x84, 0x86, 0x91, 0x87, /* 0xE0 */
+	0x8a, 0x82, 0x88, 0x89, 0x8d, 0xa1, 0x8c, 0x8b, 
+	0xeb, 0xa4, 0x95, 0xa2, 0x93, 0x5f, 0x94, 0xf6, /* 0xF0 */
+	0xed, 0x97, 0xa3, 0x96, 0x81, 0x5f, 0x5f, 0x98
+};
+
 
 static u_int8_t def2lower[256];
 static u_int8_t def2upper[256];
@@ -225,6 +298,9 @@
 	{NCP_NLS_SE, NCP_NLS_SE_NAME, 
 	    {def2lower, def2upper, se_nw2unix, se_unix2nw, 0}
 	},
+	{NCP_NLS_DE, NCP_NLS_DE_NAME, 
+	    {def2lower, def2upper, de_nw2unix, de_unix2nw, 0}
+	},
 	{0}
 };
 
--- /usr/include/netncp/ncp_nls.h.orig	2012-01-02 02:35:34.000000000 +0100
+++ /usr/include/netncp/ncp_nls.h	2012-01-02 02:36:51.000000000 +0100
@@ -58,9 +58,11 @@
 #define	NCP_NLS_AS_IS		1
 #define	NCP_NLS_AS_IS_NAME	"asis"
 #define	NCP_NLS_KOI_866		2
-#define	NCP_NLS_SE		3
 #define	NCP_NLS_KOI_866_NAME	"koi2cp866"
+#define	NCP_NLS_SE		3
 #define	NCP_NLS_SE_NAME		"se"
+#define	NCP_NLS_DE		3
+#define	NCP_NLS_DE_NAME		"de"
 
 extern struct ncp_nlstables ncp_nls;	/* active nls */
 


>Release-Note:
>Audit-Trail:

From: Gabor Fischer <Gabor.Fischer@gmx.net>
To: bug-followup@FreeBSD.org, Gabor.Fischer@gmx.net
Cc:  
Subject: Re: bin/163847: [PATCH] German filename conversion scheme for mount_nwfs(8)
Date: Thu, 12 Apr 2012 17:30:15 +0200

 This is a multi-part message in MIME format.
 --------------090409020304050801000404
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Corrected a minor bug in the patch, so I send it again. Could someone 
 please take a look at this?
 
 --------------090409020304050801000404
 Content-Type: text/plain; charset=windows-1252;
  name="patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch.txt"
 
 --- /usr/src/lib/libncp/ncpl_nls.c.orig	2012-01-02 02:34:55.000000000 +0100
 +++ /usr/src/lib/libncp/ncpl_nls.c	2012-01-02 02:36:15.000000000 +0100
 @@ -200,6 +200,79 @@
  	0x9c, 0x9b, 0x87, 0x98, 0x9d, 0x99, 0x97, 0x9a
  };
  
 +/*
 + * Characters mapping for codepages used in Germany.
 + */
 +static u_int8_t de_nw2unix[] = {
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x00 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0xb6, 0xa7, 0x5f, 0x5f, /* 0x10 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
 +	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 
 +	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
 +	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 
 +	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
 +	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 
 +	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
 +	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 
 +	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
 +	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 
 +	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
 +	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 
 +	0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7, /* 0x80 */
 +	0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5, 
 +	0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9, /* 0x90 */
 +	0xff, 0xd6, 0xdc, 0xa2, 0xa3, 0xa5, 0x5f, 0x5f, 
 +	0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba, /* 0xA0 */
 +	0xbf, 0x5f, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb, 
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xB0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xC0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xD0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
 +	0x5f, 0xdf, 0x5f, 0x5f, 0x5f, 0x5f, 0xb5, 0x5f, /* 0xE0 */
 +	0x5f, 0x5f, 0x5f, 0xf0, 0x5f, 0xf8, 0x5f, 0x5f, 
 +	0x5f, 0xb1, 0x5f, 0x5f, 0x5f, 0x5f, 0xf7, 0x5f, /* 0xF0 */
 +	0xb0, 0x5f, 0xb7, 0x5f, 0x5f, 0xb2, 0x5f, 0xa0
 +};
 +
 +static u_int8_t de_unix2nw[] = {
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x00 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x10 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
 +	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 
 +	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
 +	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 
 +	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
 +	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 
 +	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
 +	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 
 +	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
 +	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 
 +	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
 +	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x80 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x90 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
 +	0xff, 0xad, 0x9b, 0x9c, 0x5f, 0x9d, 0x5f, 0x15, /* 0xA0 */
 +	0x5f, 0x5f, 0xa6, 0xae, 0xaa, 0x5f, 0x5f, 0x5f, 
 +	0xf8, 0xf1, 0xfd, 0x5f, 0x5f, 0xe6, 0x14, 0xfa, /* 0xB0 */
 +	0x5f, 0x5f, 0xa7, 0xaf, 0xac, 0xab, 0x5f, 0xa8, 
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x8e, 0x8f, 0x92, 0x80, /* 0xC0 */
 +	0x5f, 0x90, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 
 +	0x5f, 0xa5, 0x5f, 0x5f, 0x5f, 0x5f, 0x99, 0x5f, /* 0xD0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x9a, 0x5f, 0x5f, 0xe1, 
 +	0x85, 0xa0, 0x83, 0x5f, 0x84, 0x86, 0x91, 0x87, /* 0xE0 */
 +	0x8a, 0x82, 0x88, 0x89, 0x8d, 0xa1, 0x8c, 0x8b, 
 +	0xeb, 0xa4, 0x95, 0xa2, 0x93, 0x5f, 0x94, 0xf6, /* 0xF0 */
 +	0xed, 0x97, 0xa3, 0x96, 0x81, 0x5f, 0x5f, 0x98
 +};
 +
  
  static u_int8_t def2lower[256];
  static u_int8_t def2upper[256];
 @@ -225,6 +298,9 @@
  	{NCP_NLS_SE, NCP_NLS_SE_NAME, 
  	    {def2lower, def2upper, se_nw2unix, se_unix2nw, 0}
  	},
 +	{NCP_NLS_DE, NCP_NLS_DE_NAME, 
 +	    {def2lower, def2upper, de_nw2unix, de_unix2nw, 0}
 +	},
  	{0}
  };
  
 --- /usr/include/netncp/ncp_nls.h.orig	2012-01-02 02:35:34.000000000 +0100
 +++ /usr/include/netncp/ncp_nls.h	2012-01-02 02:36:51.000000000 +0100
 @@ -58,9 +58,11 @@
  #define	NCP_NLS_AS_IS		1
  #define	NCP_NLS_AS_IS_NAME	"asis"
  #define	NCP_NLS_KOI_866		2
 -#define	NCP_NLS_SE		3
  #define	NCP_NLS_KOI_866_NAME	"koi2cp866"
 +#define	NCP_NLS_SE		3
  #define	NCP_NLS_SE_NAME		"se"
 +#define	NCP_NLS_DE		4
 +#define	NCP_NLS_DE_NAME		"de"
  
  extern struct ncp_nlstables ncp_nls;	/* active nls */
  
 
 --------------090409020304050801000404--
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Fri Apr 13 00:51:17 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163847 
State-Changed-From-To: open->analyzed 
State-Changed-By: eadler 
State-Changed-When: Fri May 11 23:03:48 UTC 2012 
State-Changed-Why:  
awaiting approval 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163847 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/163847: commit references a PR
Date: Fri,  1 Jun 2012 03:59:26 +0000 (UTC)

 Author: eadler
 Date: Fri Jun  1 03:59:08 2012
 New Revision: 236376
 URL: http://svn.freebsd.org/changeset/base/236376
 
 Log:
   Add characters mapping for codepages used in Germany.
   
   (not verified by me to be accurate)
   
   PR:		bin/163847
   Submitted by:	Gabor Fischer <Gabor.Fischer@gmx.net>
   Reviewed by:	bp
   Approved by:	cperciva
   MFC after:	3 weeks
 
 Modified:
   head/lib/libncp/ncpl_nls.c
   head/sys/netncp/ncp_nls.h
 
 Modified: head/lib/libncp/ncpl_nls.c
 ==============================================================================
 --- head/lib/libncp/ncpl_nls.c	Fri Jun  1 03:56:12 2012	(r236375)
 +++ head/lib/libncp/ncpl_nls.c	Fri Jun  1 03:59:08 2012	(r236376)
 @@ -200,6 +200,79 @@ static u_int8_t se_unix2nw[] = {
  	0x9c, 0x9b, 0x87, 0x98, 0x9d, 0x99, 0x97, 0x9a
  };
  
 +/*
 + * Characters mapping for codepages used in Germany.
 + */
 +static u_int8_t de_nw2unix[] = {
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x00 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0xb6, 0xa7, 0x5f, 0x5f, /* 0x10 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
 +	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
 +	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
 +	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
 +	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
 +	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
 +	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
 +	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
 +	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
 +	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
 +	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
 +	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
 +	0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7, /* 0x80 */
 +	0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5,
 +	0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9, /* 0x90 */
 +	0xff, 0xd6, 0xdc, 0xa2, 0xa3, 0xa5, 0x5f, 0x5f,
 +	0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba, /* 0xA0 */
 +	0xbf, 0x5f, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xB0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xC0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xD0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0xdf, 0x5f, 0x5f, 0x5f, 0x5f, 0xb5, 0x5f, /* 0xE0 */
 +	0x5f, 0x5f, 0x5f, 0xf0, 0x5f, 0xf8, 0x5f, 0x5f,
 +	0x5f, 0xb1, 0x5f, 0x5f, 0x5f, 0x5f, 0xf7, 0x5f, /* 0xF0 */
 +	0xb0, 0x5f, 0xb7, 0x5f, 0x5f, 0xb2, 0x5f, 0xa0
 +};
 +
 +static u_int8_t de_unix2nw[] = {
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x00 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x10 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
 +	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
 +	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
 +	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
 +	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
 +	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
 +	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
 +	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
 +	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
 +	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
 +	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
 +	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x80 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x90 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0xff, 0xad, 0x9b, 0x9c, 0x5f, 0x9d, 0x5f, 0x15, /* 0xA0 */
 +	0x5f, 0x5f, 0xa6, 0xae, 0xaa, 0x5f, 0x5f, 0x5f,
 +	0xf8, 0xf1, 0xfd, 0x5f, 0x5f, 0xe6, 0x14, 0xfa, /* 0xB0 */
 +	0x5f, 0x5f, 0xa7, 0xaf, 0xac, 0xab, 0x5f, 0xa8,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x8e, 0x8f, 0x92, 0x80, /* 0xC0 */
 +	0x5f, 0x90, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0xa5, 0x5f, 0x5f, 0x5f, 0x5f, 0x99, 0x5f, /* 0xD0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x9a, 0x5f, 0x5f, 0xe1,
 +	0x85, 0xa0, 0x83, 0x5f, 0x84, 0x86, 0x91, 0x87, /* 0xE0 */
 +	0x8a, 0x82, 0x88, 0x89, 0x8d, 0xa1, 0x8c, 0x8b,
 +	0xeb, 0xa4, 0x95, 0xa2, 0x93, 0x5f, 0x94, 0xf6, /* 0xF0 */
 +	0xed, 0x97, 0xa3, 0x96, 0x81, 0x5f, 0x5f, 0x98
 +};
 +
  
  static u_int8_t def2lower[256];
  static u_int8_t def2upper[256];
 @@ -225,6 +298,9 @@ static struct ncp_nlsdesc ncp_nlslist[] 
  	{NCP_NLS_SE, NCP_NLS_SE_NAME, 
  	    {def2lower, def2upper, se_nw2unix, se_unix2nw, 0}
  	},
 +	{NCP_NLS_DE, NCP_NLS_DE_NAME,
 +	    {def2lower, def2upper, de_nw2unix, de_unix2nw, 0}
 +	},
  	{0}
  };
  
 
 Modified: head/sys/netncp/ncp_nls.h
 ==============================================================================
 --- head/sys/netncp/ncp_nls.h	Fri Jun  1 03:56:12 2012	(r236375)
 +++ head/sys/netncp/ncp_nls.h	Fri Jun  1 03:59:08 2012	(r236376)
 @@ -52,9 +52,11 @@ struct ncp_nlstables {
  #define	NCP_NLS_AS_IS		1
  #define	NCP_NLS_AS_IS_NAME	"asis"
  #define	NCP_NLS_KOI_866		2
 -#define	NCP_NLS_SE		3
  #define	NCP_NLS_KOI_866_NAME	"koi2cp866"
 +#define	NCP_NLS_SE		3
  #define	NCP_NLS_SE_NAME		"se"
 +#define	NCP_NLS_DE		4
 +#define	NCP_NLS_DE_NAME		"de"
  
  extern struct ncp_nlstables ncp_nls;	/* active nls */
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: analyzed->patched 
State-Changed-By: eadler 
State-Changed-When: Fri Jun 1 04:11:19 UTC 2012 
State-Changed-Why:  
committed in r236376 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163847 
State-Changed-From-To: patched->closed 
State-Changed-By: eadler 
State-Changed-When: Fri Jun 22 05:37:27 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163847 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/163847: commit references a PR
Date: Fri, 22 Jun 2012 05:36:48 +0000 (UTC)

 Author: eadler
 Date: Fri Jun 22 05:36:37 2012
 New Revision: 237418
 URL: http://svn.freebsd.org/changeset/base/237418
 
 Log:
   MFC r236376:
   	Add characters mapping for codepages used in Germany.
   
   PR:		bin/163847
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/7/lib/libncp/ncpl_nls.c
   stable/7/sys/netncp/ncp_nls.h
 Directory Properties:
   stable/7/lib/libncp/   (props changed)
   stable/7/sys/   (props changed)
 
 Modified: stable/7/lib/libncp/ncpl_nls.c
 ==============================================================================
 --- stable/7/lib/libncp/ncpl_nls.c	Fri Jun 22 05:23:49 2012	(r237417)
 +++ stable/7/lib/libncp/ncpl_nls.c	Fri Jun 22 05:36:37 2012	(r237418)
 @@ -200,6 +200,79 @@ static u_int8_t se_unix2nw[] = {
  	0x9c, 0x9b, 0x87, 0x98, 0x9d, 0x99, 0x97, 0x9a
  };
  
 +/*
 + * Characters mapping for codepages used in Germany.
 + */
 +static u_int8_t de_nw2unix[] = {
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x00 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0xb6, 0xa7, 0x5f, 0x5f, /* 0x10 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
 +	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
 +	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
 +	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
 +	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
 +	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
 +	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
 +	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
 +	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
 +	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
 +	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
 +	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
 +	0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7, /* 0x80 */
 +	0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5,
 +	0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9, /* 0x90 */
 +	0xff, 0xd6, 0xdc, 0xa2, 0xa3, 0xa5, 0x5f, 0x5f,
 +	0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba, /* 0xA0 */
 +	0xbf, 0x5f, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xB0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xC0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xD0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0xdf, 0x5f, 0x5f, 0x5f, 0x5f, 0xb5, 0x5f, /* 0xE0 */
 +	0x5f, 0x5f, 0x5f, 0xf0, 0x5f, 0xf8, 0x5f, 0x5f,
 +	0x5f, 0xb1, 0x5f, 0x5f, 0x5f, 0x5f, 0xf7, 0x5f, /* 0xF0 */
 +	0xb0, 0x5f, 0xb7, 0x5f, 0x5f, 0xb2, 0x5f, 0xa0
 +};
 +
 +static u_int8_t de_unix2nw[] = {
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x00 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x10 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
 +	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
 +	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
 +	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
 +	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
 +	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
 +	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
 +	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
 +	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
 +	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
 +	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
 +	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x80 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x90 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0xff, 0xad, 0x9b, 0x9c, 0x5f, 0x9d, 0x5f, 0x15, /* 0xA0 */
 +	0x5f, 0x5f, 0xa6, 0xae, 0xaa, 0x5f, 0x5f, 0x5f,
 +	0xf8, 0xf1, 0xfd, 0x5f, 0x5f, 0xe6, 0x14, 0xfa, /* 0xB0 */
 +	0x5f, 0x5f, 0xa7, 0xaf, 0xac, 0xab, 0x5f, 0xa8,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x8e, 0x8f, 0x92, 0x80, /* 0xC0 */
 +	0x5f, 0x90, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0xa5, 0x5f, 0x5f, 0x5f, 0x5f, 0x99, 0x5f, /* 0xD0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x9a, 0x5f, 0x5f, 0xe1,
 +	0x85, 0xa0, 0x83, 0x5f, 0x84, 0x86, 0x91, 0x87, /* 0xE0 */
 +	0x8a, 0x82, 0x88, 0x89, 0x8d, 0xa1, 0x8c, 0x8b,
 +	0xeb, 0xa4, 0x95, 0xa2, 0x93, 0x5f, 0x94, 0xf6, /* 0xF0 */
 +	0xed, 0x97, 0xa3, 0x96, 0x81, 0x5f, 0x5f, 0x98
 +};
 +
  
  static u_int8_t def2lower[256];
  static u_int8_t def2upper[256];
 @@ -225,6 +298,9 @@ static struct ncp_nlsdesc ncp_nlslist[] 
  	{NCP_NLS_SE, NCP_NLS_SE_NAME, 
  	    {def2lower, def2upper, se_nw2unix, se_unix2nw, 0}
  	},
 +	{NCP_NLS_DE, NCP_NLS_DE_NAME,
 +	    {def2lower, def2upper, de_nw2unix, de_unix2nw, 0}
 +	},
  	{0}
  };
  
 
 Modified: stable/7/sys/netncp/ncp_nls.h
 ==============================================================================
 --- stable/7/sys/netncp/ncp_nls.h	Fri Jun 22 05:23:49 2012	(r237417)
 +++ stable/7/sys/netncp/ncp_nls.h	Fri Jun 22 05:36:37 2012	(r237418)
 @@ -58,9 +58,11 @@ struct ncp_nlstables {
  #define	NCP_NLS_AS_IS		1
  #define	NCP_NLS_AS_IS_NAME	"asis"
  #define	NCP_NLS_KOI_866		2
 -#define	NCP_NLS_SE		3
  #define	NCP_NLS_KOI_866_NAME	"koi2cp866"
 +#define	NCP_NLS_SE		3
  #define	NCP_NLS_SE_NAME		"se"
 +#define	NCP_NLS_DE		4
 +#define	NCP_NLS_DE_NAME		"de"
  
  extern struct ncp_nlstables ncp_nls;	/* active nls */
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/163847: commit references a PR
Date: Fri, 22 Jun 2012 05:37:01 +0000 (UTC)

 Author: eadler
 Date: Fri Jun 22 05:36:42 2012
 New Revision: 237419
 URL: http://svn.freebsd.org/changeset/base/237419
 
 Log:
   MFC r236376:
   	Add characters mapping for codepages used in Germany.
   
   PR:		bin/163847
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/8/lib/libncp/ncpl_nls.c
   stable/8/sys/netncp/ncp_nls.h
 Directory Properties:
   stable/8/lib/libncp/   (props changed)
   stable/8/sys/   (props changed)
 
 Modified: stable/8/lib/libncp/ncpl_nls.c
 ==============================================================================
 --- stable/8/lib/libncp/ncpl_nls.c	Fri Jun 22 05:36:37 2012	(r237418)
 +++ stable/8/lib/libncp/ncpl_nls.c	Fri Jun 22 05:36:42 2012	(r237419)
 @@ -200,6 +200,79 @@ static u_int8_t se_unix2nw[] = {
  	0x9c, 0x9b, 0x87, 0x98, 0x9d, 0x99, 0x97, 0x9a
  };
  
 +/*
 + * Characters mapping for codepages used in Germany.
 + */
 +static u_int8_t de_nw2unix[] = {
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x00 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0xb6, 0xa7, 0x5f, 0x5f, /* 0x10 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
 +	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
 +	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
 +	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
 +	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
 +	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
 +	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
 +	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
 +	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
 +	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
 +	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
 +	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
 +	0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7, /* 0x80 */
 +	0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5,
 +	0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9, /* 0x90 */
 +	0xff, 0xd6, 0xdc, 0xa2, 0xa3, 0xa5, 0x5f, 0x5f,
 +	0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba, /* 0xA0 */
 +	0xbf, 0x5f, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xB0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xC0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xD0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0xdf, 0x5f, 0x5f, 0x5f, 0x5f, 0xb5, 0x5f, /* 0xE0 */
 +	0x5f, 0x5f, 0x5f, 0xf0, 0x5f, 0xf8, 0x5f, 0x5f,
 +	0x5f, 0xb1, 0x5f, 0x5f, 0x5f, 0x5f, 0xf7, 0x5f, /* 0xF0 */
 +	0xb0, 0x5f, 0xb7, 0x5f, 0x5f, 0xb2, 0x5f, 0xa0
 +};
 +
 +static u_int8_t de_unix2nw[] = {
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x00 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x10 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
 +	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
 +	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
 +	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
 +	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
 +	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
 +	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
 +	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
 +	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
 +	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
 +	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
 +	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x80 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x90 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0xff, 0xad, 0x9b, 0x9c, 0x5f, 0x9d, 0x5f, 0x15, /* 0xA0 */
 +	0x5f, 0x5f, 0xa6, 0xae, 0xaa, 0x5f, 0x5f, 0x5f,
 +	0xf8, 0xf1, 0xfd, 0x5f, 0x5f, 0xe6, 0x14, 0xfa, /* 0xB0 */
 +	0x5f, 0x5f, 0xa7, 0xaf, 0xac, 0xab, 0x5f, 0xa8,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x8e, 0x8f, 0x92, 0x80, /* 0xC0 */
 +	0x5f, 0x90, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0xa5, 0x5f, 0x5f, 0x5f, 0x5f, 0x99, 0x5f, /* 0xD0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x9a, 0x5f, 0x5f, 0xe1,
 +	0x85, 0xa0, 0x83, 0x5f, 0x84, 0x86, 0x91, 0x87, /* 0xE0 */
 +	0x8a, 0x82, 0x88, 0x89, 0x8d, 0xa1, 0x8c, 0x8b,
 +	0xeb, 0xa4, 0x95, 0xa2, 0x93, 0x5f, 0x94, 0xf6, /* 0xF0 */
 +	0xed, 0x97, 0xa3, 0x96, 0x81, 0x5f, 0x5f, 0x98
 +};
 +
  
  static u_int8_t def2lower[256];
  static u_int8_t def2upper[256];
 @@ -225,6 +298,9 @@ static struct ncp_nlsdesc ncp_nlslist[] 
  	{NCP_NLS_SE, NCP_NLS_SE_NAME, 
  	    {def2lower, def2upper, se_nw2unix, se_unix2nw, 0}
  	},
 +	{NCP_NLS_DE, NCP_NLS_DE_NAME,
 +	    {def2lower, def2upper, de_nw2unix, de_unix2nw, 0}
 +	},
  	{0}
  };
  
 
 Modified: stable/8/sys/netncp/ncp_nls.h
 ==============================================================================
 --- stable/8/sys/netncp/ncp_nls.h	Fri Jun 22 05:36:37 2012	(r237418)
 +++ stable/8/sys/netncp/ncp_nls.h	Fri Jun 22 05:36:42 2012	(r237419)
 @@ -58,9 +58,11 @@ struct ncp_nlstables {
  #define	NCP_NLS_AS_IS		1
  #define	NCP_NLS_AS_IS_NAME	"asis"
  #define	NCP_NLS_KOI_866		2
 -#define	NCP_NLS_SE		3
  #define	NCP_NLS_KOI_866_NAME	"koi2cp866"
 +#define	NCP_NLS_SE		3
  #define	NCP_NLS_SE_NAME		"se"
 +#define	NCP_NLS_DE		4
 +#define	NCP_NLS_DE_NAME		"de"
  
  extern struct ncp_nlstables ncp_nls;	/* active nls */
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/163847: commit references a PR
Date: Fri, 22 Jun 2012 05:37:23 +0000 (UTC)

 Author: eadler
 Date: Fri Jun 22 05:36:50 2012
 New Revision: 237420
 URL: http://svn.freebsd.org/changeset/base/237420
 
 Log:
   MFC r236376:
   	Add characters mapping for codepages used in Germany.
   
   PR:		bin/163847
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/9/lib/libncp/ncpl_nls.c
   stable/9/sys/netncp/ncp_nls.h
 Directory Properties:
   stable/9/lib/libncp/   (props changed)
   stable/9/sys/   (props changed)
 
 Modified: stable/9/lib/libncp/ncpl_nls.c
 ==============================================================================
 --- stable/9/lib/libncp/ncpl_nls.c	Fri Jun 22 05:36:42 2012	(r237419)
 +++ stable/9/lib/libncp/ncpl_nls.c	Fri Jun 22 05:36:50 2012	(r237420)
 @@ -200,6 +200,79 @@ static u_int8_t se_unix2nw[] = {
  	0x9c, 0x9b, 0x87, 0x98, 0x9d, 0x99, 0x97, 0x9a
  };
  
 +/*
 + * Characters mapping for codepages used in Germany.
 + */
 +static u_int8_t de_nw2unix[] = {
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x00 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0xb6, 0xa7, 0x5f, 0x5f, /* 0x10 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
 +	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
 +	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
 +	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
 +	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
 +	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
 +	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
 +	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
 +	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
 +	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
 +	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
 +	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
 +	0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7, /* 0x80 */
 +	0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5,
 +	0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9, /* 0x90 */
 +	0xff, 0xd6, 0xdc, 0xa2, 0xa3, 0xa5, 0x5f, 0x5f,
 +	0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba, /* 0xA0 */
 +	0xbf, 0x5f, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xB0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xC0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xD0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0xdf, 0x5f, 0x5f, 0x5f, 0x5f, 0xb5, 0x5f, /* 0xE0 */
 +	0x5f, 0x5f, 0x5f, 0xf0, 0x5f, 0xf8, 0x5f, 0x5f,
 +	0x5f, 0xb1, 0x5f, 0x5f, 0x5f, 0x5f, 0xf7, 0x5f, /* 0xF0 */
 +	0xb0, 0x5f, 0xb7, 0x5f, 0x5f, 0xb2, 0x5f, 0xa0
 +};
 +
 +static u_int8_t de_unix2nw[] = {
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x00 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,	/* 0x10 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
 +	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
 +	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
 +	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
 +	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
 +	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
 +	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
 +	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
 +	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
 +	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
 +	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
 +	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x80 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x90 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0xff, 0xad, 0x9b, 0x9c, 0x5f, 0x9d, 0x5f, 0x15, /* 0xA0 */
 +	0x5f, 0x5f, 0xa6, 0xae, 0xaa, 0x5f, 0x5f, 0x5f,
 +	0xf8, 0xf1, 0xfd, 0x5f, 0x5f, 0xe6, 0x14, 0xfa, /* 0xB0 */
 +	0x5f, 0x5f, 0xa7, 0xaf, 0xac, 0xab, 0x5f, 0xa8,
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x8e, 0x8f, 0x92, 0x80, /* 0xC0 */
 +	0x5f, 0x90, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
 +	0x5f, 0xa5, 0x5f, 0x5f, 0x5f, 0x5f, 0x99, 0x5f, /* 0xD0 */
 +	0x5f, 0x5f, 0x5f, 0x5f, 0x9a, 0x5f, 0x5f, 0xe1,
 +	0x85, 0xa0, 0x83, 0x5f, 0x84, 0x86, 0x91, 0x87, /* 0xE0 */
 +	0x8a, 0x82, 0x88, 0x89, 0x8d, 0xa1, 0x8c, 0x8b,
 +	0xeb, 0xa4, 0x95, 0xa2, 0x93, 0x5f, 0x94, 0xf6, /* 0xF0 */
 +	0xed, 0x97, 0xa3, 0x96, 0x81, 0x5f, 0x5f, 0x98
 +};
 +
  
  static u_int8_t def2lower[256];
  static u_int8_t def2upper[256];
 @@ -225,6 +298,9 @@ static struct ncp_nlsdesc ncp_nlslist[] 
  	{NCP_NLS_SE, NCP_NLS_SE_NAME, 
  	    {def2lower, def2upper, se_nw2unix, se_unix2nw, 0}
  	},
 +	{NCP_NLS_DE, NCP_NLS_DE_NAME,
 +	    {def2lower, def2upper, de_nw2unix, de_unix2nw, 0}
 +	},
  	{0}
  };
  
 
 Modified: stable/9/sys/netncp/ncp_nls.h
 ==============================================================================
 --- stable/9/sys/netncp/ncp_nls.h	Fri Jun 22 05:36:42 2012	(r237419)
 +++ stable/9/sys/netncp/ncp_nls.h	Fri Jun 22 05:36:50 2012	(r237420)
 @@ -52,9 +52,11 @@ struct ncp_nlstables {
  #define	NCP_NLS_AS_IS		1
  #define	NCP_NLS_AS_IS_NAME	"asis"
  #define	NCP_NLS_KOI_866		2
 -#define	NCP_NLS_SE		3
  #define	NCP_NLS_KOI_866_NAME	"koi2cp866"
 +#define	NCP_NLS_SE		3
  #define	NCP_NLS_SE_NAME		"se"
 +#define	NCP_NLS_DE		4
 +#define	NCP_NLS_DE_NAME		"de"
  
  extern struct ncp_nlstables ncp_nls;	/* active nls */
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/163847: commit references a PR
Date: Fri, 22 Jun 2012 05:40:36 +0000 (UTC)

 Author: eadler
 Date: Fri Jun 22 05:40:14 2012
 New Revision: 237421
 URL: http://svn.freebsd.org/changeset/base/237421
 
 Log:
   MFC r237257:
   	Remove variables which are initialized but never used thereafter reported by gcc46 warning
   
   PR:		bin/163847
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/9/usr.sbin/kbdmap/kbdmap.c
 Directory Properties:
   stable/9/usr.sbin/kbdmap/   (props changed)
 
 Modified: stable/9/usr.sbin/kbdmap/kbdmap.c
 ==============================================================================
 --- stable/9/usr.sbin/kbdmap/kbdmap.c	Fri Jun 22 05:36:50 2012	(r237420)
 +++ stable/9/usr.sbin/kbdmap/kbdmap.c	Fri Jun 22 05:40:14 2012	(r237421)
 @@ -327,7 +327,6 @@ show_dialog(struct keymap **km_sorted, i
  	FILE *fp;
  	char *cmd, *dialog;
  	char tmp_name[] = "/tmp/_kbd_lang.XXXX";
 -	const char *ext;
  	int fd, i, size;
  
  	fd = mkstemp(tmp_name);
 @@ -339,8 +338,6 @@ show_dialog(struct keymap **km_sorted, i
  	asprintf(&dialog, "/usr/bin/dialog --clear --title \"Keyboard Menu\" "
  			  "--menu \"%s\" 0 0 0", menu);
  
 -	ext = extract_name(dir);
 -
  	/* start right font, assume that current font is equal
  	 * to default font in /etc/rc.conf
  	 *	
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

>Unformatted:
