From 480a06dfde03c34849c24198d65e493fa183ca78 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 9 Jun 2000 06:42:46 +0000 Subject: [PATCH] Update. * sysdeps/unix/sysv/linux/shm_open.c (where_is_shmfs): Use defaultdir variable instead of "/var/shm" everywhere. (defaultdir): Change to /dev/shm/. --- ChangeLog | 4 +++- linuxthreads/ChangeLog | 3 +++ sysdeps/unix/sysv/linux/shm_open.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 571edf4..e05560f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 2000-06-08 Ulrich Drepper - * sysdeps/unix/sysv/linux/shm_open.c (defaultdir): Change to /dev/shm/. + * sysdeps/unix/sysv/linux/shm_open.c (where_is_shmfs): Use + defaultdir variable instead of "/var/shm" everywhere. + (defaultdir): Change to /dev/shm/. 2000-06-08 Greg McGary diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 8e19b89..b0cb0dd 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,5 +1,8 @@ 2000-06-08 Ulrich Drepper + * sysdeps/pthread/tst-timer.c (main): Rewrite initializers to + avoid warnings. + * sysdeps/pthread/timer_routines.c (__timer_thread_queue_timer): Be prepared for empty timer list. diff --git a/sysdeps/unix/sysv/linux/shm_open.c b/sysdeps/unix/sysv/linux/shm_open.c index 8aa080c..0cf7f5e 100644 --- a/sysdeps/unix/sysv/linux/shm_open.c +++ b/sysdeps/unix/sysv/linux/shm_open.c @@ -56,11 +56,11 @@ where_is_shmfs (void) /* The canonical place is /var/shm. This is at least what the documentation tells everybody to do. */ - if (__statfs ("/var/shm", &f) == 0 && f.f_type == SHMFS_SUPER_MAGIC) + if (__statfs (defaultdir, &f) == 0 && f.f_type == SHMFS_SUPER_MAGIC) { /* It is in the normal place. */ mountpoint.dir = (char *) defaultdir; - mountpoint.dirlen = strlen ("/var/shm/"); + mountpoint.dirlen = sizeof (defaultdir) - 1; return; } -- 2.7.4