zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-13 04:34:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't simply trust that string splits were successful...

Browse Source
This commit is contained in:
Hisham Muhammad
2011-08-29 20:45:29 +00:00
parent 5dfb46e14f
commit 27b470e10d
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Settings.c
View File

@ -34,10 +34,10 @@ void Settings_delete(Settings* this) {
static void Settings_readMeters(Settings* this, char* line, HeaderSide side) {
char* trim = String_trim(line);
char** ids = String_split(trim, ' ');
int nIds;
char** ids = String_split(trim, ' ', &nIds);
free(trim);
int i;
for (i = 0; ids[i] != NULL; i++) {
for (int i = 0; ids[i]; i++) {
Header_createMeter(this->header, ids[i], side);
}
String_freeArray(ids);
@ -45,10 +45,10 @@ static void Settings_readMeters(Settings* this, char* line, HeaderSide side) {
static void Settings_readMeterModes(Settings* this, char* line, HeaderSide side) {
char* trim = String_trim(line);
char** ids = String_split(trim, ' ');
int nIds;
char** ids = String_split(trim, ' ', &nIds);
free(trim);
int i;
for (i = 0; ids[i] != NULL; i++) {
for (int i = 0; ids[i]; i++) {
int mode = atoi(ids[i]);
Header_setMode(this->header, i, mode, side);
}
@ -67,13 +67,19 @@ static bool Settings_read(Settings* this, char* fileName) {
char buffer[maxLine];
bool readMeters = false;
while (fgets(buffer, maxLine, fd)) {
char** option = String_split(buffer, '=');
int nOptions;
char** option = String_split(buffer, '=', &nOptions);
if (nOptions < 2) {
String_freeArray(option);
continue;
}
if (String_eq(option[0], "fields")) {
char* trim = String_trim(option[1]);
char** ids = String_split(trim, ' ');
int nIds;
char** ids = String_split(trim, ' ', &nIds);
free(trim);
int i, j;
for (j = 0, i = 0; i < LAST_PROCESSFIELD && ids[i] != NULL; i++) {
for (j = 0, i = 0; i < LAST_PROCESSFIELD && ids[i]; i++) {
// This "+1" is for compatibility with the older enum format.
int id = atoi(ids[i]) + 1;
if (id > 0 && id < LAST_PROCESSFIELD) {