Fixes for /proc location, submitted by Florent Thoumie

5 files changed, 17 insertions, 11 deletions

diff --git a/Process.c b/Process.c
index a10c6ae0..9bbd569e 100644
--- a/Process.c
+++ b/Process.c
@@ -28,7 +28,9 @@ in the source distribution for its full text.
 
 // This works only with glibc 2.1+. On earlier versions
 // the behavior is similar to have a hardcoded page size.
+#ifndef PAGE_SIZE
 #define PAGE_SIZE ( sysconf(_SC_PAGESIZE) / 1024 )
+#endif
 
 #define PROCESS_COMM_LEN 300
 
diff --git a/Process.h b/Process.h
index 5c4c7166..618fa2ae 100644
--- a/Process.h
+++ b/Process.h
@@ -31,7 +31,9 @@ in the source distribution for its full text.
 
 // This works only with glibc 2.1+. On earlier versions
 // the behavior is similar to have a hardcoded page size.
+#ifndef PAGE_SIZE
 #define PAGE_SIZE ( sysconf(_SC_PAGESIZE) / 1024 )
+#endif
 
 #define PROCESS_COMM_LEN 300
 
@@ -52,16 +54,16 @@ typedef struct Process_ {
    struct ProcessList_ *pl;
    bool updated;
 
-   int pid;
+   unsigned int pid;
    char* comm;
    int indent;
    char state;
    bool tag;
-   int ppid;
-   int pgrp;
-   int session;
-   int tty_nr;
-   int tpgid;
+   unsigned int ppid;
+   unsigned int pgrp;
+   unsigned int session;
+   unsigned int tty_nr;
+   unsigned int tpgid;
    unsigned long int flags;
    #ifdef DEBUG
    unsigned long int minflt;
diff --git a/ProcessList.c b/ProcessList.c
index 961f8d56..15739092 100644
--- a/ProcessList.c
+++ b/ProcessList.c
@@ -37,11 +37,11 @@ in the source distribution for its full text.
 #endif
 
 #ifndef PROCSTATFILE
-#define PROCSTATFILE "/proc/stat"
+#define PROCSTATFILE PROCDIR "/stat"
 #endif
 
 #ifndef PROCMEMINFOFILE
-#define PROCMEMINFOFILE "/proc/meminfo"
+#define PROCMEMINFOFILE PROCDIR "/meminfo"
 #endif
 
 #ifndef MAX_NAME
@@ -426,7 +426,7 @@ static int ProcessList_readStatFile(ProcessList* this, Process *proc, FILE *f, c
    #else
    long int uzero;
    int num = ProcessList_read(this, location, 
-      "%c %d %d %d %d %d %lu %lu %lu %lu "
+      "%c %u %u %u %u %u %lu %lu %lu %lu "
       "%lu %lu %lu %ld %ld %ld %ld %ld %ld "
       "%lu %lu %ld %lu %lu %lu %lu %lu "
       "%lu %lu %lu %lu %lu %lu %lu %lu "
diff --git a/ProcessList.h b/ProcessList.h
index 1cd7b8bd..8707ce42 100644
--- a/ProcessList.h
+++ b/ProcessList.h
@@ -39,11 +39,11 @@ in the source distribution for its full text.
 #endif
 
 #ifndef PROCSTATFILE
-#define PROCSTATFILE "/proc/stat"
+#define PROCSTATFILE PROCDIR "/stat"
 #endif
 
 #ifndef PROCMEMINFOFILE
-#define PROCMEMINFOFILE "/proc/meminfo"
+#define PROCMEMINFOFILE PROCDIR "/meminfo"
 #endif
 
 #ifndef MAX_NAME
diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
index 9d78c487..dd9d99d1 100755
--- a/scripts/MakeHeader.py
+++ b/scripts/MakeHeader.py
@@ -21,6 +21,8 @@ class writer:
       self.file.write(text + "\n")
 out = writer(out)
 
+print("Generating "+name+".h")
+
 selfheader = '#include "' + name + '.h"'
 
 out.write( "/* Do not edit this file. It was automatically generated. */" )