Merge branch 'busybox' into merge

2 files changed, 16 insertions, 6 deletions

diff --git a/procps/lsof.c b/procps/lsof.c
index 7e0ffa4e5..b0156a538 100644
--- a/procps/lsof.c
+++ b/procps/lsof.c
@@ -61,9 +61,12 @@ int lsof_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 d_fd = opendir(name);
                 if (d_fd) {
                         while ((entry = readdir(d_fd)) != NULL) {
-                                if (entry->d_type == DT_LNK) {
-                                        safe_strncpy(name + baseofs, entry->d_name, 10);
-                                        fdlink = xmalloc_readlink(name);
+                                /* Skip entries '.' and '..' (and any hidden file) */
+                                if (entry->d_name[0] == '.')
+                                        continue;
+
+                                safe_strncpy(name + baseofs, entry->d_name, 10);
+                                if ((fdlink = xmalloc_readlink(name)) != NULL) {
                                         printf("%d\t%s\t%s\n", proc->pid, proc->exe, fdlink);
                                         free(fdlink);
                                 }
diff --git a/procps/pstree.c b/procps/pstree.c
index 8ba30795d..ed1a41289 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -34,8 +34,15 @@
 
 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;
@@ -341,8 +348,8 @@ static void dump_by_user(PROC *current, uid_t 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