diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:15 +0700 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:15 +0700 |
commit | 5f6f2162512106adf120d4b528bb125e93e34429 (patch) | |
tree | 7d7449f755633c263be7125ad58d21cc3ca5b8a7 /libbb/procps.c | |
parent | 9db69882bee2d528d706d61d34ef7741122330be (diff) | |
parent | a116552869db5e7793ae10968eb3c962c69b3d8c (diff) | |
download | busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.gz busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.bz2 busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'libbb/procps.c')
-rw-r--r-- | libbb/procps.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libbb/procps.c b/libbb/procps.c index ec43b221e..fcf86d9bb 100644 --- a/libbb/procps.c +++ b/libbb/procps.c | |||
@@ -303,6 +303,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags) | |||
303 | goto got_entry; | 303 | goto got_entry; |
304 | closedir(sp->task_dir); | 304 | closedir(sp->task_dir); |
305 | sp->task_dir = NULL; | 305 | sp->task_dir = NULL; |
306 | sp->main_thread_pid = 0; | ||
306 | } | 307 | } |
307 | #endif | 308 | #endif |
308 | entry = readdir(sp->dir); | 309 | entry = readdir(sp->dir); |
@@ -322,6 +323,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags) | |||
322 | char task_dir[sizeof("/proc/%u/task") + sizeof(int)*3]; | 323 | char task_dir[sizeof("/proc/%u/task") + sizeof(int)*3]; |
323 | sprintf(task_dir, "/proc/%u/task", pid); | 324 | sprintf(task_dir, "/proc/%u/task", pid); |
324 | sp->task_dir = xopendir(task_dir); | 325 | sp->task_dir = xopendir(task_dir); |
326 | sp->main_thread_pid = pid; | ||
325 | continue; | 327 | continue; |
326 | } | 328 | } |
327 | #endif | 329 | #endif |