diff options
| author |   bluhm <bluhm@openbsd.org> | 2015-11-05 23:38:07 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2015-11-05 23:38:07 +0000 |
| commit | 9eb35f143cc942372a2224d8bc18d6f3c8516cad (patch) | |
| tree | 367deee677df18c85e99bf7c56960e3f9548c5ad | |
| parent | Same bug as last commit, but in the other copy of the loop in this file... (diff) | |
| download | wireguard-openbsd-9eb35f143cc942372a2224d8bc18d6f3c8516cad.tar.xz wireguard-openbsd-9eb35f143cc942372a2224d8bc18d6f3c8516cad.zip | |
After removing National Language Support (NLS) from base, stop
creating the directory /usr/share/nls. Having a non-existing default
path in catopen(3) does not make sense, so remove it. If the user
does not specify a NLS path, better fail early than fail because
of an empty directory. Remove path form hier(7).
OK stsp@ schwarze@ jmc@
| -rw-r--r-- | etc/mtree/4.4BSD.dist | 4 | ||||
| -rw-r--r-- | lib/libc/nls/catopen.c | 5 | ||||
| -rw-r--r-- | share/man/man7/hier.7 | 6 |
3 files changed, 5 insertions, 10 deletions
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist index e40531d99ac..ec4c6b3bb5d 100644 --- a/etc/mtree/4.4BSD.dist +++ b/etc/mtree/4.4BSD.dist @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.dist,v 1.274 2015/10/10 09:45:15 ajacoutot Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.275 2015/11/05 23:38:07 bluhm Exp $ /set type=dir uname=root gname=wheel mode=0755 @@ -613,8 +613,6 @@ usr .. mk .. - nls - .. # ./usr/share/snmp snmp diff --git a/lib/libc/nls/catopen.c b/lib/libc/nls/catopen.c index 3c47d098477..1ca1a95170c 100644 --- a/lib/libc/nls/catopen.c +++ b/lib/libc/nls/catopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: catopen.c,v 1.18 2015/10/23 18:49:07 tobias Exp $ */ +/* $OpenBSD: catopen.c,v 1.19 2015/11/05 23:38:07 bluhm Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. * All rights reserved. @@ -43,7 +43,6 @@ #define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b)) -#define NLS_DEFAULT_PATH "/usr/share/nls/%L/%N.cat:/usr/share/nls/%l.%c/%N.cat:/usr/share/nls/%l/%N.cat" #define NLS_DEFAULT_LANG "C" static nl_catd load_msgcat(const char *); @@ -67,7 +66,7 @@ catopen(const char *name, int oflag) return load_msgcat(name); if (issetugid() != 0 || (nlspath = getenv("NLSPATH")) == NULL) - nlspath = NLS_DEFAULT_PATH; + return (nl_catd) -1; lang = NULL; if (oflag & NL_CAT_LOCALE) { diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index fbda027d427..f2631df23fe 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: hier.7,v 1.144 2015/08/24 11:16:41 jmc Exp $ +.\" $OpenBSD: hier.7,v 1.145 2015/11/05 23:38:07 bluhm Exp $ .\" $NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" -.Dd $Mdocdate: August 24 2015 $ +.Dd $Mdocdate: November 5 2015 $ .Dt HIER 7 .Os .Sh NAME @@ -421,8 +421,6 @@ Additional i386 console fonts. .It mk/ Templates for .Xr make 1 . -.It nls/ -National Language Support (NLS) catalogs. .It snmp/ Data files for .Xr snmpd 8 . |