Page MenuHomeFreeBSD
Differential D17166 Diff 63873 lib/libc/locale/collate.c

Changeset View

Standalone View

View Options

lib/libc/locale/collate.c

Context not available.
#include "ldpart.h" #include "ldpart.h"
#include "libc_private.h" #include "libc_private.h"
/*
* A version number representing the version of the collation algorithm. If
* the algorithm changes in a way that affects comparisons, this value should
* be incremented. This will be concatenated with a version from the
* collation definition files to form a complete version string that client
* code can use to detect potential ordering changes.
*/
#define COLLATE_ALG_VERSION "0"
struct xlocale_collate __xlocale_global_collate = { struct xlocale_collate __xlocale_global_collate = {
{{0}, "C"}, 1, 0, 0, 0 {{0}, "C"}, 1, 0, 0, 0
}; };
Context not available.
(void) _close(fd); (void) _close(fd);
return (_LDP_ERROR); return (_LDP_ERROR);
} }
if (sbuf.st_size < (COLLATE_STR_LEN + sizeof (info))) { if (sbuf.st_size < (COLLATE_FMT_VERSION_LEN +
XLOCALE_DEF_VERSION_LEN +
sizeof (info))) {
(void) _close(fd); (void) _close(fd);
errno = EINVAL; errno = EINVAL;
return (_LDP_ERROR); return (_LDP_ERROR);
yuripvUnsubmitted
Done
Inline Actions

You likely want strlcpy() here to make sure it's NUL-terminated.

yuripv: You likely want strlcpy() here to make sure it's NUL-terminated.
Context not available.
return (_LDP_ERROR); return (_LDP_ERROR);
} }
if (strncmp(TMP, COLLATE_VERSION, COLLATE_STR_LEN) != 0) { if (strncmp(TMP, COLLATE_FMT_VERSION, COLLATE_FMT_VERSION_LEN) != 0) {
(void) munmap(map, sbuf.st_size); (void) munmap(map, sbuf.st_size);
errno = EINVAL; errno = EINVAL;
return (_LDP_ERROR); return (_LDP_ERROR);
} }
TMP += COLLATE_STR_LEN; TMP += COLLATE_FMT_VERSION_LEN;
strlcpy(table->header.version,
COLLATE_ALG_VERSION,
sizeof (table->header.version));
strlcat(table->header.version, ":", sizeof (table->header.version));
strlcat(table->header.version, TMP, sizeof (table->header.version));
TMP += XLOCALE_DEF_VERSION_LEN;
info = (void *)TMP; info = (void *)TMP;
TMP += sizeof (*info); TMP += sizeof (*info);
Context not available.