ldpart.c (101307) | ldpart.c (101470) |
---|---|
1/* 2 * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/* 2 * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
28__FBSDID("$FreeBSD: head/lib/libc/locale/ldpart.c 101307 2002-08-04 09:37:28Z ache $"); | 28__FBSDID("$FreeBSD: head/lib/libc/locale/ldpart.c 101470 2002-08-07 16:45:23Z ache $"); |
29 30#include "namespace.h" 31#include <sys/types.h> 32#include <sys/stat.h> 33#include <sys/syslimits.h> 34#include <errno.h> 35#include <fcntl.h> 36#include <stdlib.h> --- 11 unchanged lines hidden (view full) --- 48__part_load_locale(const char *name, 49 int *using_locale, 50 char *locale_buf, 51 const char *category_filename, 52 int locale_buf_size_max, 53 int locale_buf_size_min, 54 const char **dst_localebuf) 55{ | 29 30#include "namespace.h" 31#include <sys/types.h> 32#include <sys/stat.h> 33#include <sys/syslimits.h> 34#include <errno.h> 35#include <fcntl.h> 36#include <stdlib.h> --- 11 unchanged lines hidden (view full) --- 48__part_load_locale(const char *name, 49 int *using_locale, 50 char *locale_buf, 51 const char *category_filename, 52 int locale_buf_size_max, 53 int locale_buf_size_min, 54 const char **dst_localebuf) 55{ |
56 static char locale_buf_C[] = "C"; 57 static int num_lines; 58 int saverr; 59 int fd; 60 char *lbuf; 61 char *p; 62 const char *plim; 63 char filename[PATH_MAX]; 64 struct stat st; 65 size_t namesize; 66 size_t bufsize; 67 int save_using_locale; | 56 static char locale_buf_C[] = "C"; 57 static int num_lines; 58 int saverr; 59 int fd; 60 char *lbuf; 61 char *p; 62 const char *plim; 63 char filename[PATH_MAX]; 64 struct stat st; 65 size_t namesize; 66 size_t bufsize; 67 int save_using_locale; |
68 69 save_using_locale = *using_locale; 70 *using_locale = 0; 71 72 /* 'name' must be already checked. */ 73 74 if (!strcmp(name, "C") || !strcmp(name, "POSIX")) 75 return 0; --- 31 unchanged lines hidden (view full) --- 107 goto bad_locale; 108 } 109 bufsize = namesize + st.st_size; 110 locale_buf = NULL; 111 lbuf = (lbuf == NULL || lbuf == locale_buf_C) ? 112 malloc(bufsize) : reallocf(lbuf, bufsize); 113 if (lbuf == NULL) 114 goto bad_locale; | 68 69 save_using_locale = *using_locale; 70 *using_locale = 0; 71 72 /* 'name' must be already checked. */ 73 74 if (!strcmp(name, "C") || !strcmp(name, "POSIX")) 75 return 0; --- 31 unchanged lines hidden (view full) --- 107 goto bad_locale; 108 } 109 bufsize = namesize + st.st_size; 110 locale_buf = NULL; 111 lbuf = (lbuf == NULL || lbuf == locale_buf_C) ? 112 malloc(bufsize) : reallocf(lbuf, bufsize); 113 if (lbuf == NULL) 114 goto bad_locale; |
115 (void) strcpy(lbuf, name); | 115 (void)strcpy(lbuf, name); |
116 p = lbuf + namesize; 117 plim = p + st.st_size; 118 if (_read(fd, p, (size_t) st.st_size) != st.st_size) 119 goto bad_lbuf; 120 if (_close(fd) != 0) 121 goto bad_lbuf; 122 /* 123 * Parse the locale file into localebuf. --- 13 unchanged lines hidden (view full) --- 137 } 138 set_from_buf(lbuf, num_lines, dst_localebuf); 139 /* 140 * Record the successful parse in the cache. 141 */ 142 locale_buf = lbuf; 143 144 *using_locale = 1; | 116 p = lbuf + namesize; 117 plim = p + st.st_size; 118 if (_read(fd, p, (size_t) st.st_size) != st.st_size) 119 goto bad_lbuf; 120 if (_close(fd) != 0) 121 goto bad_lbuf; 122 /* 123 * Parse the locale file into localebuf. --- 13 unchanged lines hidden (view full) --- 137 } 138 set_from_buf(lbuf, num_lines, dst_localebuf); 139 /* 140 * Record the successful parse in the cache. 141 */ 142 locale_buf = lbuf; 143 144 *using_locale = 1; |
145 |
|
145 return 0; 146 147reset_locale: 148 locale_buf = locale_buf_C; 149 save_using_locale = 0; 150bad_lbuf: | 146 return 0; 147 148reset_locale: 149 locale_buf = locale_buf_C; 150 save_using_locale = 0; 151bad_lbuf: |
151 saverr = errno; free(lbuf); errno = saverr; | 152 saverr = errno; 153 free(lbuf); 154 errno = saverr; |
152bad_locale: | 155bad_locale: |
153 saverr = errno; (void)_close(fd); errno = saverr; | 156 saverr = errno; 157 (void)_close(fd); 158 errno = saverr; |
154no_locale: 155 *using_locale = save_using_locale; | 159no_locale: 160 *using_locale = save_using_locale; |
161 |
|
156 return -1; 157} 158 159static int | 162 return -1; 163} 164 165static int |
160split_lines(char *p, const char *plim) { 161 | 166split_lines(char *p, const char *plim) 167{ |
162 int i; 163 164 for (i = 0; p < plim; i++) { 165 p = strchr(p, '\n'); 166 *p++ = '\0'; 167 } | 168 int i; 169 170 for (i = 0; p < plim; i++) { 171 p = strchr(p, '\n'); 172 *p++ = '\0'; 173 } |
168 return i; | 174 return (i); |
169} 170 171static void 172set_from_buf(const char *p, int num_lines, const char **dst_localebuf) { 173 174 const char **ap; 175 int i; 176 177 for (ap = dst_localebuf, i = 0; i < num_lines; ++ap, ++i) 178 *ap = p += strlen(p) + 1; 179} 180 | 175} 176 177static void 178set_from_buf(const char *p, int num_lines, const char **dst_localebuf) { 179 180 const char **ap; 181 int i; 182 183 for (ap = dst_localebuf, i = 0; i < num_lines; ++ap, ++i) 184 *ap = p += strlen(p) + 1; 185} 186 |