author | Michael Krelin <hacker@klever.net> | 2004-08-01 20:02:28 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2004-08-01 20:02:28 (UTC) |
commit | 3ae8e764889099513eba9a991e43074421e796ca (patch) (unidiff) | |
tree | 5216651f87b396b07851cc13fd11be52e19b0420 /src/process.cc | |
parent | 2efc8ab6481fd4dcfcd23b5beed4c1369edab1f4 (diff) | |
download | dudki-3ae8e764889099513eba9a991e43074421e796ca.zip dudki-3ae8e764889099513eba9a991e43074421e796ca.tar.gz dudki-3ae8e764889099513eba9a991e43074421e796ca.tar.bz2 |
fixed handling of 'ProcessName' on FreeBSD
-rw-r--r-- | src/process.cc | 32 |
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 | |||
@@ -228,58 +228,68 @@ void process::unprepare_herd() { | |||
228 | } | 228 | } |
229 | void process::gather_proc_info() { | 229 | void process::gather_proc_info() { |
230 | vector<pid_t> allpids; | 230 | vector<pid_t> allpids; |
231 | DIR *pd = opendir("/proc"); | 231 | DIR *pd = opendir("/proc"); |
232 | if(!pd) | 232 | if(!pd) |
233 | throw runtime_error("failed to open /proc"); | 233 | throw runtime_error("failed to open /proc"); |
234 | struct dirent *pde; | 234 | struct dirent *pde; |
235 | pid_t selfpid = getpid(); | 235 | pid_t selfpid = getpid(); |
236 | while(pde=readdir(pd)) { | 236 | while(pde=readdir(pd)) { |
237 | errno=0; | 237 | errno=0; |
238 | pid_t pid = atoi(pde->d_name); | 238 | pid_t pid = atoi(pde->d_name); |
239 | if((!pid) || pid==selfpid) | 239 | if((!pid) || pid==selfpid) |
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) |
275 | cl.erase(0,lsl+1); | 285 | cl.erase(0,lsl+1); |
276 | if(cl.substr(0,cmd.length())==cmd) { | 286 | if(cl.substr(0,cmd.length())==cmd) { |
277 | command = cl; | 287 | command = cl; |
278 | break; | 288 | break; |
279 | } | 289 | } |
280 | } | 290 | } |
281 | procpids.insert(pair<string,pid_t>(cmd,*i)); | 291 | procpids.insert(pair<string,pid_t>(cmd,*i)); |
282 | if((!command.empty()) && cmd!=command) | 292 | if((!command.empty()) && cmd!=command) |
283 | procpids.insert(pair<string,pid_t>(command,*i)); | 293 | procpids.insert(pair<string,pid_t>(command,*i)); |
284 | } | 294 | } |
285 | } | 295 | } |