summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2004-08-01 20:02:28 (UTC)
committer Michael Krelin <hacker@klever.net>2004-08-01 20:02:28 (UTC)
commit3ae8e764889099513eba9a991e43074421e796ca (patch) (unidiff)
tree5216651f87b396b07851cc13fd11be52e19b0420
parent2efc8ab6481fd4dcfcd23b5beed4c1369edab1f4 (diff)
downloaddudki-3ae8e764889099513eba9a991e43074421e796ca.zip
dudki-3ae8e764889099513eba9a991e43074421e796ca.tar.gz
dudki-3ae8e764889099513eba9a991e43074421e796ca.tar.bz2
fixed handling of 'ProcessName' on FreeBSD
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--NEWS.xml1
-rw-r--r--src/process.cc14
2 files changed, 13 insertions, 2 deletions
diff --git a/NEWS.xml b/NEWS.xml
index bc0af31..2e35c11 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -4,2 +4,3 @@
4 <ni>do not act -e when doing -r</ni> 4 <ni>do not act -e when doing -r</ni>
5 <ni>proper handling of <kbd>ProcessName</kbd> on <kbd>FreeBSD</kbd></ni>
5 </version> 6 </version>
diff --git a/src/process.cc b/src/process.cc
index 8a5b5d2..96c874f 100644
--- a/src/process.cc
+++ b/src/process.cc
@@ -251,4 +251,3 @@ void process::gather_proc_info() {
251 ifstream ss(s,ios::in); 251 ifstream ss(s,ios::in);
252 if(!ss) 252 if(ss) {
253 continue;
254 getline(ss,cmd); 253 getline(ss,cmd);
@@ -262,2 +261,13 @@ void process::gather_proc_info() {
262 cmd.erase(cp); 261 cmd.erase(cp);
262 }else{
263 r = snprintf(s,sizeof(s),"/proc/%d/status",*i);
264 if(r>=sizeof(s) || r<1)
265 continue;
266 ifstream ss(s,ios::in);
267 if(!ss)
268 continue;
269 ss >> cmd;
270 if(cmd.empty())
271 continue;
272 }
263 r = snprintf(s,sizeof(s),"/proc/%d/cmdline",*i); 273 r = snprintf(s,sizeof(s),"/proc/%d/cmdline",*i);