Lines 1-18
Link Here
|
1 |
--- src/config.c.orig 2011-07-19 16:52:33.000000000 -0500 |
1 |
--- src/config.c~ 2014-01-12 11:31:51.000000000 -0500 |
2 |
+++ src/config.c 2011-10-12 17:05:50.164711868 -0500 |
2 |
+++ src/config.c 2015-03-24 17:32:49.873800297 -0400 |
3 |
@@ -146,7 +146,11 @@ pid_t get_stjerm_pid(void) |
3 |
@@ -614,7 +614,7 @@ void conf_init(void) |
4 |
char buffer[100]; |
|
|
5 |
char **list; |
6 |
int i = 0; |
7 |
+#ifdef __FreeBSD__ |
8 |
+ FILE *p = popen("pgrep stjerm", "r"); |
9 |
+#else |
10 |
FILE *p = popen("pidof stjerm", "r"); |
11 |
+#endif |
12 |
|
13 |
if(p == NULL) |
14 |
{ |
15 |
@@ -552,7 +556,7 @@ void conf_init(void) |
16 |
exit(1); |
4 |
exit(1); |
17 |
} |
5 |
} |
18 |
|
6 |
|