diff options
Diffstat (limited to 'mdk-stage1/utils.c')
| -rw-r--r-- | mdk-stage1/utils.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/mdk-stage1/utils.c b/mdk-stage1/utils.c index af5ee9af3..6ad3a8f6f 100644 --- a/mdk-stage1/utils.c +++ b/mdk-stage1/utils.c @@ -21,6 +21,7 @@ #include <unistd.h> #include <ctype.h> #include <dirent.h> +#include <sys/sysinfo.h> #include <sys/utsname.h> #include "utils.h" @@ -83,9 +84,12 @@ int line_counts(const char * buf) { int total_memory(void) { int value; - - /* drakx powered: use /proc/kcore and rounds every 4 Mbytes */ - value = 4 * ((int)((float)file_size("/proc/kcore") / 1024 / 1024 / 4 + 0.5)); + struct sysinfo sys_info; + if (sysinfo(&sys_info) < 0) { + log_perror("sysinfo"); + return 0; + } + value = sys_info.totalram * sys_info.mem_unit / 1024 / 1024; log_message("Total Memory: %d Mbytes", value); return value; @@ -162,14 +166,6 @@ char * asprintf_(const char *msg, ...) return strdup(""); } -int scall_(int retval, char * msg, char * file, int line) -{ - char tmp[5000]; - sprintf(tmp, "%s(%s:%d) failed", msg, file, line); - if (retval) - log_perror(tmp); - return retval; -} void lowercase(char *s) { |