From 3b6651b983ed2691da3bbc5b5c4cdc8cf4c65900 Mon Sep 17 00:00:00 2001 From: ache Date: Sat, 3 Aug 2002 15:56:25 +0000 Subject: Preserve errno in fallback code --- lib/libc/locale/setlocale.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c index 6b151ff..331ce60 100644 --- a/lib/libc/locale/setlocale.c +++ b/lib/libc/locale/setlocale.c @@ -239,6 +239,7 @@ loadlocale(category) char *ret; char *new = new_categories[category]; char *old = current_categories[category]; + int saverr; if ((new[0] == '.' && (new[1] == '\0' || (new[1] == '.' && new[2] == '\0'))) || @@ -273,8 +274,10 @@ loadlocale(category) return (old); \ ret = FUNC(new) != 0 ? NULL : new; \ if (ret == NULL) { \ + saverr = errno; \ if (FUNC(old) != 0 && FUNC("C") == 0) \ (void)strcpy(old, "C"); \ + errno = saverr; \ } else \ (void)strcpy(old, new); \ return (ret); \ -- cgit v1.1