[newlib-cygwin] Avoid decimal point localization in /proc/loadavg
Jon TURNEY
jturney@sourceware.org
Mon Apr 10 10:00:00 GMT 2017
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=c84697c259d340ec2322efe79394d3c9e96cf006
commit c84697c259d340ec2322efe79394d3c9e96cf006
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Apr 8 13:39:44 2017 +0100
Avoid decimal point localization in /proc/loadavg
Explicitly format the contents of /proc/loadavg to avoid the decimal point
getting localized according to LC_NUMERIC. Using anything other than '.' is
wrong and breaks top.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Diff:
---
winsup/cygwin/fhandler_proc.cc | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc
index a7e816f..ad367e4 100644
--- a/winsup/cygwin/fhandler_proc.cc
+++ b/winsup/cygwin/fhandler_proc.cc
@@ -30,6 +30,7 @@ details. */
#include <wctype.h>
#include "cpuid.h"
#include "mount.h"
+#include <math.h>
#define _COMPILING_NEWLIB
#include <dirent.h>
@@ -432,10 +433,14 @@ format_proc_loadavg (void *, char *&destbuf)
double loadavg[3] = { 0.0, 0.0, 0.0 };
getloadavg (loadavg, 3);
+#define HUNDRETHS(l) (int)((l - floor(l))*100)
+
destbuf = (char *) crealloc_abort (destbuf, 48);
- return sprintf (destbuf, "%.2f %.2f %.2f %u/%u\n",
- loadavg[0], loadavg[1], loadavg[2], running,
- (unsigned int)pids.npids);
+ return __small_sprintf (destbuf, "%u.%02u %u.%02u %u.%02u %u/%u\n",
+ (int)loadavg[0], HUNDRETHS(loadavg[0]),
+ (int)loadavg[1], HUNDRETHS(loadavg[1]),
+ (int)loadavg[2], HUNDRETHS(loadavg[2]),
+ running, (unsigned int)pids.npids);
}
static off_t
More information about the Cygwin-cvs
mailing list