From ee8449f7293a20a2a971ecdbf3d31129a281dee4 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 4 Sep 2003 08:27:37 +0000 Subject: Update. 2003-09-04 Ulrich Drepper * libio/libio.h: Define _IO_FLAGS2_NOTCANCEL. * libio/fileops.c [_LIBC]: Remove close macro. (_IO_file_open): If _IO_FLAGS2_NOTCANCEL is set, use open_not_cancel. (_IO_new_file_open): Recognize 'c' flag in mode string. (_IO_file_read): If _IO_FLAGS2_NOTCANCEL is set use read_not_cancel. (_IO_new_file_write): If _IO_FLAGS2_NOTCANCEL is set use write_not_cancel. * iconv/gconv_conf.c: Use fopen with 'c' mode flag. * inet/rcmd.c: Likewise. * inet/ruserpass.c: Likewise. * intl/localealias.c: Likewise. * malloc/mtrace.c: Likewise. * misc/getpass.c: Likewise. * misc/getttyent.c: Likewise. * misc/mntent_r.c: Likewise. * misc/getusershell.c: Likewise. * nss/nsswitch.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_init.c: Likewise. * sysdeps/unix/sysv/linux/getsysstats.c: Likewise. * time/getdate.c: Likewise. * time/tzfile.c: Likewise. * misc/fstab.h: Undo last change. * misc/mntent.h: Likewise. * misc/Makefile: Remove CFLAGS-mntent_r.c, CFLAGS-mntent.c, and CFLAGS-fstab.c definition. 2003-09-04 Jakub Jelinek 2003-09-03 Ulrich Drepper --- sysdeps/unix/sysv/linux/getsysstats.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/getsysstats.c') diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c index 69dabd165b..985a0860cb 100644 --- a/sysdeps/unix/sysv/linux/getsysstats.c +++ b/sysdeps/unix/sysv/linux/getsysstats.c @@ -154,7 +154,7 @@ __get_nprocs () /* The /proc/stat format is more uniform, use it by default. */ __stpcpy (__stpcpy (proc_fname, proc_path), "/stat"); - fp = fopen (proc_fname, "r"); + fp = fopen (proc_fname, "rc"); if (fp != NULL) { /* No threads use this stream. */ @@ -171,7 +171,7 @@ __get_nprocs () { __stpcpy (__stpcpy (proc_fname, proc_path), "/cpuinfo"); - fp = fopen (proc_fname, "r"); + fp = fopen (proc_fname, "rc"); if (fp != NULL) { /* No threads use this stream. */ @@ -209,7 +209,7 @@ __get_nprocs_conf () char *proc_cpuinfo = alloca (strlen (proc_path) + sizeof ("/cpuinfo")); __stpcpy (__stpcpy (proc_cpuinfo, proc_path), "/cpuinfo"); - fp = fopen (proc_cpuinfo, "r"); + fp = fopen (proc_cpuinfo, "rc"); if (fp != NULL) { /* No threads use this stream. */ @@ -249,7 +249,7 @@ phys_pages_info (const char *format) char *proc_meminfo = alloca (strlen (proc_path) + sizeof ("/meminfo")); __stpcpy (__stpcpy (proc_meminfo, proc_path), "/meminfo"); - fp = fopen (proc_meminfo, "r"); + fp = fopen (proc_meminfo, "rc"); if (fp != NULL) { /* No threads use this stream. */ -- cgit 1.4.1