fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-05-29 23:51:34 +00:00
Code Issues Projects Releases Wiki Activity

allow zoneinfo-path-relative filenames with no slashes in TZ variable

Browse Source 
since the form TZ=name is reserved for POSIX-form time zone strings,
TZ=:name needs to be used when the zoneinfo filename is in the
top-level zoneinfo directory and therefore does not contain a slash.
previously the leading colon was merely dropped, making it impossible
to access such zones without a full absolute pathname.

changes based on patch by Timo Teräs.
This commit is contained in:
Rich Felker 2014-04-21 18:11:42 -04:00
parent 164c5c7a32
commit 5c4f11d995
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/time/__tz.c
View File

@ -121,7 +121,7 @@ int __munmap(void *, size_t);
static void do_tzset() static void do_tzset()
{ {
char buf[NAME_MAX+25], *pathname=buf+24; char buf[NAME_MAX+25], *pathname=buf+24;
const char *try, *s; const char *try, *s, *p;
const unsigned char *map = 0; const unsigned char *map = 0;
size_t i; size_t i;
static const char search[] = static const char search[] =
@ -147,19 +147,16 @@ static void do_tzset()
} }
if (old_tz) memcpy(old_tz, s, i+1); if (old_tz) memcpy(old_tz, s, i+1);
if (*s == ':') s++;
/* Non-suid can use an absolute tzfile pathname or a relative /* Non-suid can use an absolute tzfile pathname or a relative
* pathame beginning with "."; in secure mode, only the * pathame beginning with "."; in secure mode, only the
* standard path will be searched. */ * standard path will be searched. */
if (*s == '/' || *s == '.') { if (*s == ':' || ((p=strchr(s, '/')) && !memchr(s, ',', p-s))) {
if (!libc.secure) map = __map_file(s, &map_size); if (*s == ':') s++;
} else { if (*s == '/' || *s == '.') {
for (i=0; s[i] && s[i]!=','; i++) { if (!libc.secure) map = __map_file(s, &map_size);
if (s[i]=='/') { } else {
size_t l = strlen(s); size_t l = strlen(s);
if (l > NAME_MAX || strchr(s, '.')) if (l <= NAME_MAX && !strchr(s, '.')) {
break;
memcpy(pathname, s, l+1); memcpy(pathname, s, l+1);
pathname[l] = 0; pathname[l] = 0;
for (try=search; !map && *try; try+=l+1) { for (try=search; !map && *try; try+=l+1) {
@ -167,7 +164,6 @@ static void do_tzset()
memcpy(pathname-l, try, l); memcpy(pathname-l, try, l);
map = __map_file(pathname-l, &map_size); map = __map_file(pathname-l, &map_size);
} }
break;
} }
} }
} }