>From 350c6f8dba8cc2a6266cb8a350d01c49805af9db Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 26 May 2020 17:53:47 +0200 Subject: [PATCH 3/8] getloadavg: Make more robust in multithreaded applications. * lib/getloadavg.c (getloadavg): Pass an 'e' flag to fopen. * modules/getloadavg (Depends-on): Add fopen-gnu. --- ChangeLog | 6 ++++++ lib/getloadavg.c | 2 +- modules/getloadavg | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e766479..7dabc5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2020-05-26 Bruno Haible + getloadavg: Make more robust in multithreaded applications. + * lib/getloadavg.c (getloadavg): Pass an 'e' flag to fopen. + * modules/getloadavg (Depends-on): Add fopen-gnu. + +2020-05-26 Bruno Haible + exclude: Make more robust in multithreaded applications. * lib/exclude.c (add_exclude_file): Pass an 'e' flag to fopen. * modules/exclude (Depends-on): Add fopen-gnu. diff --git a/lib/getloadavg.c b/lib/getloadavg.c index ebb6f5d..7e11c32 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -569,7 +569,7 @@ getloadavg (double loadavg[], int nelem) int count; FILE *fp; - fp = fopen (NETBSD_LDAV_FILE, "r"); + fp = fopen (NETBSD_LDAV_FILE, "re"); if (fp == NULL) return -1; count = fscanf (fp, "%lu %lu %lu %lu\n", diff --git a/modules/getloadavg b/modules/getloadavg index 1b0f581..e14ddc8 100644 --- a/modules/getloadavg +++ b/modules/getloadavg @@ -7,6 +7,7 @@ m4/getloadavg.m4 Depends-on: extensions +fopen-gnu intprops stdbool stdlib -- 2.7.4