Complete implementation of --with-proc, making htop more FreeBSD-friendly

This commit is contained in:
Hisham Muhammad 2006-03-13 17:29:18 +00:00
parent 5268ff8c67
commit 2ef1847a8b
3 changed files with 18 additions and 1 deletions

View File

@ -1,6 +1,9 @@
What's new in version 0.6.1 What's new in version 0.6.1
* Accept --with-proc=<dir> in configure, to specify
alternative procfs locations (making htop friendlier
to the Linux compatibility layer in FreeBSD)
* Included icon .desktop and desktop entry * Included icon .desktop and desktop entry
(thanks to Peter Hyman) (thanks to Peter Hyman)
* Added a check to make sure that a root-user htop closes * Added a check to make sure that a root-user htop closes

View File

@ -5,6 +5,11 @@ Released under the GNU GPL, see the COPYING file
in the source distribution for its full text. in the source distribution for its full text.
*/ */
#ifndef CONFIG_H
#define CONFIG_H
#include "config.h"
#endif
#include "ProcessList.h" #include "ProcessList.h"
#include "Process.h" #include "Process.h"
#include "TypedVector.h" #include "TypedVector.h"

11
htop.c
View File

@ -12,6 +12,11 @@ in the source distribution for its full text.
#include <ctype.h> #include <ctype.h>
#include <stdbool.h> #include <stdbool.h>
#ifndef CONFIG_H
#define CONFIG_H
#include "config.h"
#endif
#include "ProcessList.h" #include "ProcessList.h"
#include "CRT.h" #include "CRT.h"
#include "ListBox.h" #include "ListBox.h"
@ -26,7 +31,6 @@ in the source distribution for its full text.
#include "SignalsListBox.h" #include "SignalsListBox.h"
#include "TraceScreen.h" #include "TraceScreen.h"
#include "config.h"
#include "debug.h" #include "debug.h"
//#link m //#link m
@ -213,6 +217,11 @@ int main(int argc, char** argv) {
setUserOnly(argv[2], &userOnly, &userId); setUserOnly(argv[2], &userOnly, &userId);
} }
} }
if (access(PROCDIR, R_OK) != 0) {
fprintf(stderr, "Error: could not read procfs (compiled to look in %s).\n", PROCDIR);
exit(1);
}
ListBox* lb; ListBox* lb;
int quit = 0; int quit = 0;