flask linux cleanup in pstree

diff --git a/ChangeLog b/ChangeLog
index 8270932a40db0f1d451111221dcb43c230856395..7495b36b9993918f5c00a6f64a56c2b448102ab7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ Changes in 21.7
        * configure.in checks for tinfo library
        * both above fixes from ALTLinux
 
+       * Removed old FLASK_LINUX define in pstree
+
 
 
 Changes in 21.6

diff --git a/doc/killall.1 b/doc/killall.1
index 9170f5f5edc6c23d1a3b9982a341750f8f06f5cd..ed169def6d9610b2711de45b57681d2f0046939d 100644 (file)
--- a/doc/killall.1
+++ b/doc/killall.1
@@ -4,13 +4,17 @@ killall \- kill processes by name
 .SH SYNOPSIS
 .ad l
 .B killall
-.RB [ \-Z , \-\-context ]
+.RB [ \-Z , \-\-context 
+.IR pattern ]
 .RB [ \-e , \-\-exact ]
 .RB [ \-g , \-\-process\-group ]
 .RB [ \-i , \-\-interactive ]
 .RB [ \-q , \-\-quiet ]
+.RB [ \-r , \-\-regexp ]
 .RB [ \-s , \-\-signal
 .IR signal ]
+.RB [ \-u , \-\-user 
+.IR user ]
 .RB [ \-v , \-\-verbose ]
 .RB [ \-w , \-\-wait ]
 .RB [ \-I , \-\-ignore-case ]
@@ -30,9 +34,10 @@ sends a signal to all processes running any of the specified commands. If no
 signal name is specified, SIGTERM is sent.
 .PP
 Signals can be specified either by name (e.g. \fB\-HUP\fP) or by number
-(e.g. \fB\-1\fP).
+(e.g. \fB\-1\fP) or by option \fB-s\fP.
 .PP
-If the command name contains a slash (\fB/\fP), processes executing that
+If the command name is not regular expression (option \fB-r\fP)
+and contains a slash (\fB/\fP), processes executing that
 particular file will be selected for killing, independent of their name.
 .PP
 \fBkillall\fP returns a zero return code if at least one process has been

diff --git a/src/pstree.c b/src/pstree.c
index 7d7e7a503fc1b44803b1d9e571e4cb50dab34e81..b0a231610e8c8391b9edde30121d69cfa8fed89d 100644 (file)
--- a/src/pstree.c
+++ b/src/pstree.c
@@ -647,11 +647,11 @@ read_proc (void)
                      while ((dt = readdir(taskdir)) != NULL) {
                         if ((thread=atoi(dt->d_name)) !=0) {
                            if (thread != pid) {
-#ifdef FLASK_LINUX
-                              add_proc(threadname, thread, pid, st.st_uid, NULL, 0, sid);
-#else  /*FLASK_LINUX*/
+#ifdef WITH_SELINUX
+                              add_proc(threadname, thread, pid, st.st_uid, NULL, 0, scontext);
+#else  /*WITH_SELINUX*/
                               add_proc(threadname, thread, pid, st.st_uid, NULL, 0);
-#endif /*FLASK_LINUX*/
+#endif /*WITH_SELINUX*/
                            }
                         }
                      }
@@ -790,7 +790,6 @@ main (int argc, char **argv)
   char termcap_area[1024];
   char *termname;
   int c;
-  char *tmpstr;
 
   if (ioctl (1, TIOCGWINSZ, &winsz) >= 0)
     if (winsz.ws_col)