Deleted Added
full compact
ldpart.c (87658) ldpart.c (88309)
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

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 *
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

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 * $FreeBSD: head/lib/libc/locale/ldpart.c 87658 2001-12-11 15:55:42Z phantom $
26 * $FreeBSD: head/lib/libc/locale/ldpart.c 88309 2001-12-20 18:28:52Z phantom $
27 */
28
29#include "namespace.h"
30#include <sys/types.h>
31#include <sys/stat.h>
32#include <sys/syslimits.h>
33#include <fcntl.h>
34#include <stdlib.h>

--- 4 unchanged lines hidden (view full) ---

39#include "setlocale.h"
40#include "ldpart.h"
41
42static int split_lines(char *, const char *);
43static void set_from_buf(const char *, int, const char **);
44
45int
46__part_load_locale(const char *name,
27 */
28
29#include "namespace.h"
30#include <sys/types.h>
31#include <sys/stat.h>
32#include <sys/syslimits.h>
33#include <fcntl.h>
34#include <stdlib.h>

--- 4 unchanged lines hidden (view full) ---

39#include "setlocale.h"
40#include "ldpart.h"
41
42static int split_lines(char *, const char *);
43static void set_from_buf(const char *, int, const char **);
44
45int
46__part_load_locale(const char *name,
47 int* using_locale,
47 int *using_locale,
48 char *locale_buf,
48 char *locale_buf,
49 const char *category_name,
49 const char *category_filename,
50 int locale_buf_size_max,
51 int locale_buf_size_min,
52 const char **dst_localebuf) {
53
54 static char locale_buf_C[] = "C";
55 static int num_lines;
56
50 int locale_buf_size_max,
51 int locale_buf_size_min,
52 const char **dst_localebuf) {
53
54 static char locale_buf_C[] = "C";
55 static int num_lines;
56
57 int fd;
58 char * lbuf;
59 char * p;
60 const char * plim;
61 char filename[PATH_MAX];
62 struct stat st;
63 size_t namesize;
64 size_t bufsize;
65 int save_using_locale;
57 int fd;
58 char *lbuf;
59 char *p;
60 const char *plim;
61 char filename[PATH_MAX];
62 struct stat st;
63 size_t namesize;
64 size_t bufsize;
65 int save_using_locale;
66
67 save_using_locale = *using_locale;
68 *using_locale = 0;
69
70 if (name == NULL)
71 goto no_locale;
72
73 if (!strcmp(name, "C") || !strcmp(name, "POSIX"))
74 return 0;
75
76 /*
77 * If the locale name is the same as our cache, use the cache.
78 */
79 lbuf = locale_buf;
80 if (lbuf != NULL && strcmp(name, lbuf) == 0) {
81 set_from_buf(lbuf, num_lines, dst_localebuf);
82 *using_locale = 1;
83 return 0;
84 }
66
67 save_using_locale = *using_locale;
68 *using_locale = 0;
69
70 if (name == NULL)
71 goto no_locale;
72
73 if (!strcmp(name, "C") || !strcmp(name, "POSIX"))
74 return 0;
75
76 /*
77 * If the locale name is the same as our cache, use the cache.
78 */
79 lbuf = locale_buf;
80 if (lbuf != NULL && strcmp(name, lbuf) == 0) {
81 set_from_buf(lbuf, num_lines, dst_localebuf);
82 *using_locale = 1;
83 return 0;
84 }
85
85 /*
86 * Slurp the locale file into the cache.
87 */
88 namesize = strlen(name) + 1;
89
90 if (!_PathLocale)
91 goto no_locale;
92 /* Range checking not needed, 'name' size is limited */
93 strcpy(filename, _PathLocale);
94 strcat(filename, "/");
95 strcat(filename, name);
96 strcat(filename, "/");
86 /*
87 * Slurp the locale file into the cache.
88 */
89 namesize = strlen(name) + 1;
90
91 if (!_PathLocale)
92 goto no_locale;
93 /* Range checking not needed, 'name' size is limited */
94 strcpy(filename, _PathLocale);
95 strcat(filename, "/");
96 strcat(filename, name);
97 strcat(filename, "/");
97 strcat(filename, category_name);
98 strcat(filename, category_filename);
98 fd = _open(filename, O_RDONLY);
99 if (fd < 0)
100 goto no_locale;
101 if (_fstat(fd, &st) != 0)
102 goto bad_locale;
103 if (st.st_size <= 0)
104 goto bad_locale;
105 bufsize = namesize + st.st_size;

--- 18 unchanged lines hidden (view full) ---

124 if (num_lines >= locale_buf_size_max)
125 num_lines = locale_buf_size_max;
126 else if (num_lines >= locale_buf_size_min)
127 num_lines = locale_buf_size_min;
128 else
129 goto reset_locale;
130 set_from_buf(lbuf, num_lines, dst_localebuf);
131 /*
99 fd = _open(filename, O_RDONLY);
100 if (fd < 0)
101 goto no_locale;
102 if (_fstat(fd, &st) != 0)
103 goto bad_locale;
104 if (st.st_size <= 0)
105 goto bad_locale;
106 bufsize = namesize + st.st_size;

--- 18 unchanged lines hidden (view full) ---

125 if (num_lines >= locale_buf_size_max)
126 num_lines = locale_buf_size_max;
127 else if (num_lines >= locale_buf_size_min)
128 num_lines = locale_buf_size_min;
129 else
130 goto reset_locale;
131 set_from_buf(lbuf, num_lines, dst_localebuf);
132 /*
132 ** Record the successful parse in the cache.
133 */
133 * Record the successful parse in the cache.
134 */
134 locale_buf = lbuf;
135
136 *using_locale = 1;
137 return 0;
138
139reset_locale:
140 locale_buf = locale_buf_C;
141 save_using_locale = 0;
142bad_lbuf:
143 free(lbuf);
144bad_locale:
145 (void)_close(fd);
146no_locale:
147 *using_locale = save_using_locale;
148 return -1;
149}
150
151static int
135 locale_buf = lbuf;
136
137 *using_locale = 1;
138 return 0;
139
140reset_locale:
141 locale_buf = locale_buf_C;
142 save_using_locale = 0;
143bad_lbuf:
144 free(lbuf);
145bad_locale:
146 (void)_close(fd);
147no_locale:
148 *using_locale = save_using_locale;
149 return -1;
150}
151
152static int
152split_lines(char *p, const char *plim)
153{
153split_lines(char *p, const char *plim) {
154
154 int i;
155
156 for (i = 0; p < plim; i++) {
157 p = strchr(p, '\n');
158 *p++ = '\0';
159 }
160 return i;
161}
162
163static void
155 int i;
156
157 for (i = 0; p < plim; i++) {
158 p = strchr(p, '\n');
159 *p++ = '\0';
160 }
161 return i;
162}
163
164static void
164set_from_buf(const char *p, int num_lines, const char **dst_localebuf)
165{
165set_from_buf(const char *p, int num_lines, const char **dst_localebuf) {
166
166 const char **ap;
167 int i;
168
169 for (ap = dst_localebuf, i = 0; i < num_lines; ++ap, ++i)
170 *ap = p += strlen(p) + 1;
171}
172
167 const char **ap;
168 int i;
169
170 for (ap = dst_localebuf, i = 0; i < num_lines; ++ap, ++i)
171 *ap = p += strlen(p) + 1;
172}
173