d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LC_*_MASK bit shifting order was partially broken from the initial commit

Browse Source 
time at year 2012. Only LC_COLLATE_MASK and LC_CTYPE_MASK are in the
right order.

The order here should match XLC_* from "xlocale_private.h" which, in turn,
match LC_* publicly visible order from <locale.h> which determines how
locale components are stored in the structure.
LC_*_MASK -> XLC_* translation done as "ffs(mask) - 1" in the querylocale()
and equivalent shift loop in the newlocale(), so mapped to some wrong
components (excluding two mentioned above).

Formally the fix is ABI breakage, but old code using those masks
never works properly in any case.
Only newlocale() and querylocale() are affected.

MFC after:      7 days
This commit is contained in:
Andrey A. Chernov 2016-08-23 20:33:56 +00:00
parent a5ae1a9829
commit 2f5007f6d2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/xlocale/_locale.h
View File

@ -32,12 +32,13 @@
#ifndef _XLOCALE_LOCALE_H #ifndef _XLOCALE_LOCALE_H
#define _XLOCALE_LOCALE_H #define _XLOCALE_LOCALE_H
/* Bit shifting order of LC_*_MASK should match XLC_* and LC_* order. */
#define LC_COLLATE_MASK (1<<0) #define LC_COLLATE_MASK (1<<0)
#define LC_CTYPE_MASK (1<<1) #define LC_CTYPE_MASK (1<<1)
#define LC_MESSAGES_MASK (1<<2) #define LC_MONETARY_MASK (1<<2)
#define LC_MONETARY_MASK (1<<3) #define LC_NUMERIC_MASK (1<<3)
#define LC_NUMERIC_MASK (1<<4) #define LC_TIME_MASK (1<<4)
#define LC_TIME_MASK (1<<5) #define LC_MESSAGES_MASK (1<<5)
#define LC_ALL_MASK (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | \ #define LC_ALL_MASK (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | \
LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK) LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK)
#define LC_GLOBAL_LOCALE ((locale_t)-1) #define LC_GLOBAL_LOCALE ((locale_t)-1)