Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Manager: Fix procinfo_setup() when called from CBOINCClientManager::IsBOINCCoreRunning(). 

When a non-English language was set, the %lf format expected a comma for the decimal point, but ps command always uses a period. This caused IsBOINCCoreRunning() to always return false.
This commit is contained in:
Charlie Fenton 2020-08-21 05:21:14 -07:00
parent 429f5b3d11
commit ee54b93817
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/procinfo_mac.cpp
View File

@ -24,6 +24,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <dirent.h> #include <dirent.h>
#include <unistd.h> #include <unistd.h>
#include <string>
#include <locale.h>
#if SHOW_TIMING #if SHOW_TIMING
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
@ -46,6 +48,7 @@ int procinfo_setup(PROC_MAP& pm) {
int c, real_mem, virtual_mem, hours; int c, real_mem, virtual_mem, hours;
char* lf; char* lf;
static long iBrandID = -1; static long iBrandID = -1;
std::string old_locale;
// For branded installs, the Mac installer put a branding file in our data directory // For branded installs, the Mac installer put a branding file in our data directory
FILE *f = fopen("/Library/Application Support/BOINC Data/Branding", "r"); FILE *f = fopen("/Library/Application Support/BOINC Data/Branding", "r");
@ -109,6 +112,10 @@ int procinfo_setup(PROC_MAP& pm) {
} }
} while (c != '\n'); } while (c != '\n');
// Ensure %lf works corectly if called from non-English Manager
old_locale = setlocale(LC_ALL, NULL);
setlocale(LC_ALL, "C");
while (1) { while (1) {
p.clear(); p.clear();
c = fscanf(fd, "%d%d%d%d%lu%d:%lf ", c = fscanf(fd, "%d%d%d%d%lu%d:%lf ",
@ -156,5 +163,7 @@ int procinfo_setup(PROC_MAP& pm) {
#endif #endif
find_children(pm); find_children(pm);
setlocale(LC_ALL, old_locale.c_str());
return 0; return 0;
} }