diff options
author | ache <ache@FreeBSD.org> | 1996-12-28 05:04:24 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 1996-12-28 05:04:24 +0000 |
commit | 1eac53090bfecc7062cd8bc91cd5c5945a24de01 (patch) | |
tree | 841f9ce04833b2ecb342e677a801eaa3a9790dc3 /lib/libc/locale | |
parent | a7a2d1e16cb18addc021ccd8c9c0a100caf4f49b (diff) | |
download | FreeBSD-src-1eac53090bfecc7062cd8bc91cd5c5945a24de01.zip FreeBSD-src-1eac53090bfecc7062cd8bc91cd5c5945a24de01.tar.gz |
Add comment that range checking is already done at upper level
Kill snprintf left in collate.c from previous backout
Should go in 2.2
Diffstat (limited to 'lib/libc/locale')
-rw-r--r-- | lib/libc/locale/collate.c | 9 | ||||
-rw-r--r-- | lib/libc/locale/setrunelocale.c | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c index 79e410c..4228ef5 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.9 1996/11/26 02:49:31 ache Exp $ + * $Id: collate.c,v 1.10 1996/12/16 17:32:56 joerg Exp $ */ #include <rune.h> @@ -73,8 +73,11 @@ __collate_load_tables(encoding) __collate_load_error = save_load_error; return -1; } - (void) snprintf(buf, sizeof buf, "%s/%s/LC_COLLATE", - _PathLocale, encoding); + /* Range checking already done at upper level caller */ + (void) strcpy(buf, _PathLocale); + (void) strcat(buf, "/"); + (void) strcat(buf, encoding); + (void) strcat(buf, "/LC_COLLATE"); if ((fp = fopen(buf, "r")) == NULL) { __collate_load_error = save_load_error; return -1; diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c index 228efe29..65daa83 100644 --- a/lib/libc/locale/setrunelocale.c +++ b/lib/libc/locale/setrunelocale.c @@ -85,6 +85,7 @@ _xpg4_setrunelocale(encoding) if (!_PathLocale) return(EFAULT); + /* Range checking already done at upper level caller */ (void) strcpy(name, _PathLocale); (void) strcat(name, "/"); (void) strcat(name, encoding); |