OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* time/tzfile.c (__tzfile_read): Fix check for version 0 data files.

Browse Source 
Patch by Szymon Siwek <sls@poczta.wp.pl>.
This commit is contained in:
Ulrich Drepper 2007-11-06 01:04:13 +00:00
parent ffb1b88282
commit 94a749f69a
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2007-11-05 Ulrich Drepper <drepper@redhat.com> 2007-11-05 Ulrich Drepper <drepper@redhat.com>
* time/tzfile.c (__tzfile_read): Fix check for version 0 data files.
Patch by Szymon Siwek <sls@poczta.wp.pl>.
* nscd/aicache.c (addhstaiX): Check herrno after IPv4 lookup only * nscd/aicache.c (addhstaiX): Check herrno after IPv4 lookup only
when the lookup call failed. when the lookup call failed.

7
nptl/ChangeLog
View File

@ -1,3 +1,10 @@
2007-11-03 Mike Frysinger <vapier@gentoo.org>
* sysdeps/unix/sysv/linux/sh/lowlevellock.S (LOAD_FUTEX_WAIT): Add
missing line continuations.
* sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S (LOAD_FUTEX_WAIT,
LOAD_FUTEX_WAKE): Likewise. Also add missing 3rd parameter.
2007-10-28 Ulrich Drepper <drepper@redhat.com> 2007-10-28 Ulrich Drepper <drepper@redhat.com>
[BZ #5220] [BZ #5220]

8
nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
View File

@ -76,7 +76,7 @@
add tmp2, tmp ; \ add tmp2, tmp ; \
mov.l @tmp, tmp2 ; \ mov.l @tmp, tmp2 ; \
bra 98f ; \ bra 98f ; \
mov #FUTEX_PRIVATE_FLAG, tmp mov #FUTEX_PRIVATE_FLAG, tmp ; \
99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \ 99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
98: extu.b tmp, tmp ; \ 98: extu.b tmp, tmp ; \
xor tmp, reg ; \ xor tmp, reg ; \
@ -88,7 +88,7 @@
add tmp2, tmp ; \ add tmp2, tmp ; \
mov.l @tmp, tmp2 ; \ mov.l @tmp, tmp2 ; \
bra 98f ; \ bra 98f ; \
mov #FUTEX_PRIVATE_FLAG, tmp mov #FUTEX_PRIVATE_FLAG, tmp ; \
99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \ 99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
98: extu.b tmp, tmp ; \ 98: extu.b tmp, tmp ; \
xor tmp, reg ; \ xor tmp, reg ; \
@ -96,13 +96,13 @@
mov #FUTEX_WAIT, tmp ; \ mov #FUTEX_WAIT, tmp ; \
or tmp, reg or tmp, reg
# endif # endif
# define LOAD_FUTEX_WAKE(reg,tmp) \ # define LOAD_FUTEX_WAKE(reg,tmp,tmp2) \
stc gbr, tmp ; \ stc gbr, tmp ; \
mov.w 99f, tmp2 ; \ mov.w 99f, tmp2 ; \
add tmp2, tmp ; \ add tmp2, tmp ; \
mov.l @tmp, tmp2 ; \ mov.l @tmp, tmp2 ; \
bra 98f ; \ bra 98f ; \
mov #FUTEX_PRIVATE_FLAG, tmp mov #FUTEX_PRIVATE_FLAG, tmp ; \
99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \ 99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
98: extu.b tmp, tmp ; \ 98: extu.b tmp, tmp ; \
xor tmp, reg ; \ xor tmp, reg ; \

4
nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
View File

@ -42,7 +42,7 @@
add tmp2, tmp ; \ add tmp2, tmp ; \
mov.l @tmp, tmp2 ; \ mov.l @tmp, tmp2 ; \
bra 98f ; \ bra 98f ; \
mov #FUTEX_PRIVATE_FLAG, tmp mov #FUTEX_PRIVATE_FLAG, tmp ; \
99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \ 99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
98: extu.b tmp, tmp ; \ 98: extu.b tmp, tmp ; \
xor tmp, reg ; \ xor tmp, reg ; \
@ -54,7 +54,7 @@
add tmp2, tmp ; \ add tmp2, tmp ; \
mov.l @tmp, tmp2 ; \ mov.l @tmp, tmp2 ; \
bra 98f ; \ bra 98f ; \
mov #FUTEX_PRIVATE_FLAG, tmp mov #FUTEX_PRIVATE_FLAG, tmp ; \
99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \ 99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
98: extu.b tmp, tmp ; \ 98: extu.b tmp, tmp ; \
xor tmp, reg ; \ xor tmp, reg ; \

2
nscd/nscd.conf
View File

@ -32,7 +32,7 @@
# logfile /var/log/nscd.log # logfile /var/log/nscd.log
# threads 4 # threads 4
# max-threads 128 # max-threads 32
# server-user nobody # server-user nobody
# stat-user somebody # stat-user somebody
debug-level 0 debug-level 0

2
time/tzfile.c
View File

@ -381,7 +381,7 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
else else
tzspec[tzspec_len - 1] = '\0'; tzspec[tzspec_len - 1] = '\0';
} }
else if (sizeof (time_t) == 4 && tzhead.tzh_version != '\0') else if (sizeof (time_t) == 4 && tzhead.tzh_version[0] != '\0')
{ {
/* Get the TZ string. */ /* Get the TZ string. */
if (__builtin_expect (fread_unlocked ((void *) &tzhead, sizeof (tzhead), if (__builtin_expect (fread_unlocked ((void *) &tzhead, sizeof (tzhead),