//config: help
//config: Display a tree of processes.
-//applet:IF_PSTREE(APPLET(pstree, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+//applet:IF_PSTREE(APPLET(pstree, BB_DIR_USR_BIN, BB_SUID_DROP))
//kbuild:lib-$(CONFIG_PSTREE) += pstree.o
//usage: "[-p] [PID|USER]"
//usage:#define pstree_full_usage "\n\n"
//usage: "Display process tree, optionally start from USER or PID\n"
-//usage: "\nOptions:"
//usage: "\n -p Show pids"
#include "libbb.h"
struct child;
+#ifdef ENABLE_FEATURE_SHOW_THREADS
+/* For threads, we add {...} around the comm, so we need two extra bytes */
+# define COMM_DISP_LEN (COMM_LEN + 2)
+#else
+# define COMM_DISP_LEN COMM_LEN
+#endif
+
typedef struct proc {
- char comm[COMM_LEN + 1];
+ char comm[COMM_DISP_LEN + 1];
// char flags; - unused, delete?
pid_t pid;
uid_t uid;
#define first_3 "-+-"
struct globals {
- /* 0-based. IOW: the number of chars we printer on current line */
+ /* 0-based. IOW: the number of chars we printed on current line */
unsigned cur_x;
unsigned output_width;
};
#define G (*ptr_to_globals)
#define INIT_G() do { \
- SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+ SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
} while (0)
}
}
-#if ENABLE_FEATURE_CLEAN_UP
-static void maybe_free_buffers(void)
-{
- free(G.width);
- free(G.more);
-}
-#else
-# define maybe_free_buffers() ((void)0)
-#endif
-
/* NB: this function is never called with "bad" chars
* (control chars or chars >= 0x7f)
*/
static void out_char(char c)
{
G.cur_x++;
+ if (G.cur_x > G.output_width)
+ return;
if (G.cur_x == G.output_width)
c = '+';
- if (G.cur_x <= G.output_width)
- putchar(c);
+ putchar(c);
}
/* NB: this function is never called with "bad" chars
dump_by_user(walk->child, uid);
}
+#if ENABLE_FEATURE_SHOW_THREADS
static void handle_thread(const char *comm, pid_t pid, pid_t ppid, uid_t uid)
{
- char threadname[COMM_LEN + 2];
- sprintf(threadname, "{%.*s}", COMM_LEN - 2, comm);
+ char threadname[COMM_DISP_LEN + 1];
+ sprintf(threadname, "{%.*s}", (int)sizeof(threadname) - 3, comm);
add_proc(threadname, pid, ppid, uid/*, 1*/);
}
+#endif
static void mread_proc(void)
{
procps_status_t *p = NULL;
+#if ENABLE_FEATURE_SHOW_THREADS
pid_t parent = 0;
+#endif
int flags = PSSCAN_COMM | PSSCAN_PID | PSSCAN_PPID | PSSCAN_UIDGID | PSSCAN_TASKS;
while ((p = procps_scan(p, flags)) != NULL) {
#endif
{
add_proc(p->comm, p->pid, p->ppid, p->uid/*, 0*/);
+#if ENABLE_FEATURE_SHOW_THREADS
parent = p->pid;
+#endif
}
}
}
INIT_G();
- get_terminal_width_height(1, &G.output_width, NULL);
+ G.output_width = get_terminal_width(0);
+ opt_complementary = "?1";
getopt32(argv, "p");
argv += optind;
if (argv[0]) {
- if (argv[1])
- bb_show_usage();
if (argv[0][0] >= '0' && argv[0][0] <= '9') {
pid = xatoi(argv[0]);
} else {
}
}
- maybe_free_buffers();
+ if (ENABLE_FEATURE_CLEAN_UP) {
+ free(G.width);
+ free(G.more);
+ }
return 0;
}