diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-04-25 00:04:02 -0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-04-25 00:05:14 -0300 |
| commit | d6dd604b551987b411ec8930c23bd5c9c93ef864 (patch) | |
| tree | 6599838f561b0621fda1bfb660bef74981607367 /src/shared/util.h | |
| parent | db5c0122853a9ecf1cc92e6593461932df2fa866 (diff) | |
util: rework safe_atod() to be locale-independent
This adds some syntactic sugar with a macro RUN_WITH_LOCALE() that reset
the thread-specific locale temporarily.
Diffstat (limited to 'src/shared/util.h')
| -rw-r--r-- | src/shared/util.h | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/src/shared/util.h b/src/shared/util.h index 6575f56811..d76f41e777 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -38,6 +38,7 @@ #include <sys/resource.h> #include <stddef.h> #include <unistd.h> +#include <locale.h> #include "macro.h" #include "time-util.h" @@ -643,19 +644,19 @@ static inline void _reset_errno_(int *saved_errno) { errno = *saved_errno; } -#define PROTECT_ERRNO __attribute__((cleanup(_reset_errno_))) int _saved_errno_ = errno +#define PROTECT_ERRNO _cleanup_(_reset_errno_) int _saved_errno_ = errno -struct umask_struct { +struct _umask_struct_ { mode_t mask; bool quit; }; -static inline void _reset_umask_(struct umask_struct *s) { +static inline void _reset_umask_(struct _umask_struct_ *s) { umask(s->mask); }; #define RUN_WITH_UMASK(mask) \ - for (__attribute__((cleanup(_reset_umask_))) struct umask_struct _saved_umask_ = { umask(mask), false }; \ + for (_cleanup_(_reset_umask_) struct _umask_struct_ _saved_umask_ = { umask(mask), false }; \ !_saved_umask_.quit ; \ _saved_umask_.quit = true) @@ -706,3 +707,29 @@ int unlink_noerrno(const char *path); sprintf(_r_, "/proc/%lu/" field, (unsigned long) _pid_); \ _r_; \ }) + +struct _locale_struct_ { + locale_t saved_locale; + locale_t new_locale; + bool quit; +}; + +static inline void _reset_locale_(struct _locale_struct_ *s) { + PROTECT_ERRNO; + if (s->saved_locale != (locale_t) 0) + uselocale(s->saved_locale); + if (s->new_locale != (locale_t) 0) + freelocale(s->new_locale); +} + +#define RUN_WITH_LOCALE(mask, loc) \ + for (_cleanup_(_reset_locale_) struct _locale_struct_ _saved_locale_ = { (locale_t) 0, (locale_t) 0, false }; \ + ({ \ + if (!_saved_locale_.quit) { \ + PROTECT_ERRNO; \ + _saved_locale_.new_locale = newlocale((mask), (loc), (locale_t) 0); \ + if (_saved_locale_.new_locale != (locale_t) 0) \ + _saved_locale_.saved_locale = uselocale(_saved_locale_.new_locale); \ + } \ + !_saved_locale_.quit; }) ; \ + _saved_locale_.quit = true) |