summaryrefslogtreecommitdiffabout
path: root/src
Unidiff
Diffstat (limited to 'src') (more/less context) (ignore whitespace changes)
-rw-r--r--src/process.cc32
1 files changed, 21 insertions, 11 deletions
diff --git a/src/process.cc b/src/process.cc
index 8a5b5d2..96c874f 100644
--- a/src/process.cc
+++ b/src/process.cc
@@ -240,35 +240,45 @@ void process::gather_proc_info() {
240 continue; 240 continue;
241 allpids.push_back(pid); 241 allpids.push_back(pid);
242 } 242 }
243 closedir(pd); 243 closedir(pd);
244 char s[256]; 244 char s[256];
245 procpids.clear(); 245 procpids.clear();
246 for(vector<pid_t>::const_iterator i=allpids.begin();i!=allpids.end();++i) { 246 for(vector<pid_t>::const_iterator i=allpids.begin();i!=allpids.end();++i) {
247 int r = snprintf(s,sizeof(s),"/proc/%d/stat",*i); 247 int r = snprintf(s,sizeof(s),"/proc/%d/stat",*i);
248 if(r>=sizeof(s) || r<1) 248 if(r>=sizeof(s) || r<1)
249 continue; 249 continue;
250 string cmd; 250 string cmd;
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);
264 if(r>=sizeof(s) || r<1) 274 if(r>=sizeof(s) || r<1)
265 continue; 275 continue;
266 ifstream cs(s,ios::binary); 276 ifstream cs(s,ios::binary);
267 if(!cs) 277 if(!cs)
268 continue; 278 continue;
269 string command; 279 string command;
270 while(cs) { 280 while(cs) {
271 string cl; 281 string cl;
272 getline(cs,cl,(char)0); 282 getline(cs,cl,(char)0);
273 string::size_type lsl = cl.rfind('/'); 283 string::size_type lsl = cl.rfind('/');
274 if(lsl!=string::npos) 284 if(lsl!=string::npos)