summaryrefslogtreecommitdiffabout
Unidiff
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 @@
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,13 +251,23 @@ 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; 253 getline(ss,cmd);
254 getline(ss,cmd); 254 string::size_type op = cmd.find('(');
255 string::size_type op = cmd.find('('); 255 if(op==string::npos)
256 if(op==string::npos) 256 continue;
257 continue; 257 cmd.erase(0,op+1);
258 cmd.erase(0,op+1); 258 string::size_type cp = cmd.find(')');
259 string::size_type cp = cmd.find(')'); 259 if(cp==string::npos)
260 if(cp==string::npos) 260 continue;
261 continue; 261 cmd.erase(cp);
262 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);