diff options
| author | Joerg Wunsch <joerg@FreeBSD.org> | 1997-02-05 23:20:54 +0000 |
|---|---|---|
| committer | Joerg Wunsch <joerg@FreeBSD.org> | 1997-02-05 23:20:54 +0000 |
| commit | 8cb12e41589d978b8db9d7465adb6935fe0ce275 (patch) | |
| tree | 000831f00d34d4e321879089b98ec61932d75ba6 /lib/libc | |
| parent | 54c0930bf7cb599136b527ea4f3af754517263d4 (diff) | |
Notes
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/locale/collate.c | 4 | ||||
| -rw-r--r-- | lib/libc/locale/setlocale.c | 5 | ||||
| -rw-r--r-- | lib/libc/locale/setrunelocale.c | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c index d23bc77256c2..9189d7124dfe 100644 --- a/lib/libc/locale/collate.c +++ b/lib/libc/locale/collate.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: collate.c,v 1.8.2.2 1996/12/16 17:39:02 joerg Exp $ + * $Id: collate.c,v 1.8.2.3 1996/12/29 11:01:26 joerg Exp $ */ #include <rune.h> @@ -73,7 +73,7 @@ __collate_load_tables(encoding) __collate_load_error = save_load_error; return -1; } - /* Range checking already done at upper level caller */ + /* Range checking not needed, encoding has fixed size */ (void) strcpy(buf, _PathLocale); (void) strcat(buf, "/"); (void) strcat(buf, encoding); diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c index 49324a1adbb3..3cfcd13c4ae7 100644 --- a/lib/libc/locale/setlocale.c +++ b/lib/libc/locale/setlocale.c @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: setlocale.c,v 1.8.2.1 1996/11/28 21:47:18 phk Exp $ + * $Id: setlocale.c,v 1.8.2.2 1997/02/05 09:56:14 davidg Exp $ */ #ifdef LIBC_RCS static const char rcsid[] = - "$Id: setlocale.c,v 1.8.2.1 1996/11/28 21:47:18 phk Exp $"; + "$Id: setlocale.c,v 1.8.2.2 1997/02/05 09:56:14 davidg Exp $"; #endif #if defined(LIBC_SCCS) && !defined(lint) @@ -302,6 +302,7 @@ const char *encoding; return(0); if (!_PathLocale) return(1); + /* Range checking not needed, encoding has fixed size */ strcpy(name, _PathLocale); strcat(name, "/"); strcat(name, encoding); diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c index 65daa836ffe6..42972065edca 100644 --- a/lib/libc/locale/setrunelocale.c +++ b/lib/libc/locale/setrunelocale.c @@ -84,8 +84,8 @@ _xpg4_setrunelocale(encoding) } if (!_PathLocale) - return(EFAULT); - /* Range checking already done at upper level caller */ + _PathLocale = _PATH_LOCALE; + /* Range checking not needed, encoding has fixed size */ (void) strcpy(name, _PathLocale); (void) strcat(name, "/"); (void) strcat(name, encoding); |