diff options
Diffstat (limited to 'smartt-top/debian/patches/ps_1_options.patch')
| -rw-r--r-- | smartt-top/debian/patches/ps_1_options.patch | 548 |
1 files changed, 548 insertions, 0 deletions
diff --git a/smartt-top/debian/patches/ps_1_options.patch b/smartt-top/debian/patches/ps_1_options.patch new file mode 100644 index 0000000..a03b335 --- /dev/null +++ b/smartt-top/debian/patches/ps_1_options.patch @@ -0,0 +1,548 @@ +Author: Jari Aalto <jari.aalto@cante.net> +Description: Re-sort ps.1 options +Bug-Debian: http://bugs.debian.org/518620 +Reviewed-by: Craig Small <csmall@debian.org> +Index: b/ps/ps.1 +=================================================================== +--- a/ps/ps.1 2009-11-24 21:00:48.000000000 +1100 ++++ b/ps/ps.1 2009-11-24 21:00:49.000000000 +1100 +@@ -158,20 +158,6 @@ + .PP + .\" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + .SH "SIMPLE PROCESS SELECTION" +-.opt \-A +-Select all processes. Identical to \fB\-e\fR. +- +-.opt \-N +-Select all processes except those that fulfill the specified conditions. +-(negates the selection) Identical to \fB\-\-deselect\fR. +- +-.opt T +-Select all processes associated with this terminal. Identical to the +-\fBt\fR option without any argument. +- +-.opt \-a +-Select all processes except both session leaders (see \fIgetsid\fR(2)) and +-processes not associated with a terminal. + + .opt a + Lift the BSD\-style "only yourself" restriction, which is imposed upon +@@ -183,9 +169,20 @@ + list all processes with a terminal (tty), + or to list all processes when used together with the \fBx\fR option. + ++.opt \-A ++Select all processes. Identical to \fB\-e\fR. ++ ++.opt \-a ++Select all processes except both session leaders (see \fIgetsid\fR(2)) and ++processes not associated with a terminal. ++ + .opt \-d + Select all processes except session leaders. + ++.opt \-\-deselect ++Select all processes except those that fulfill the specified conditions. ++(negates the selection) Identical to \fB\-N\fR. ++ + .opt \-e + Select all processes. Identical to \fB\-A\fR. + +@@ -194,11 +191,20 @@ + .\" add in the group leaders -- at least according to the SunOS 4 + .\" man page on the FreeBSD site. Uh oh. I think I had tested SunOS + .\" though, so maybe the code is correct. ++ + .opt g + Really all, even session leaders. This flag is obsolete and may be + discontinued in a future release. It is normally implied by the \fBa\fR flag, + and is only useful when operating in the sunos4 personality. + ++.opt \-N ++Select all processes except those that fulfill the specified conditions. ++(negates the selection) Identical to \fB\-\-deselect\fR. ++ ++.opt T ++Select all processes associated with this terminal. Identical to the ++\fBt\fR option without any argument. ++ + .opt r + Restrict the selection to only running processes. + +@@ -212,10 +218,6 @@ + list all processes owned by you (same EUID as \fBps\fR), + or to list all processes when used together with the \fBa\fR option. + +-.opt \-\-deselect +-Select all processes except those that fulfill the specified conditions. +-(negates the selection) Identical to \fB\-N\fR. +- + .\" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + .PD + .PP +@@ -224,6 +226,13 @@ + or comma\-separated list. They can be used multiple times. + For\ example:\ \fBps\ \-p\ "1\ 2"\ \-p\ 3,4\fR + .P ++ ++.opt \-\fI123\fR ++Identical to \fB\-\-sid\ \fI123\fR. ++ ++.opt \fI123\fR ++Identical to \fB\-\-pid\ \fI123\fR. ++ + .opt \-C \ cmdlist + Select by command name. + .br +@@ -237,24 +246,6 @@ + \fIgrplist\fR list. The real group ID identifies the group of the user + who created the process, see \fIgetgid\fR(2). + +-.opt U \ userlist +-Select by effective user ID (EUID) or name. +-.br +-This selects the processes whose effective user name +-or ID is in \fIuserlist\fR. +-The effective user\ ID describes the user whose file +-access permissions are used by the process +-(see\ \fIgeteuid\fR(2)). +-Identical to \fB\-u\fR and\ \fB\-\-user\fR. +- +-.opt \-U \ userlist +-select by real user ID (RUID) or name. +-.br +-It selects the processes whose real user name or ID is in the +-\fIuserlist\fR list. +-The real user ID identifies the user who created the process, +-see\ \fIgetuid\fR(2). +- + .opt \-g \ grplist + Select by session OR by effective group name. + .br +@@ -266,6 +257,17 @@ + Group ID numbers will work only when some group names are also specified. + See the \fB\-s\fR and \fB\-\-group\fR options. + ++.opt \-\-Group \ grplist ++Select by real group ID (RGID) or name. Identical to \fB\-G\fR. ++ ++.opt \-\-group \ grplist ++Select by effective group ID (EGID) or name. ++.br ++This selects the processes whose effective group name or ID is in ++\fIgrouplist\fR. The effective group ID describes the group whose file ++access permissions are used by the process (see\ \fIgeteuid\fR(2)). ++The \fB\-g\fR option is often an alternative to\ \fB\-\-group\fR. ++ + .opt p \ pidlist + Select by process ID. Identical to \fB\-p\fR and\ \fB\-\-pid\fR. + +@@ -275,12 +277,25 @@ + This selects the processes whose process ID numbers appear in + \fIpidlist\fR. Identical to \fBp\fR and\ \fB\-\-pid\fR. + ++.opt \-\-pid \ pidlist ++Select by process\ ID. Identical to \fB\-p\fR\ and\ \fBp\fR. ++ ++.opt \-\-ppid \ pidlist ++Select by parent process\ ID. ++This selects the processes ++with a parent\ process\ ID in \fRpidlist\fR. ++That\ is, it selects processes that are children ++of those listed in \fRpidlist\fR. ++ + .opt \-s \ sesslist + Select by session ID. + .br + This selects the processes + with a session ID specified in\ \fIsesslist\fR. + ++.opt \-\-sid \ sesslist ++Select by session\ ID. Identical to\ \fB\-s\fR. ++ + .opt t \ ttylist + Select by tty. Nearly identical to \fB\-t\fR and \fB\-\-tty\fR, + but can also be used with an empty \fIttylist\fR to indicate +@@ -297,6 +312,27 @@ + forms: /dev/ttyS1, ttyS1, S1. + A\ plain "\-" may be used to select processes not attached to any terminal. + ++.opt \-\-tty \ ttylist ++Select by terminal. Identical to \fB\-t\fR and\ \fBt\fR. ++ ++.opt U \ userlist ++Select by effective user ID (EUID) or name. ++.br ++This selects the processes whose effective user name ++or ID is in \fIuserlist\fR. ++The effective user\ ID describes the user whose file ++access permissions are used by the process ++(see\ \fIgeteuid\fR(2)). ++Identical to \fB\-u\fR and\ \fB\-\-user\fR. ++ ++.opt \-U \ userlist ++select by real user ID (RUID) or name. ++.br ++It selects the processes whose real user name or ID is in the ++\fIuserlist\fR list. ++The real user ID identifies the user who created the process, ++see\ \fIgetuid\fR(2). ++ + .opt \-u \ userlist + Select by effective user ID (EUID) or name. + .br +@@ -305,46 +341,13 @@ + access permissions are used by the process (see\ \fIgeteuid\fR(2)). + Identical to \fBU\fR and \fB\-\-user\fR. + +-.opt \-\-Group \ grplist +-Select by real group ID (RGID) or name. Identical to \fB\-G\fR. +- + .opt \-\-User \ userlist + Select by real user ID (RUID) or name. Identical to \fB\-U\fR. + +-.opt \-\-group \ grplist +-Select by effective group ID (EGID) or name. +-.br +-This selects the processes whose effective group name or ID is in +-\fIgrouplist\fR. The effective group ID describes the group whose file +-access permissions are used by the process (see\ \fIgeteuid\fR(2)). +-The \fB\-g\fR option is often an alternative to\ \fB\-\-group\fR. +- +-.opt \-\-pid \ pidlist +-Select by process\ ID. Identical to \fB\-p\fR\ and\ \fBp\fR. +- +-.opt \-\-ppid \ pidlist +-Select by parent process\ ID. +-This selects the processes +-with a parent\ process\ ID in \fRpidlist\fR. +-That\ is, it selects processes that are children +-of those listed in \fRpidlist\fR. +- +-.opt \-\-sid \ sesslist +-Select by session\ ID. Identical to\ \fB\-s\fR. +- +-.opt \-\-tty \ ttylist +-Select by terminal. Identical to \fB\-t\fR and\ \fBt\fR. +- + .opt \-\-user \ userlist + Select by effective user ID (EUID) or name. + Identical to \fB\-u\fR and\ \fBU\fR. + +-.opt \-\fI123\fR +-Identical to \fB\-\-sid\ \fI123\fR. +- +-.opt \fI123\fR +-Identical to \fB\-\-pid\ \fI123\fR. +- + .\" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + .PD + .PP +@@ -353,38 +356,12 @@ + The output may differ by personality. + .PP + +-.opt \-F +-extra full format. See the \fB\-f\fR option, which \fB\-F\fR implies. +- +-.opt \-O \ format +-is like \fB\-o\fR, but preloaded with some default columns. +-Identical to \fB\-o\ pid,\fIformat\fB,state,tname,time,command\fR +-or \fB\-o\ pid,\fIformat\fB,tname,time,cmd\fR, see\ \fB\-o\fR\ below. +- +-.opt O \ format +-is preloaded \fBo\fR (overloaded). +-.br +-The BSD \fBO\fR option can act like \fB\-O\fR (user\-defined output +-format with some common fields predefined) or can be used to specify +-sort order. Heuristics are used to determine the behavior of this +-option. To ensure that the desired behavior is obtained (sorting or +-formatting), specify the option in some other way +-(e.g. with \fB\-O\fR or \fB\-\-sort\fR). +-When used as a formatting option, it is identical to \fB\-O\fR, with the +-BSD\ personality. +- +-.opt \-M +-Add a column of security data. Identical to \fBZ\fR. (for\ SE\ Linux) +- +-.opt X +-Register format. +- +-.opt Z +-Add a column of security data. Identical to \fB\-M\fR. (for\ SE\ Linux) +- + .opt \-c + Show different scheduler information for the \fB\-l\fR option. + ++.opt \-\-context ++Display security context format. (for\ SE\ Linux) ++ + .opt \-f + does full\-format listing. This option can be combined with many + other UNIX\-style options to add additional columns. It also causes +@@ -393,6 +370,12 @@ + See the \fBc\fR option, the format keyword \fBargs\fR, and the + format keyword \fBcomm\fR. + ++.opt \-F ++extra full format. See the \fB\-f\fR option, which \fB\-F\fR implies. ++ ++.opt \-\-format \ format ++user\-defined format. Identical to \fB\-o\fR and \fBo\fR. ++ + .opt j + BSD job control format. + +@@ -405,6 +388,26 @@ + .opt \-l + long format. The \fB\-y\fR option is often useful with this. + ++.opt \-M ++Add a column of security data. Identical to \fBZ\fR. (for\ SE\ Linux) ++ ++.opt O \ format ++is preloaded \fBo\fR (overloaded). ++.br ++The BSD \fBO\fR option can act like \fB\-O\fR (user\-defined output ++format with some common fields predefined) or can be used to specify ++sort order. Heuristics are used to determine the behavior of this ++option. To ensure that the desired behavior is obtained (sorting or ++formatting), specify the option in some other way ++(e.g. with \fB\-O\fR or \fB\-\-sort\fR). ++When used as a formatting option, it is identical to \fB\-O\fR, with the ++BSD\ personality. ++ ++.opt \-O \ format ++is like \fB\-o\fR, but preloaded with some default columns. ++Identical to \fB\-o\ pid,\fIformat\fB,state,tname,time,command\fR ++or \fB\-o\ pid,\fIformat\fB,tname,time,cmd\fR, see\ \fB\-o\fR\ below. ++ + .opt o \ format + specify user\-defined format. Identical to \fB\-o\fR and + \fB\-\-format\fR. +@@ -440,15 +443,15 @@ + .opt v + display virtual memory format + ++.opt X ++Register format. ++ + .opt \-y + Do not show flags; show rss in place of addr. + This option can only be used with \fB\-l\fR. + +-.opt \-\-format \ format +-user\-defined format. Identical to \fB\-o\fR and \fBo\fR. +- +-.opt \-\-context +-Display security context format. (for\ SE\ Linux) ++.opt Z ++Add a column of security data. Identical to \fB\-M\fR. (for\ SE\ Linux) + + .\" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + .PD +@@ -459,37 +462,6 @@ + .\" .B C + .\" use raw CPU time for %CPU instead of decaying average + +-.opt \-H +-show process hierarchy (forest) +- +-.opt N \ namelist +-Specify namelist file. Identical to \fB\-n\fR, see \fB\-n\fR above. +- +-.opt O \ order +-Sorting order. (overloaded) +-.br +-The BSD \fBO\fR option can act like \fB\-O\fR (user\-defined output +-format with some common fields predefined) or can be used to specify +-sort order. Heuristics are used to determine the behavior of this +-option. To ensure that the desired behavior is obtained (sorting or +-formatting), specify the option in some other way (e.g. with \fB\-O\fR +-or \fB\-\-sort\fR). +- +-For sorting, obsolete BSD \fBO\fR option syntax is +-\fBO\fR[\fB+\fR|\fB\-\fR]\fIk1\fR[,[\fB+\fR|\fB\-\fR]\fIk2\fR[,...]]. +-It orders the processes listing according to the multilevel sort specified by +-the sequence of one\-letter short keys \fIk1\fR, \fIk2\fR, ... described +-in the \fBOBSOLETE SORT KEYS\fR section below. +-The\ "+" is currently optional, +-merely re\-iterating the default direction on a key, +-but may help to distinguish an \fBO\fR sort from an \fBO\fR format. +-The\ "\-" reverses direction only on the key it precedes. +- +-.opt S +-Sum up some information, such as CPU usage, from dead child processes +-into their parent. This is useful for examining a system where a +-parent process repeatedly forks off short\-lived children to do work. +- + .opt c + Show the true command name. This is derived from the name of the + executable file, rather than from the argv value. Command arguments +@@ -502,12 +474,24 @@ + See the \fB\-f\fR option, the format keyword \fBargs\fR, and the + format keyword \fBcomm\fR. + ++.opt \-\-cols \ n ++set screen width ++ ++.opt \-\-columns \ n ++set screen width ++ ++.opt \-\-cumulative ++include some dead child process data (as a sum with the parent) ++ + .opt e + Show the environment after the command. + + .opt f + ASCII\-art process hierarchy (forest) + ++.opt \-\-forest ++ASCII art process tree ++ + .opt h + No header. (or, one header per screen in the BSD personality) + .br +@@ -521,6 +505,12 @@ + and \fB\-\-no\-headers\fR to enable printing headers each page or + disable headers entirely, respectively. + ++.opt \-H ++show process hierarchy (forest) ++ ++.opt \-\-headers ++repeat header lines, one per page of output ++ + .opt k \ spec + specify sorting order. Sorting syntax is + [\fB+\fR|\fB\-\fR]\fIkey\fR[,[\fB+\fR|\fB\-\fR]\fIkey\fR[,...]] +@@ -557,40 +547,47 @@ + .br + /System.map + ++.opt \-\-lines \ n ++set screen height ++ + .opt n + Numeric output for WCHAN and USER. (including all types of UID and GID) + +-.opt \-w +-Wide output. Use this option twice for unlimited width. +- +-.opt w +-Wide output. Use this option twice for unlimited width. +- +-.opt \-\-cols \ n +-set screen width +- +-.opt \-\-columns \ n +-set screen width +- +-.opt \-\-cumulative +-include some dead child process data (as a sum with the parent) ++.opt N \ namelist ++Specify namelist file. Identical to \fB\-n\fR, see \fB\-n\fR above. + +-.opt \-\-forest +-ASCII art process tree ++.opt O \ order ++Sorting order. (overloaded) ++.br ++The BSD \fBO\fR option can act like \fB\-O\fR (user\-defined output ++format with some common fields predefined) or can be used to specify ++sort order. Heuristics are used to determine the behavior of this ++option. To ensure that the desired behavior is obtained (sorting or ++formatting), specify the option in some other way (e.g. with \fB\-O\fR ++or \fB\-\-sort\fR). + +-.opt \-\-headers +-repeat header lines, one per page of output ++For sorting, obsolete BSD \fBO\fR option syntax is ++\fBO\fR[\fB+\fR|\fB\-\fR]\fIk1\fR[,[\fB+\fR|\fB\-\fR]\fIk2\fR[,...]]. ++It orders the processes listing according to the multilevel sort specified by ++the sequence of one\-letter short keys \fIk1\fR, \fIk2\fR, ... described ++in the \fBOBSOLETE SORT KEYS\fR section below. ++The\ "+" is currently optional, ++merely re\-iterating the default direction on a key, ++but may help to distinguish an \fBO\fR sort from an \fBO\fR format. ++The\ "\-" reverses direction only on the key it precedes. + + .opt \-\-no\-headers + print no header line at all. \-\-no\-heading is an alias for this + option. + +-.opt \-\-lines \ n +-set screen height +- + .opt \-\-rows \ n + set screen height + ++.opt S ++Sum up some information, such as CPU usage, from dead child processes ++into their parent. This is useful for examining a system where a ++parent process repeatedly forks off short\-lived children to do work. ++ + .opt \-\-sort \ spec + specify sorting order. Sorting syntax is + [\fB+\fR|\fB\-\fR]\fIkey\fR[,[\fB+\fR|\fB\-\fR]\fIkey\fR[,...]] +@@ -599,6 +596,12 @@ + lexicographic order. Identical to\ \fBk\fR. + For example: \fBps\ jax\ \-\-sort=uid,\-ppid,+pid\fR + ++.opt w ++Wide output. Use this option twice for unlimited width. ++ ++.opt \-w ++Wide output. Use this option twice for unlimited width. ++ + .opt \-\-width \ n + set screen width + +@@ -614,35 +617,35 @@ + .opt \-L + Show threads, possibly with LWP and NLWP columns + +-.opt \-T +-Show threads, possibly with SPID column +- + .opt m + Show threads after processes + + .opt \-m + Show threads after processes + ++.opt \-T ++Show threads, possibly with SPID column ++ + .\" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + .PD + .PP + .SH "OTHER INFORMATION" + .PD 0 + ++.opt \-\-help ++Print a help message. ++ ++.opt \-\-info ++Print debugging info. ++ + .opt L + List all format specifiers. + +-.opt \-V +-Print the procps version. +- + .opt V + Print the procps version. + +-.opt \-\-help +-Print a help message. +- +-.opt \-\-info +-Print debugging info. ++.opt \-V ++Print the procps version. + + .opt \-\-version + Print the procps version. |