summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS.xml1
-rw-r--r--src/process.cc32
2 files changed, 22 insertions, 11 deletions
diff --git a/NEWS.xml b/NEWS.xml
index bc0af31..2e35c11 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -4,2 +4,3 @@
<ni>do not act -e when doing -r</ni>
+ <ni>proper handling of <kbd>ProcessName</kbd> on <kbd>FreeBSD</kbd></ni>
</version>
diff --git a/src/process.cc b/src/process.cc
index 8a5b5d2..96c874f 100644
--- a/src/process.cc
+++ b/src/process.cc
@@ -251,13 +251,23 @@ void process::gather_proc_info() {
ifstream ss(s,ios::in);
- if(!ss)
- continue;
- getline(ss,cmd);
- string::size_type op = cmd.find('(');
- if(op==string::npos)
- continue;
- cmd.erase(0,op+1);
- string::size_type cp = cmd.find(')');
- if(cp==string::npos)
- continue;
- cmd.erase(cp);
+ if(ss) {
+ getline(ss,cmd);
+ string::size_type op = cmd.find('(');
+ if(op==string::npos)
+ continue;
+ cmd.erase(0,op+1);
+ string::size_type cp = cmd.find(')');
+ if(cp==string::npos)
+ continue;
+ cmd.erase(cp);
+ }else{
+ r = snprintf(s,sizeof(s),"/proc/%d/status",*i);
+ if(r>=sizeof(s) || r<1)
+ continue;
+ ifstream ss(s,ios::in);
+ if(!ss)
+ continue;
+ ss >> cmd;
+ if(cmd.empty())
+ continue;
+ }
r = snprintf(s,sizeof(s),"/proc/%d/cmdline",*i);