1 --- procps-3.1.15.orig/proc/library.map
2 +++ procps-3.1.15/proc/library.map
5 readproc; readtask; readproctab; readproctab2; look_up_our_self; escape_command;
6 escape_str; escape_strlist;
8 + openproc; closeproc; freeproc;
9 tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; wchan;
10 display_version; procps_version; linux_version_code;
12 --- procps-3.1.15.orig/proc/readproc.c
13 +++ procps-3.1.15/proc/readproc.c
15 // examine a field name (hash and compare)
17 if(unlikely(!*S)) break;
18 - entry = table[63 & (asso[S[3]] + asso[S[2]] + asso[S[0]])];
19 + entry = table[63 & (asso[(int)S[3]] + asso[(int)S[2]] + asso[(int)S[0]])];
20 colon = strchr(S, ':');
21 if(unlikely(!colon)) break;
22 if(unlikely(colon[1]!='\t')) break;
29 do { /* read table: */
30 tab = xrealloc(tab, (n+1)*sizeof(proc_t*));/* realloc as we go, using */
31 tab[n] = readproc_direct(PT, NULL); /* final null to terminate */
32 --- procps-3.1.15.orig/proc/module.mk
33 +++ procps-3.1.15/proc/module.mk
35 # for lib$(NAME).so and /usr/include/($NAME) and such
41 SONAME := lib$(NAME).so.$(LIBVERSION)
43 --- procps-3.1.15.orig/debian/README.Debian
44 +++ procps-3.1.15/debian/README.Debian
46 +README for Debian package of procps
47 +===================================
51 + XConsole and other X-based programs have been finally removed. Look in
52 + the x packages for their equivalents.
56 +pgrep is a new program, using the Unix standard name for something that
57 +greps for processes. If you are looking for Perl compatible regular
58 +expression grep, it is called pcregrep.
62 +Procps upstream is forked. This one comes from procps.sf.net I'm really
63 +not interested when the others have new versions so please don't bug me about
64 +it. However if you see something neat in the others and would like it in
65 +the Debian one, report a *wishlist* level bug about it.
67 + Craig Small <csmall@debian.org>
68 --- procps-3.1.15.orig/debian/copyright
69 +++ procps-3.1.15/debian/copyright
71 +This is the Debian Linux prepackaged version of the /proc file
74 +This package was downloaded from:
75 + http://procps.sourceforge.net/
79 +Werner Almesberger <almesber@di.epfl.ch>, Roger Binns, Charles
80 +Blake <cblake@ucsd.edu>, Brian Edmonds, David Engel <david@ods.com>,
81 +Larry Greenfield <greenfie@gauss.rutgers.edu>, Michael K. Johnson
82 +<johnsonm@sunsite.unc.edu>, Branko Lankester <lankeste@fwi.uva.nl>,
83 +Robert Nation <nation@rocket.sanders.lockheed.com>, Michael Shields
84 +<mjshield@nyx.cs.du.edu>, Henry Ware <al172@yfn.ysu.edu>, Matt
85 +Welsh <mdw@sunsite.unc.edu>, Albert D. Cahalan and Jim C. Warner
86 +<warnerjc@worldnet.att.net>
88 +All programs except ps, skill and snice are copyright by their
89 +authors and redistributable under the terms of the GNU General
90 +Public License. On Debian Linux systems, the complete text of
91 +the GNU General Public License can be found in
92 +`/usr/share/common-licenses/GPL'.
94 +ps, skill and snice are copyright by their authors and redistributable under
95 +the terms of the GNU Library General Public License. On Debian Linux
96 +systems, the complete text of the GNU Library General Public License can
97 +be found in `/usr/share/common/licenses/LGPL'.
98 --- procps-3.1.15.orig/debian/dirs
99 +++ procps-3.1.15/debian/dirs
113 --- procps-3.1.15.orig/debian/docs
114 +++ procps-3.1.15/debian/docs
120 --- procps-3.1.15.orig/debian/examples
121 +++ procps-3.1.15/debian/examples
125 --- procps-3.1.15.orig/debian/libproc-dev.dirs
126 +++ procps-3.1.15/debian/libproc-dev.dirs
130 --- procps-3.1.15.orig/debian/menu
131 +++ procps-3.1.15/debian/menu
133 +?package(procps):needs=text section="Apps/System" title="Top" command="/usr/bin/top" hints="Monitoring"
134 --- procps-3.1.15.orig/debian/postinst
135 +++ procps-3.1.15/debian/postinst
138 +# postinst script for procps
140 +# see: dh_installdeb(1)
144 +# summary of how this script can be called:
145 +# * <postinst> `configure' <most-recently-configured-version>
146 +# * <old-postinst> `abort-upgrade' <new version>
147 +# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
149 +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
150 +# <failed-install-package> <version> `removing'
151 +# <conflicting-package> <version>
152 +# for details, see http://www.debian.org/doc/debian-policy/ or
153 +# the debian-policy package
155 +# quoting from the policy:
156 +# Any necessary prompting should almost always be confined to the
157 +# post-installation script, and should be protected with a conditional
158 +# so that unnecessary prompting doesn't happen if a package's
159 +# installation fails and the `postinst' is called with `abort-upgrade',
160 +# `abort-remove' or `abort-deconfigure'.
164 + if [ -e /etc/psdevtab ] ; then
165 + rm -f /etc/psdevtab
167 + if [ -e /etc/psdatabase ]
169 + rm -f /etc/psdatabase
171 + # Remove old /etc/init.d/procps file, Bug #53818
172 + if [ -e /etc/init.d/procps ]
174 + rm -f /etc/init.d/procps
176 + # Remove old procps init.d script, if it exists Closes: #55137
177 + if [ -e /etc/rcS.d/S30procps ]
179 + update-rc.d procps remove >/dev/null
181 + # and if that didn't work Closes: #92184
182 + if [ -e /etc/rcS.d/S30procps ]
184 + rm -f /etc/rcS.d/S30procps
187 + # Now to do the alternatives for w and ps
188 + update-alternatives --install /usr/bin/w w /usr/bin/w.procps 50 \
189 + --slave /usr/share/man/man1/w.1.gz w.1.gz /usr/share/man/man1/w.procps.1.gz
193 + abort-upgrade|abort-remove|abort-deconfigure)
198 + echo "postinst called with unknown argument \`$1'" >&2
203 +# dh_installdeb will replace this with shell code automatically
204 +# generated by other debhelper scripts.
211 --- procps-3.1.15.orig/debian/prerm
212 +++ procps-3.1.15/debian/prerm
216 +if [ "$1" != "upgrade" ]
218 + update-alternatives --remove w /usr/bin/w.procps
225 --- procps-3.1.15.orig/debian/sysctl.conf
226 +++ procps-3.1.15/debian/sysctl.conf
229 +# /etc/sysctl.conf - Configuration file for setting system variables
230 +# See sysctl.conf (5) for information.
232 +#kernel.domainname = example.com
233 +#net/ipv4/icmp_echo_ignore_broadcasts=1
234 --- procps-3.1.15.orig/debian/watch
235 +++ procps-3.1.15/debian/watch
237 +# Example watch control file for uscan
238 +# Rename this file to "watch" and then you can run the "uscan" command
239 +# to check for upstream updates and more.
240 +# Site Directory Pattern Version Script
241 +sunsite.unc.edu /pub/Linux/Incoming procps-*.tar.gz debian uupdate
243 --- procps-3.1.15.orig/debian/procps.sh
244 +++ procps-3.1.15/debian/procps.sh
247 +# /etc/init.d/procps: Set kernel variables from /etc/sysctl.conf
249 +# written by Elrond <Elrond@Wunder-Nett.org>
251 +# Check for existance of the default file and exit if not there,
252 +# Closes #52839 for the boot-floppy people
253 +[ -r /etc/default/rcS ] || exit 0
256 +[ -x /sbin/sysctl ] || exit 0
260 + start|reload|restart|force-reload)
261 + if [ ! -r /etc/sysctl.conf ]
265 + if [ "$VERBOSE" = "no" ]
270 + echo -n "Setting kernel variables."
274 + eval "/sbin/sysctl $n -p $redir"
280 + echo "Usage: /etc/init.d/procps.sh {start|stop|reload|restart}" >&2
286 --- procps-3.1.15.orig/debian/procps.manpages
287 +++ procps-3.1.15/debian/procps.manpages
290 --- procps-3.1.15.orig/debian/compat
291 +++ procps-3.1.15/debian/compat
294 --- procps-3.1.15.orig/debian/libproc-dev.files
295 +++ procps-3.1.15/debian/libproc-dev.files
297 +usr/include/proc/*.h
299 --- procps-3.1.15.orig/debian/libproc-dev.README
300 +++ procps-3.1.15/debian/libproc-dev.README
302 +README for libproc-dev
303 +======================
305 +This README is for people who want to use the libraries for their own
306 +programs. If you just want to use procps tools you don't need to use this
307 +and you can probably remove libproc-dev too.
309 +It is generally a bad idea to dynamically link to libproc. The API changes
310 +a fair bit and I cannot guarantee that it will stay the same between minor
311 +versions (though it will stay the same between Debian versions). I've now
312 +re-included the libproc.a file so use that.
314 --- procps-3.1.15.orig/debian/patches/20_procps-fix+attr.dpatch
315 +++ procps-3.1.15/debian/patches/20_procps-fix+attr.dpatch
318 +## 20_procps-fix++attr by someone
320 +## All lines beginning with `## DP:' are a description of the patch.
321 +## DP: SELINUX Attr value in /proc
323 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
324 +patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
326 +if [ $# -ne 1 ]; then
327 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
331 + -patch) patch $patch_opts -p1 < $0;;
332 + -unpatch) patch $patch_opts -p1 -R < $0;;
334 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argum
341 +diff -urN procps-3.1.15/ps/output.c procps-3.1.15.new/ps/output.c
342 +--- procps-3.1.15/ps/output.c 2003-12-23 19:46:32.000000000 -0600
343 ++++ procps-3.1.15.new/ps/output.c 2003-12-24 13:31:16.000000000 -0600
346 + // wchan file is suitable for testing
347 + //snprintf(filename, sizeof filename, "/proc/%d/task/%d/wchan", pp->tgid, pp->tid);
348 +- snprintf(filename, sizeof filename, "/proc/%d/task/%d/attr/current", pp->tgid, pp->tid);
349 ++ snprintf(filename, sizeof filename, "/proc/%d/attr/current", pp->tgid);
351 + fd = open(filename, O_RDONLY, 0);
352 + if(likely(fd==-1)) goto fail;
353 +diff -urN procps-3.1.15/ps/parser.c procps-3.1.15.new/ps/parser.c
354 +--- procps-3.1.15/ps/parser.c 2003-12-23 17:58:06.000000000 -0600
355 ++++ procps-3.1.15.new/ps/parser.c 2003-12-24 13:45:08.000000000 -0600
356 +@@ -315,12 +315,10 @@
361 +- case 'Z': /* full Mandatory Access Control level info */
362 +- trace("-Z shows full MAC info\n");
363 +- return "Don't understand MAC on Linux.";
365 ++ trace("-Z shows SELinux contexts\n");
366 ++ format_flags |= FF_Fc;
370 + trace("-a select all with a tty, but omit session leaders.\n");
371 + simple_select |= SS_U_a;
372 --- procps-3.1.15.orig/debian/patches/20_ps.1.dpatch
373 +++ procps-3.1.15/debian/patches/20_ps.1.dpatch
376 +## 20_ps.1.dpatch by Craig Small <csmall@debian.org>
378 +## All lines beginning with `## DP:' are a description of the patch.
379 +## DP: Fix ps manual page
381 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
382 +patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
384 +if [ $# -ne 1 ]; then
385 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
389 + -patch) patch $patch_opts -p1 < $0;;
390 + -unpatch) patch $patch_opts -p1 -R < $0;;
392 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argum
399 +--- procps-3.1.15/ps/ps.1 2003-12-24 12:59:47.000000000 +1100
400 ++++ procps-3.1.15.newps/ps.1 2003-12-26 18:05:01.000000000 +1100
403 ++.\" (The preceding line is a note to broken versions of man to tell
404 + .\" Man page for ps.
405 + .\" Quick hack conversion by Albert Cahalan, 1998.
406 + .\" Licensed under version 2 of the Gnu General Public License.
408 + .\" invented this crap in 1973. Oh yeah, they did. Sorry.
410 + .TH PS 1 "July 5, 1998" "Linux" "Linux User's Manual"
412 +-ps \- report process status
414 ++ps \- report a snapshot of the current processes.
429 + ps gives a snapshot of the current processes. If you want
430 + a repetitive update of this status, use top. This man
431 + page documents the /proc-based version of ps, or tries to.
434 +-COMMAND-LINE OPTIONS
435 ++.SH "COMMAND-LINE OPTIONS"
437 + This version of ps accepts several kinds of options.
440 + when options are preceeded by a dash. The PS_PERSONALITY environment
441 + variable (described below) provides more detailed control of ps behavior.
443 +-SIMPLE PROCESS SELECTION
444 ++.SH "SIMPLE PROCESS SELECTION"
447 + -A select all processes
448 + -N negate selection
449 + -a select all with a tty except session leaders
451 + r restrict output to running processes
452 + x select processes without controlling ttys
453 + --deselect negate selection
456 +-PROCESS SELECTION BY LIST
457 ++.SH "PROCESS SELECTION BY LIST"
460 + -C select by command name
461 + -G select by RGID (supports names)
462 + -U select by RUID (supports names)
464 + --user select by effective user name or ID
468 +-OUTPUT FORMAT CONTROL
470 ++.SH "OUTPUT FORMAT CONTROL"
473 + -O is preloaded "-o"
474 + -F extra full format
475 + -c different scheduler info for -l option
477 + v display virtual memory format
478 + --format user-defined format
479 + --context display security context format (NSA SELinux, etc.)
483 ++.SH "OUTPUT MODIFIERS"
486 + -H show process hierarchy (forest)
487 + -n set namelist file
489 +@@ -123,31 +134,40 @@
490 + --rows set screen height
491 + --sort specify sorting order
492 + --width set screen width
496 ++.SH "THREAD DISPLAY"
499 + -L show threads, possibly with LWP and NLWP columns
500 + -T show threads, possibly with SPID column
501 + -m show threads after processes
502 + H show threads as if they were processes
503 + m show threads after processes
512 + L list all format specifiers
513 + V show version info
514 + --help print help message
515 + --info print debugging info
516 + --version print version
524 + A increases the argument space (DecUnix)
525 + M use alternate core (try -n or N instead)
526 + W get swap info from ... not /dev/drum (try -n or N instead)
527 + k use /vmcore as c-dumpfile (try -n or N instead)
536 + User-defined format options ("o", "-o", "O", and "-O") offer
537 + a way to specify individual output columns. Headers may be
538 +@@ -249,14 +269,17 @@
539 + will be destroyed by init(8) if the parent process exits.
544 ++.SH "PROCESS FLAGS"
547 + FORKNOEXEC 1 forked but didn't exec
548 + SUPERPRIV 4 used super-user privileges
551 ++.SH "PROCESS STATE CODES"
553 +-PROCESS STATE CODES
557 + D uninterruptible sleep (usually IO)
558 + R runnable (on run queue)
560 +@@ -264,23 +287,30 @@
563 + Z a defunct ("zombie") process
566 + For BSD formats and when the "stat" keyword is used, additional
567 + letters may be displayed:
569 +-W has no resident pages
570 +-< high-priority process
571 +-N low-priority task
572 +-L has pages locked into memory (for real-time and custom IO)
574 ++has no resident pages
576 ++high-priority process
580 ++has pages locked into memory (for real-time and custom IO)
586 + Note that the values used in sorting are the internal values ps uses and not
587 + the `cooked' values used in some of the output format fields. Pipe ps
588 + output into the sort(1) command if you want to sort the cooked values.
590 +-KEY LONG DESCRIPTION
593 ++\fBKEY LONG DESCRIPTION\fR
594 + c cmd simple name of executable
595 + C cmdline full command line
596 + f flags flags as in long format F field
597 +@@ -307,14 +337,15 @@
599 + v vsize total VM size in kB
600 + y priority kernel scheduling priority
604 +-AIX FORMAT DESCRIPTORS
605 ++.SH "AIX FORMAT DESCRIPTORS"
607 + This ps supports AIX format descriptors, which work somewhat like the
608 + formatting codes of printf(1) and printf(3). For example, the normal
609 + default output can be produced with this: ps -eo "%p %y %x %c"
616 +@@ -331,14 +362,16 @@
623 +-STANDARD FORMAT SPECIFIERS
624 ++.SH "STANDARD FORMAT SPECIFIERS"
626 + These may be used to control both output format and sorting.
627 + For example: ps -eo pid,user,args --sort user
636 +@@ -459,25 +492,51 @@
642 ++.SH "ENVIRONMENT VARIABLES"
646 +-ENVIRONMENT VARIABLES
647 + The following environment variables could affect ps:
648 +- COLUMNS Override default display width.
649 +- LINES Override default display height.
650 +- PS_PERSONALITY Set to one of posix,old,linux,bsd,sun,digital...
651 +- CMD_ENV Set to one of posix,old,linux,bsd,sun,digital...
652 +- I_WANT_A_BROKEN_PS Force obsolete command line interpretation.
653 +- LC_TIME Date format.
654 +- PS_COLORS Not currently supported.
655 +- PS_FORMAT Default output format override.
656 +- PS_SYSMAP Default namelist (System.map) location.
657 +- PS_SYSTEM_MAP Default namelist (System.map) location.
658 +- POSIXLY_CORRECT Don't find excuses to ignore bad "features".
659 +- UNIX95 Don't find excuses to ignore bad "features".
660 +- _XPG Cancel CMD_ENV=irix non-standard behavior.
664 ++Override default display width.
667 ++Override default display height.
670 ++Set to one of posix,old,linux,bsd,sun,digital...
673 ++Set to one of posix,old,linux,bsd,sun,digital...
675 ++.B I_WANT_A_BROKEN_PS
676 ++Force obsolete command line interpretation.
682 ++Not currently supported.
685 ++Default output format override.
688 ++Default namelist (System.map) location.
691 ++Default namelist (System.map) location.
694 ++Don't find excuses to ignore bad "features".
697 ++Don't find excuses to ignore bad "features".
700 ++Cancel CMD_ENV=irix non-standard behavior.
702 + In general, it is a bad idea to set these variables. The one exception
703 + is CMD_ENV or PS_PERSONALITY, which could be set to Linux for normal
705 + of the Unix98 standard.
712 + 390 like the S/390 OpenEdition ps
714 + bsd like FreeBSD ps (totally non-standard)
724 + To see every process on the system using standard syntax:
726 + To see every process on the system using BSD syntax:
727 +@@ -523,13 +584,13 @@
728 + Print only the process IDs of syslogd:
729 + ps -C syslogd -o pid=
732 +-top(1) pgrep(1) pstree(1) proc(5)
734 ++.BR top (1), pgrep (1), pstree (1), proc (5).
738 + This ps conforms to version 2 of the Single Unix Specification.
742 + ps was originally written by Branko Lankester <lankeste@fwi.uva.nl>. Michael
743 + K. Johnson <johnsonm@redhat.com> re-wrote it significantly to use the proc
744 + filesystem, changing a few things in the process. Michael Shields
746 + <acahalan@cs.uml.edu> rewrote ps for full Unix98 and BSD support, along with
747 + some ugly hacks for obsolete and foreign syntax.
749 +-Please send bug reports to <acahalan@cs.uml.edu>
750 ++Please send bug reports to <procps-feedback@lists.sf.net>.
751 --- procps-3.1.15.orig/debian/patches/20_top_manpage.dpatch
752 +++ procps-3.1.15/debian/patches/20_top_manpage.dpatch
755 +## 20_top_manpage by Randy Hron
757 +## All lines beginning with `## DP:' are a description of the patch.
758 +## DP: Fix bold in top manual page
760 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
761 +patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
763 +if [ $# -ne 1 ]; then
764 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
768 + -patch) patch $patch_opts -p1 < $0;;
769 + -unpatch) patch $patch_opts -p1 -R < $0;;
771 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argum
778 +--- procps/top.1.orig 2003-12-24 15:51:35.000000000 -0500
779 ++++ procps/top.1 2003-12-24 18:57:14.564156176 -0500
781 + .ds CF configuration file
782 + .ds CI interactive command
783 + .ds CO command\-line option
784 +-.ds CW \'current' window
785 ++.ds CW 'current' window
786 + .ds FM full\-screen mode
787 + .ds MP \fBphysical\fR memory
788 + .ds MS \fBshared\fR memory
790 + The task's share of the elapsed \*(PU time since the last screen update, expressed
791 + as a percentage of total \*(PU time.
792 + In a true SMP environment, if 'Irix mode' is \*F, \*(Me will operate in
793 +-\'Solaris mode' where a task's \*(Pu usage will be divided by the total
794 ++'Solaris mode' where a task's \*(Pu usage will be divided by the total
796 + You toggle 'Irix/Solaris' modes with the 'I' \*(CI.
799 + .\" ......................................................................
800 + .SS 2b. SELECTING and ORDERING Columns
801 + .\" ----------------------------------------------------------------------
802 +-After pressing the \*(CIs 'f' (Fields select) or \'o' (Order fields) you will
803 ++After pressing the \*(CIs 'f' (Fields select) or 'o' (Order fields) you will
804 + be shown a screen containing the current \fBfields string\fR followed by names
805 + and descriptions for all fields.
808 + see current status,
811 +-\ \ \'\fB?\fR\' or \'\fBh\fR\' :\fIHelp\fR
812 ++\ \ \<\fB?\fR\> or \<\fBh\fR\> :\fIHelp\fR
813 + There are two help levels available.
814 + The first will provide a reminder of all the basic \*(CIs.
815 + If \*(Me is\fI secured\fR, that screen will be abbreviated.
817 + applicable to \*(AM.
820 +-\ \ \'\fB=\fR\' :\fIExit_Task_Limits\fR
821 ++\ \ \<\fB=\fR\> :\fIExit_Task_Limits\fR
822 + Removes restrictions on which tasks are shown.
823 + This command will reverse any 'i' (idle tasks) and 'n' (max tasks) commands
824 + that might be active.
825 +@@ -593,13 +593,13 @@
826 + When operating in \*(AM this command has a slightly broader meaning.
829 +-\ \ \'\fBA\fR\' :\fIAlternate_Display_Mode_toggle\fR
830 ++\ \ \<\fBA\fR\> :\fIAlternate_Display_Mode_toggle\fR
831 + This command will switch between \*(FM and \*(AM.
832 +-\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight into
833 +-\*(CWs and field groups.
834 ++\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight
835 ++into \*(CWs and field groups.
838 +-\ \ \'\fBB\fR\' :\fIBold_Disable/Enable_toggle\fR
839 ++\ \ \<\fBB\fR\> :\fIBold_Disable/Enable_toggle\fR
840 + This command will influence use of the 'bold' terminfo capability and
841 + alters\fB both\fR the \*(SA and \*(TA for the \*(CW.
842 + While it is intended primarily for use with dumb terminals, it can be
844 + there will be no visual confirmation that they are even on.
847 +-*\ \'\fBd\fR\' or \'\fBs\fR\' :\fIChange_Delay_Time_interval\fR
848 ++*\ \<\fBd\fR\> or \<\fBs\fR\> :\fIChange_Delay_Time_interval\fR
849 + You will be prompted to enter the delay time, in seconds, between
852 +@@ -625,32 +625,32 @@
853 + and view the system summary on the second line.
856 +-\ \ \'\fBG\fR\' :\fIChoose_Another_Window/Field_Group\fR
857 ++\ \ \<\fBG\fR\> :\fIChoose_Another_Window/Field_Group\fR
858 + You will be prompted to enter a number between 1 and 4 designating the
859 + window/field group which should be made the \*(CW.
860 + You will soon grow comfortable with these 4 windows, especially after
861 + experimenting with \*(AM.
864 +-\ \ \'\fBI\fR\' :\fIIrix/Solaris_Mode_toggle\fR
865 ++\ \ \<\fBI\fR\> :\fIIrix/Solaris_Mode_toggle\fR
866 + When operating in 'Solaris mode' ('I' toggled \*F), a task's \*(Pu usage
867 + will be divided by the total number of \*(PUs.
868 + After issuing this command, you'll be informed of the new state of this toggle.
871 +-\ \ \'\fBu\fR\' :\fIselect a user\fR
872 ++\ \ \<\fBu\fR\> :\fIselect a user\fR
873 + You will be prompted for a UID or username. Only processes
874 + belonging to the selected user will be displayed. This option
875 + matches on the effective UID.
878 +-\ \ \'\fBU\fR\' :\fIselect a user\fR
879 ++\ \ \<\fBU\fR\> :\fIselect a user\fR
880 + You will be prompted for a UID or username. Only processes
881 + belonging to the selected user will be displayed. This option
882 + matches on the real, effective, saved, and filesystem UID.
885 +-*\ \'\fBk\fR\' :\fIKill_a_task\fR
886 ++*\ \<\fBk\fR\> :\fIKill_a_task\fR
887 + You will be prompted for a PID and then the signal to send.
888 + The default signal, as reflected in the prompt, is SIGTERM.
889 + However, you can send any signal, via number or name.
890 +@@ -661,24 +661,24 @@
891 + 2) at the signal prompt, type 0
894 +-\ \ \'\fBq\fR\' :\fIQuit\fR
895 ++\ \ \<\fBq\fR\> :\fIQuit\fR
898 +-*\ \'\fBr\fR\' :\fIRenice_a_Task\fR
899 ++*\ \<\fBr\fR\> :\fIRenice_a_Task\fR
900 + You will be prompted for a PID and then the value to nice it to.
901 + Entering a positive value will cause a process to lose priority.
902 + Conversely, a negative value will cause a process to be viewed more
903 + favorably by the kernel.
906 +-\ \ \'\fBW\fR\' :\fIWrite_the_Configuration_File\fR
907 ++\ \ \<\fBW\fR\> :\fIWrite_the_Configuration_File\fR
908 + This will save all of your options and toggles plus the current
909 + display mode and delay time.
910 + By issuing this command just before quitting \*(Me, you will be able restart
911 + later in exactly that same state.
914 +-\ \ \'\fBZ\fR\' :\fIChange_Color_Mapping
915 ++\ \ \<\fBZ\fR\> :\fIChange_Color_Mapping
916 + This key will take you to a separate screen where you can change the
917 + colors for the \*(CW, or for all windows.
918 + For details regarding this \*(CI \*(Xt 3d. COLOR Mapping.
919 +@@ -694,25 +694,25 @@
920 + of messages and prompts.
922 + These commands always impact just the \*(CW/field group.
923 +-\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight into
924 +-\*(CWs and field groups.
925 ++\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight
926 ++into \*(CWs and field groups.
929 +-\ \ \'\fBl\fR\' :\fIToggle_Load_Average/Uptime\fR \*(EM On/Off
930 ++\ \ \<\fBl\fR\> :\fIToggle_Load_Average/Uptime\fR \*(EM On/Off
931 + This is also the line containing the program name (possibly an alias) when
932 + operating in \*(FM or the \*(CW name when operating in \*(AM.
935 +-\ \ \'\fBm\fR\' :\fIToggle_Memory/Swap_Usage\fR \*(EM On/Off
936 ++\ \ \<\fBm\fR\> :\fIToggle_Memory/Swap_Usage\fR \*(EM On/Off
937 + This command affects two \*(SA lines.
940 +-\ \ \'\fBt\fR\' :\fIToggle_Task/Cpu_States\fR \*(EM On/Off
941 ++\ \ \<\fBt\fR\> :\fIToggle_Task/Cpu_States\fR \*(EM On/Off
942 + This command affects from 2 to many \*(SA lines, depending on the state
943 + of the '1' toggle and whether or not \*(Me is running under true SMP.
946 +-\ \ \'\fB1\fR\' :\fIToggle_Single/Separate_Cpu_States\fR \*(EM On/Off
947 ++\ \ \<\fB1\fR\> :\fIToggle_Single/Separate_Cpu_States\fR \*(EM On/Off
948 + This command affects how the 't' command's Cpu States portion is shown.
949 + Although this toggle exists primarily to serve massively-parallel SMP machines,
950 + it is not restricted to solely SMP environments.
951 +@@ -744,12 +744,12 @@
955 +-\ \ \'\fBb\fR\' :\fIBold/Reverse_toggle\fR
956 ++\ \ \<\fBb\fR\> :\fIBold/Reverse_toggle\fR
957 + This command will impact how the 'x' and 'y' toggles are displayed.
958 + Further, it will only be available when at least one of those toggles is \*O.
961 +-\ \ \'\fBx\fR\' :\fIColumn_Highlight_toggle\fR
962 ++\ \ \<\fBx\fR\> :\fIColumn_Highlight_toggle\fR
963 + Changes highlighting for the current sort field.
964 + You probably don't need a constant visual reminder of the sort field and
965 + \*(Me hopes that you always run with 'column highlight' \*F, due to the cost
970 +-\ \ \'\fBy\fR\' :\fIRow_Highlight_toggle\fR
971 ++\ \ \<\fBy\fR\> :\fIRow_Highlight_toggle\fR
972 + Changes highlighting for "running" tasks.
973 + For additional insight into this task state, \*(Xt 2a. DESCRIPTIONS of Fields,
976 + The only costs will be a few additional tty escape sequences.
979 +-\ \ \'\fBz\fR\' :\fIColor/Monochrome_toggle\fR
980 ++\ \ \<\fBz\fR\> :\fIColor/Monochrome_toggle\fR
981 + Switches the \*(CW between your last used color scheme and the older form
982 + of black-on-white or white-on-black.
983 + This command will alter\fB both\fR the \*(SA and \*(TA but does not affect the
984 +@@ -779,20 +779,20 @@
985 + .B CONTENT\fR of \*(TW
988 +-\ \ \'\fBc\fR\' :\fICommand_Line/Program_Name_toggle\fR
989 ++\ \ \<\fBc\fR\> :\fICommand_Line/Program_Name_toggle\fR
990 + This command will be honored whether or not the 'Command' column
991 + is currently visible.
992 + Later, should that field come into view, the change you applied will be seen.
995 +-\ \ \'\fBf\fR\' and \'\fBo\fR\' :\fIFields_select\fR or \fIOrder_fields\fR
996 ++\ \ \<\fBf\fR\> and \<\fBo\fR\> :\fIFields_select\fR or \fIOrder_fields\fR
997 + These keys display separate screens where you can change which
998 + fields are displayed and their order.
999 + For additional information on these \*(CIs
1000 + \*(Xt 2b. SELECTING and ORDERING Columns.
1003 +-\ \ \'\fBS\fR\' :\fICumulative_Time_Mode_toggle\fR
1004 ++\ \ \<\fBS\fR\> :\fICumulative_Time_Mode_toggle\fR
1005 + When 'Cumulative mode' is \*O, each process is listed with the \*(Pu
1006 + time that it and its dead children have used.
1008 +@@ -808,7 +808,7 @@
1009 + effect, simply ask for help and view the window summary on the second line.
1012 +-\ \ \'\fBu\fR\' :\fIShow_Specific_User_Only\fR
1013 ++\ \ \<\fBu\fR\> :\fIShow_Specific_User_Only\fR
1014 + You will be prompted to enter the name of the user to display.
1015 + Thereafter, in that \*(TW only matching User ID's will be shown, or possibly
1016 + no tasks will be shown.
1017 +@@ -821,7 +821,7 @@
1018 + .B SIZE\fR of \*(TW
1021 +-\ \ \'\fBi\fR\' :\fIIdle_Processes_toggle\fR
1022 ++\ \ \<\fBi\fR\> :\fIIdle_Processes_toggle\fR
1023 + Displays all tasks or just active tasks.
1024 + When this toggle is \*F, idled or zombied processes will not be displayed.
1026 +@@ -829,7 +829,7 @@
1027 + affect the window's size, as all prior \*(TDs will have already been painted.
1030 +-\ \ \'\fBn\fR\' or \'#\' :\fISet_Maximum_Tasks\fR
1031 ++\ \ \<\fBn\fR\> or \<\fB#\fR\> :\fISet_Maximum_Tasks\fR
1032 + You will be prompted to enter the number of tasks to display.
1033 + The lessor of your number and available screen rows will be used.
1035 +@@ -868,12 +868,12 @@
1039 +-\ \ \'\fB<\fR\' :\fIMove_Sort_Field_Left\fR
1040 ++\ \ \<\fB<\fR\> :\fIMove_Sort_Field_Left\fR
1041 + Moves the sort column to the left unless the current sort field is
1042 + the first field being displayed.
1045 +-\ \ \'\fB>\fR\' :\fIMove_Sort_Field_Right\fR
1046 ++\ \ \<\fB>\fR\> :\fIMove_Sort_Field_Right\fR
1047 + Moves the sort column to the right unless the current sort field is
1048 + the last field being displayed.
1050 +@@ -884,7 +884,7 @@
1054 +-\ \ \'\fBF\fR\' or \'\fBO\fR\' :\fISelect_Sort_Field\fR
1055 ++\ \ \<\fBF\fR\> or \<\fBO\fR\> :\fISelect_Sort_Field\fR
1056 + These keys display a separate screen where you can change which field
1057 + is used as the sort column.
1059 +@@ -897,7 +897,7 @@
1060 + when running \*(Me with column highlighting turned \*F.
1063 +-\ \ \'\fBR\fR\' :\fIReverse/Normal_Sort_Field_toggle\fR
1064 ++\ \ \<\fBR\fR\> :\fIReverse/Normal_Sort_Field_toggle\fR
1065 + Using this \*(CI you can alternate between high-to-low and low-to-high sorts.
1068 +@@ -974,7 +974,7 @@
1069 + .\" ......................................................................
1070 + .SS 4b. COMMANDS for Windows
1072 +-\ \ \'\fB-\fR\' and \'\fB_\fR\' :\fIShow/Hide_Window(s)_toggles\fR
1073 ++\ \ \<\fB-\fR\> and \<\fB_\fR\> :\fIShow/Hide_Window(s)_toggles\fR
1074 + The '-' key turns the \*(CW's \*(TD \*O and \*F.
1075 + When \*O, that \*(TA will show a minimum of the columns header you've
1076 + established with the 'f' and 'o' commands.
1077 +@@ -988,7 +988,7 @@
1078 + as the only display element.
1081 +-*\ \'\fB=\fR\' and \'\fB+\fR\' :\fIEqualize_(re-balance)_Window(s)\fR
1082 ++*\ \<\fB=\fR\> and \<\fB+\fR\> :\fIEqualize_(re-balance)_Window(s)\fR
1083 + The '=' key forces the \*(CW's \*(TD to be visible.
1084 + It also reverses any 'i' (idle tasks) and 'n' (max tasks) commands that might
1086 +@@ -999,7 +999,7 @@
1087 + except for the 'i' (idle tasks) and 'n' (max tasks) commands.
1090 +-*\ \'\fBA\fR\' :\fIAlternate_Display_Mode_toggle\fR
1091 ++*\ \<\fBA\fR\> :\fIAlternate_Display_Mode_toggle\fR
1092 + This command will switch between \*(FM and \*(AM.
1094 + The first time you issue this command, all four \*(TDs will be shown.
1095 +@@ -1007,7 +1007,7 @@
1096 + chosen to make visible.
1099 +-*\ \'\fBa\fR\' and \'\fBw\fR\' :\fINext_Window_Forward/Backward\fR
1100 ++*\ \<\fBa\fR\> and \<\fBw\fR\> :\fINext_Window_Forward/Backward\fR
1101 + This will change the \*(CW, which in turn changes the window to which
1102 + commands are directed.
1103 + These keys act in a circular fashion so you can reach any desired \*(CW
1104 +@@ -1018,7 +1018,7 @@
1105 + the \*(TD is \*F and many commands will be restricted.
1108 +-*\ \'\fBG\fR\' :\fIChoose_Another_Window/Field_Group\fR
1109 ++*\ \<\fBG\fR\> :\fIChoose_Another_Window/Field_Group\fR
1110 + You will be prompted to enter a number between 1 and 4 designating the
1111 + window/field group which should be made the \*(CW.
1113 +@@ -1027,15 +1027,15 @@
1117 +-\ \ \'\fBg\fR\' :\fIChange_Window/Field_Group_Name\fR
1118 ++\ \ \<\fBg\fR\> :\fIChange_Window/Field_Group_Name\fR
1119 + You will be prompted for a new name to be applied to the \*(CW.
1120 + It does not require that the window name be visible
1121 + (the 'l' toggle to be \*O).
1124 + The \*(CIs shown with an \*(AS have use beyond \*(AM.
1125 +- \'=', 'A', 'G' are always available
1126 +- \'a', 'w' act the same when color mapping
1127 ++ '=', 'A', 'G' are always available
1128 ++ 'a', 'w' act the same when color mapping
1131 + .\" ----------------------------------------------------------------------
1138 --- procps-3.1.15.orig/debian/patches/10_sysctl_quiet.dpatch
1139 +++ procps-3.1.15/debian/patches/10_sysctl_quiet.dpatch
1142 +## 10_sysctl_quiet by Simon Horman
1144 +## All lines beginning with `## DP:' are a description of the patch.
1145 +## DP: Adds quiet -q flag to sysctl
1147 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
1148 +patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
1150 +if [ $# -ne 1 ]; then
1151 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
1155 + -patch) patch $patch_opts -p1 < $0;;
1156 + -unpatch) patch $patch_opts -p1 -R < $0;;
1158 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argum
1165 +diff -ru procps-3.1.8/sysctl.8 procps-3.1.8.new/sysctl.8
1166 +--- procps-3.1.8/sysctl.8 2002-12-12 07:51:32.000000000 +0900
1167 ++++ procps-3.1.8.new/sysctl.8 2003-04-15 20:30:46.000000000 +0900
1170 + .B "sysctl [-n] [-e] variable ..."
1172 +-.B "sysctl [-n] [-e] -w variable=value ..."
1173 ++.B "sysctl [-n] [-e] [-q] -w variable=value ..."
1175 +-.B "sysctl [-n] [-e] -p <filename>"
1176 ++.B "sysctl [-n] [-e] [-q] -p <filename>"
1178 + .B "sysctl [-n] [-e] -a"
1182 + Use this option to ignore errors about unknown keys.
1185 ++Use this option to not display the values set to stdout.
1188 + Use this option when you want to change a sysctl setting.
1190 +diff -ru procps-3.1.8/sysctl.c procps-3.1.8.new/sysctl.c
1191 +--- procps-3.1.8/sysctl.c 2002-12-29 08:26:50.000000000 +0900
1192 ++++ procps-3.1.8.new/sysctl.c 2003-04-15 20:35:08.000000000 +0900
1196 + * - added -p <preload> to preload values from a file
1198 ++ * - added -q to be quiet when modifying values
1200 + * Changes by Albert Cahalan, 2002.
1203 + static bool PrintName;
1204 + static bool PrintNewline;
1205 + static bool IgnoreError;
1206 ++static bool Quiet;
1208 + /* error messages */
1209 + static const char ERR_UNKNOWN_PARAMETER[] = "error: Unknown parameter '%s'\n";
1212 + static int Usage(const char *restrict const name) {
1213 + printf("usage: %s [-n] [-e] variable ... \n"
1214 +- " %s [-n] [-e] -w variable=value ... \n"
1215 ++ " %s [-n] [-e] [-q] -w variable=value ... \n"
1216 + " %s [-n] [-e] -a \n"
1217 +- " %s [-n] [-e] -p <file> (default /etc/sysctl.conf) \n"
1218 ++ " %s [-n] [-e] [-q] -p <file> (default /etc/sysctl.conf) \n"
1219 + " %s [-n] [-e] -A\n", name, name, name, name, name);
1222 +@@ -290,13 +293,14 @@
1223 + fprintf(fp, "%s\n", value);
1229 ++ } else if (PrintName) {
1230 + fprintf(stdout, "%s = %s\n", outname, value);
1231 ++ } else if (PrintNewline) {
1232 ++ fprintf(stdout, "%s\n", value);
1234 +- if (PrintNewline)
1235 +- fprintf(stdout, "%s\n", value);
1237 +- fprintf(stdout, "%s", value);
1238 ++ fprintf(stdout, "%s", value);
1242 +@@ -377,6 +381,7 @@
1244 + PrintNewline = true;
1245 + IgnoreError = false;
1250 +@@ -419,6 +424,9 @@
1251 + preloadfile = *argv;
1253 + return Preload(preloadfile);
1257 + case 'a': /* string and integer values (for Linux, all of them) */
1258 + case 'A': /* the above, including "opaques" (would be unprintable) */
1259 + case 'X': /* the above, with opaques completly printed in hex */
1260 --- procps-3.1.15.orig/debian/patches/00list
1261 +++ procps-3.1.15/debian/patches/00list
1268 --- procps-3.1.15.orig/debian/patches/30_remove_test_dir.dpatch
1269 +++ procps-3.1.15/debian/patches/30_remove_test_dir.dpatch
1272 +## 30_remove_test-dir by Craif Small
1274 +## All lines beginning with `## DP:' are a description of the patch.
1275 +## DP: Removing test directory
1276 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
1277 +patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
1279 +if [ $# -ne 1 ]; then
1280 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
1284 + -patch) patch $patch_opts -p1 < $0;;
1285 + -unpatch) patch $patch_opts -p1 -R < $0;;
1287 + echo >&2 "`basename $0`: script expects -patch|-unpatch as argum
1294 +diff -ruN procps-3.1.15.old/test/clone-army.c procps-3.1.15/test/clone-army.c
1295 +--- procps-3.1.15.old/test/clone-army.c 2003-10-05 04:46:34.000000000 +1000
1296 ++++ procps-3.1.15/test/clone-army.c 1970-01-01 10:00:00.000000000 +1000
1298 +-// ps fTo sess,pgid,pid,tty,ppid,tpgid,args -C a.out
1300 +-#include <sys/types.h>
1301 +-#include <unistd.h>
1302 +-#include <signal.h>
1303 +-//#include <sys/stat.h>
1304 +-//#include <fcntl.h>
1305 +-//#include <stdlib.h>
1306 +-#include <stdio.h>
1307 +-#include <sched.h>
1310 +-#define CLONE_VM 0x00000100 // set if VM shared between processes
1311 +-#define CLONE_FS 0x00000200 // set if fs info shared between processes
1312 +-#define CLONE_FILES 0x00000400 // set if open files shared between processes
1313 +-#define CLONE_SIGHAND 0x00000800 // set if signal handlers and blocked signals shared
1314 +-#define CLONE_IDLETASK 0x00001000 // set if new pid should be 0 (kernel only)*/
1315 +-#define CLONE_PTRACE 0x00002000 // set if we want to let tracing continue on the child too
1316 +-#define CLONE_VFORK 0x00004000 // set if the parent wants the child to wake it up on mm_release
1317 +-#define CLONE_PARENT 0x00008000 // set if we want to have the same parent as the cloner
1318 +-#define CLONE_THREAD 0x00010000 // Same thread group?
1319 +-#define CLONE_NEWNS 0x00020000 // New namespace group?
1320 +-#define CLONE_SYSVSEM 0x00040000 // share system V SEM_UNDO semantics
1321 +-#define CLONE_SETTLS 0x00080000 // create a new TLS for the child
1322 +-#define CLONE_PARENT_SETTID 0x00100000 // set the TID in the parent
1323 +-#define CLONE_CHILD_CLEARTID 0x00200000 // clear the TID in the child
1324 +-#define CLONE_DETACHED 0x00400000 // parent wants no child-exit signal
1325 +-#define CLONE_UNTRACED 0x00800000 // set if the tracing process can't force CLONE_PTRACE on this clone
1326 +-#define CLONE_CHILD_SETTID 0x01000000 // set the TID in the child
1327 +-#define CLONE_STOPPED 0x02000000 // Start in stopped state
1330 +-#ifndef CLONE_THREAD
1331 +-#define CLONE_THREAD 0x00010000
1333 +-#ifndef CLONE_DETACHED
1334 +-#define CLONE_DETACHED 0x00400000
1338 +-// interesting: VM FS FILES SIGHAND PARENT THREAD SYSVSEM DETACHED
1340 +-//#define FLAGS (CLONE_PARENT|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_SYSVSEM)
1341 +-#define FLAGS (CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_DETACHED)
1343 +-// Don't cause rejection: FS FILES SYSVSEM PARENT
1344 +-// Do cause rejection:
1346 +-static void printflags(int pass, unsigned flags){
1348 +- "%s %08x %s %s %s %s\n",
1349 +- pass?"pass":"FAIL",
1351 +- (flags&CLONE_THREAD) ? "THREAD" : "______",
1352 +- (flags&CLONE_DETACHED) ? "DETACHED" : "________",
1353 +- (flags&CLONE_SIGHAND) ? "SIGHAND" : "_______",
1354 +- (flags&CLONE_SIGHAND) ? "VM" : "__"
1358 +-static unsigned genflags(unsigned flags){
1360 +- (flags&0x08) ? 0 : CLONE_THREAD
1362 +- (flags&0x04) ? 0 : CLONE_DETACHED
1364 +- (flags&0x02) ? 0 : CLONE_SIGHAND
1366 +- (flags&0x01) ? 0 : CLONE_VM
1370 +-//static pid_t one;
1372 +-//static void die(int signo){
1377 +-//static void sigchld_handler(int signo){
1379 +-// kill(one,SIGHUP); // kill parent
1382 +-static int clone_fn(void *vp){
1386 +-static long clone_stack_data[2048];
1388 +-static long *clone_stack = &clone_stack_data[0];
1390 +-static long *clone_stack = &clone_stack_data[2048];
1393 +-int main(int argc, char *argv[]){
1399 +-// one = getpid();
1400 +-// signal(SIGHUP,die);
1401 +-// if(fork()) hang(); // parent later killed as readyness signal
1406 +- unsigned f = genflags(u);
1407 +- minime = clone(clone_fn, clone_stack, f, "arg");
1409 +- printflags(minime!=-1, f);
1410 +-// if(minime==-1){
1411 +-// perror("no clone");
1415 +-// printf("%d begat %d\n",getpid(),minime);
1419 +-// kill(one,SIGHUP); // let the shell know we're ready
1425 +diff -ruN procps-3.1.15.old/test/clone-once.c procps-3.1.15/test/clone-once.c
1426 +--- procps-3.1.15.old/test/clone-once.c 2003-10-20 10:56:12.000000000 +1000
1427 ++++ procps-3.1.15/test/clone-once.c 1970-01-01 10:00:00.000000000 +1000
1429 +-#include <sys/types.h>
1430 +-#include <unistd.h>
1431 +-#include <signal.h>
1432 +-//#include <sys/stat.h>
1433 +-//#include <fcntl.h>
1434 +-//#include <stdlib.h>
1435 +-#include <stdio.h>
1436 +-#include <sched.h>
1439 +-#define CLONE_VM 0x00000100 // set if VM shared between processes
1440 +-#define CLONE_FS 0x00000200 // set if fs info shared between processes
1441 +-#define CLONE_FILES 0x00000400 // set if open files shared between processes
1442 +-#define CLONE_SIGHAND 0x00000800 // set if signal handlers and blocked signals shared
1443 +-#define CLONE_IDLETASK 0x00001000 // set if new pid should be 0 (kernel only)*/
1444 +-#define CLONE_PTRACE 0x00002000 // set if we want to let tracing continue on the child too
1445 +-#define CLONE_VFORK 0x00004000 // set if the parent wants the child to wake it up on mm_release
1446 +-#define CLONE_PARENT 0x00008000 // set if we want to have the same parent as the cloner
1447 +-#define CLONE_THREAD 0x00010000 // Same thread group?
1448 +-#define CLONE_NEWNS 0x00020000 // New namespace group?
1449 +-#define CLONE_SYSVSEM 0x00040000 // share system V SEM_UNDO semantics
1450 +-#define CLONE_SETTLS 0x00080000 // create a new TLS for the child
1451 +-#define CLONE_PARENT_SETTID 0x00100000 // set the TID in the parent
1452 +-#define CLONE_CHILD_CLEARTID 0x00200000 // clear the TID in the child
1453 +-#define CLONE_DETACHED 0x00400000 // parent wants no child-exit signal
1454 +-#define CLONE_UNTRACED 0x00800000 // set if the tracing process can't force CLONE_PTRACE on this clone
1455 +-#define CLONE_CHILD_SETTID 0x01000000 // set the TID in the child
1456 +-#define CLONE_STOPPED 0x02000000 // Start in stopped state
1459 +-#ifndef CLONE_THREAD
1460 +-#define CLONE_THREAD 0x00010000
1462 +-#ifndef CLONE_DETACHED
1463 +-#define CLONE_DETACHED 0x00400000
1466 +-//#define FLAGS (CLONE_PARENT|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_SYSVSEM)
1467 +-#define FLAGS (CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_DETACHED)
1471 +-static void die(int signo){
1476 +-//static void sigchld_handler(int signo){
1478 +-// kill(one,SIGHUP); // kill parent
1481 +-static void hang(void){
1485 +-static int clone_fn(void *vp){
1486 +-// const char msg[] = "I think I'm a clone now!\n";
1488 +-// write(STDOUT_FILENO, msg, sizeof(msg)-1);
1490 +- return 0; // keep gcc happy
1493 +-static long clone_stack_data[2048];
1495 +-static long *clone_stack = &clone_stack_data[0];
1497 +-static long *clone_stack = &clone_stack_data[2048];
1500 +-int main(int argc, char *argv[]){
1506 +- signal(SIGHUP,die);
1507 +- if(fork()) hang(); // parent later killed as readyness signal
1510 +- minime = clone(clone_fn, clone_stack, FLAGS, "arg");
1513 +- perror("no clone");
1514 +- kill(one,SIGKILL);
1518 +-// printf("%d begat %d\n",getpid(),minime);
1520 +- kill(one,SIGHUP); // let the shell know we're ready
1526 +diff -ruN procps-3.1.15.old/test/fork-you.c procps-3.1.15/test/fork-you.c
1527 +--- procps-3.1.15.old/test/fork-you.c 2003-09-05 14:18:30.000000000 +1000
1528 ++++ procps-3.1.15/test/fork-you.c 1970-01-01 10:00:00.000000000 +1000
1530 +-#include <sys/types.h>
1531 +-#include <unistd.h>
1532 +-#include <signal.h>
1534 +-static void die(int signo){
1539 +-static void hang(void){
1543 +-int main(int argc, char *argv[]){
1549 +- signal(SIGHUP,die);
1550 +- if(fork()) hang(); // parent later killed as readyness signal
1551 +- kill(1,9); // "kill" unkillable init to touch lib pages
1552 +- while(argc--) if(!fork()) hang();
1553 +- kill(pid,SIGHUP); // kill parent
1557 +diff -ruN procps-3.1.15.old/test/funny-thing.c procps-3.1.15/test/funny-thing.c
1558 +--- procps-3.1.15.old/test/funny-thing.c 2003-09-08 13:55:57.000000000 +1000
1559 ++++ procps-3.1.15/test/funny-thing.c 1970-01-01 10:00:00.000000000 +1000
1561 +-#include <sys/types.h>
1562 +-#include <unistd.h>
1563 +-#include <signal.h>
1567 +-static void die(int signo){
1572 +-static void hang(void){
1576 +-int main(int argc, char *argv[]){
1581 +- signal(SIGHUP,die);
1582 +- if(fork()) hang(); // parent later killed as readyness signal
1584 +- // second one exits, to enable setsid(), and the resulting
1585 +- // zombie will be reaped by init after 1st process killed
1586 +- if(!fork()) _exit(0);
1588 +- if(setsid()==-1){
1589 +- kill(one,SIGKILL); // hopefully the shell will complain
1590 +- _exit(42); // kind of tough to report errors
1593 +- kill(one,SIGHUP); // let the shell know we're ready
1599 +diff -ruN procps-3.1.15.old/test/gigabyte.c procps-3.1.15/test/gigabyte.c
1600 +--- procps-3.1.15.old/test/gigabyte.c 2003-09-11 10:23:56.000000000 +1000
1601 ++++ procps-3.1.15/test/gigabyte.c 1970-01-01 10:00:00.000000000 +1000
1603 +-#include <sys/types.h>
1604 +-#include <unistd.h>
1605 +-#include <signal.h>
1606 +-//#include <sys/ioctl.h>
1607 +-//#include <sys/stat.h>
1608 +-//#include <fcntl.h>
1609 +-#include <stdio.h>
1610 +-#include <sys/mman.h>
1612 +-static void die(int signo){
1617 +-static void hang(void){
1621 +-#ifndef MAP_NORESERVE
1622 +-#define MAP_NORESERVE 0
1625 +-int main(int argc, char *argv[]){
1628 +- size_t length = 1024*1024*1024;
1629 +- unsigned maps; // how many mappings to do
1634 +- if(sizeof(void*)==8){
1644 +- signal(SIGHUP,die);
1645 +- if(fork()) hang(); // parent later killed as readyness signal
1652 +- PROT_READ|PROT_WRITE,
1653 +- MAP_PRIVATE|MAP_NORESERVE|MAP_ANONYMOUS,
1657 +- if(vp==MAP_FAILED){
1658 +- // try a smaller size; maybe fragmentation stopped us
1664 +- if(maps>200 || length<2*1024*1024){
1665 +- kill(pid,SIGKILL); // hopefully the shell will complain
1673 +- kill(pid,SIGHUP); // kill parent
1677 +diff -ruN procps-3.1.15.old/test/got-no-tty.c procps-3.1.15/test/got-no-tty.c
1678 +--- procps-3.1.15.old/test/got-no-tty.c 2003-09-05 14:17:57.000000000 +1000
1679 ++++ procps-3.1.15/test/got-no-tty.c 1970-01-01 10:00:00.000000000 +1000
1681 +-#include <sys/types.h>
1682 +-#include <unistd.h>
1683 +-#include <signal.h>
1684 +-#include <sys/ioctl.h>
1685 +-#include <sys/stat.h>
1686 +-#include <fcntl.h>
1687 +-#include <stdio.h>
1689 +-static void die(int signo){
1694 +-static void hang(void){
1698 +-int main(int argc, char *argv[]){
1706 +- signal(SIGHUP,die);
1707 +- if(fork()) hang(); // parent later killed as readyness signal
1710 +- // Use the TIOCNOTTY ioctl to detach from the tty
1711 +- // and, supposedly, set the process group ID to zero.
1712 +- // Reality: PGRP unchanged, TPGID becomes -1, TTY lost.
1713 +- fd = open("/dev/tty", O_RDONLY);
1715 +- perror("open /dev/tty");
1718 +- if(ioctl(fd, TIOCNOTTY)==-1){
1719 +- perror("open /dev/tty");
1723 +- kill(pid,SIGHUP); // kill parent
1727 +diff -ruN procps-3.1.15.old/test/mini-me.c procps-3.1.15/test/mini-me.c
1728 +--- procps-3.1.15.old/test/mini-me.c 2003-09-22 05:50:38.000000000 +1000
1729 ++++ procps-3.1.15/test/mini-me.c 1970-01-01 10:00:00.000000000 +1000
1731 +-// ps fTo sess,pgid,pid,tty,ppid,tpgid,args -C a.out
1733 +-#include <sys/types.h>
1734 +-#include <unistd.h>
1735 +-#include <signal.h>
1736 +-//#include <sys/stat.h>
1737 +-//#include <fcntl.h>
1738 +-//#include <stdlib.h>
1739 +-#include <stdio.h>
1740 +-#include <sched.h>
1743 +-#define CLONE_VM 0x00000100 // set if VM shared between processes
1744 +-#define CLONE_FS 0x00000200 // set if fs info shared between processes
1745 +-#define CLONE_FILES 0x00000400 // set if open files shared between processes
1746 +-#define CLONE_SIGHAND 0x00000800 // set if signal handlers and blocked signals shared
1747 +-#define CLONE_IDLETASK 0x00001000 // set if new pid should be 0 (kernel only)*/
1748 +-#define CLONE_PTRACE 0x00002000 // set if we want to let tracing continue on the child too
1749 +-#define CLONE_VFORK 0x00004000 // set if the parent wants the child to wake it up on mm_release
1750 +-#define CLONE_PARENT 0x00008000 // set if we want to have the same parent as the cloner
1751 +-#define CLONE_THREAD 0x00010000 // Same thread group?
1752 +-#define CLONE_NEWNS 0x00020000 // New namespace group?
1753 +-#define CLONE_SYSVSEM 0x00040000 // share system V SEM_UNDO semantics
1754 +-#define CLONE_SETTLS 0x00080000 // create a new TLS for the child
1755 +-#define CLONE_PARENT_SETTID 0x00100000 // set the TID in the parent
1756 +-#define CLONE_CHILD_CLEARTID 0x00200000 // clear the TID in the child
1757 +-#define CLONE_DETACHED 0x00400000 // parent wants no child-exit signal
1758 +-#define CLONE_UNTRACED 0x00800000 // set if the tracing process can't force CLONE_PTRACE on this clone
1759 +-#define CLONE_CHILD_SETTID 0x01000000 // set the TID in the child
1760 +-#define CLONE_STOPPED 0x02000000 // Start in stopped state
1763 +-#ifndef CLONE_THREAD
1764 +-#define CLONE_THREAD 0x00010000
1766 +-#ifndef CLONE_DETACHED
1767 +-#define CLONE_DETACHED 0x00400000
1770 +-//#define FLAGS (CLONE_PARENT|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_SYSVSEM)
1771 +-#define FLAGS (CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_DETACHED)
1773 +-//static pid_t one;
1775 +-//static void die(int signo){
1780 +-//static void sigchld_handler(int signo){
1782 +-// kill(one,SIGHUP); // kill parent
1785 +-static void hang(void){
1789 +-static int clone_fn(void *vp){
1790 +- const char msg[] = "I think I'm a clone now!\n";
1791 +- write(STDOUT_FILENO, msg, sizeof(msg)-1);
1795 +-static long clone_stack_data[2048];
1797 +-static long *clone_stack = &clone_stack_data[0];
1799 +-static long *clone_stack = &clone_stack_data[2048];
1802 +-int main(int argc, char *argv[]){
1807 +-// one = getpid();
1808 +-// signal(SIGHUP,die);
1809 +-// if(fork()) hang(); // parent later killed as readyness signal
1812 +- minime = clone(clone_fn, clone_stack, FLAGS, "arg");
1815 +-// kill(one,SIGKILL);
1816 +- perror("no clone");
1820 +- printf("%d begat %d\n",getpid(),minime);
1822 +-// kill(one,SIGHUP); // let the shell know we're ready
1828 +diff -ruN procps-3.1.15.old/test/module.mk procps-3.1.15/test/module.mk
1829 +--- procps-3.1.15.old/test/module.mk 2003-12-25 02:02:52.000000000 +1100
1830 ++++ procps-3.1.15/test/module.mk 1970-01-01 10:00:00.000000000 +1000
1832 +-# This file gets included into the main Makefile, in the top directory.
1834 +-#INSTALL += $(bin)test $(man1)test.1 -- some data dump thing maybe?
1836 +-# directories for cleaning
1837 +-DIRS += test/ $(wildcard test/*/*/)
1839 +-TEST_C := fork-you the_living_dead got-no-tty sidious sid-breaks-ttys \
1840 +- gigabyte mini-me funny-thing clone-army clone-once
1841 +-TESTNAMES := $(addprefix test/,$(TEST_C))
1842 +-TESTOBJ := $(addsuffix .o,$(TESTNAMES))
1843 +-TESTSRC := $(addsuffix .c,$(TESTNAMES)) test/th.c
1846 +-ALL += $(TESTNAMES)
1849 +-TEST_JUNK := stderr stdout header stderr.test stderr.good
1850 +-CLEAN += $(addprefix test/,$(TEST_JUNK)) $(TESTNAMES) test/th $(wildcard test/*.tmp)
1852 +-TEST_X := module.mk script-child onetest runtests
1853 +-TARFILES += $(TESTSRC) $(addprefix test/,$(TEST_X)) $(wildcard test/*/*)
1855 +-$(TESTNAMES): %: %.o
1856 +- $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^
1858 +-# add proc/$(SONAME) on the end later if needed
1859 +-$(TESTOBJ): %.o: %.c
1860 +- $(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $< -o $@
1862 +-test/th: test/th.o
1863 +- $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -lpthread
1865 +-test/th.o: test/th.c
1866 +- $(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $< -o $@
1868 +diff -ruN procps-3.1.15.old/test/onetest procps-3.1.15/test/onetest
1869 +--- procps-3.1.15.old/test/onetest 2003-12-25 02:02:08.000000000 +1100
1870 ++++ procps-3.1.15/test/onetest 1970-01-01 10:00:00.000000000 +1000
1874 +-unset I_WANT_A_BROKEN_PS
1875 +-unset PS_PERSONALITY
1885 +-# enlarge as needed in setup to avoid COMMAND becoming COMMA, etc.
1886 +-export COLUMNS=111
1888 +-: ${LD_LIBRARY_PATH:=../proc}
1889 +-: ${TESTME:=../ps/ps}
1890 +-export LD_LIBRARY_PATH
1891 +-export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH # if ever a darwin port
1896 +-$TESTME $ARGS > stdout 2> stderr
1898 +-if [ x$KILLFN == x1 ] ; then
1904 +-if [ x$RESULT != x$GOOD ] ; then
1905 +- echo FAIL $TESTNAME err-$RESULT
1909 +-rm -f stderr.test ; touch stderr.test
1910 +-if [ -f stderr ] ; then
1911 +- head -3 < stderr > stderr.test
1913 +-rm -f stderr.good ; touch stderr.good
1914 +-if [ -f $TESTNAME/stderr ] ; then
1915 +- head -3 < $TESTNAME/stderr > stderr.good
1917 +-diff -Naurd stderr.test stderr.good >> /dev/null
1918 +-if [ x$? != x0 ] ; then
1919 +- echo FAIL $TESTNAME wrong-stderr
1923 +-if [ -f $TESTNAME/header ] ; then
1924 +- (printf ' ' ; head -1 stdout) | tr -s ' ' > header
1925 +- diff -Naurd header $TESTNAME/header >> /dev/null
1926 +- if [ x$? != x0 ] ; then
1927 +- echo FAIL $TESTNAME wrong-header
1932 +-if [ x$EVALFN == x1 ] ; then
1934 +- if [ x$? != x0 ] ; then
1935 +- echo FAIL $TESTNAME eval-fn
1940 +-echo pass $TESTNAME a-ok
1942 +diff -ruN procps-3.1.15.old/test/ps/LT-mix/header procps-3.1.15/test/ps/LT-mix/header
1943 +--- procps-3.1.15.old/test/ps/LT-mix/header 2003-10-02 12:38:29.000000000 +1000
1944 ++++ procps-3.1.15/test/ps/LT-mix/header 1970-01-01 10:00:00.000000000 +1000
1947 +\ No newline at end of file
1948 +diff -ruN procps-3.1.15.old/test/ps/LT-mix/setup procps-3.1.15/test/ps/LT-mix/setup
1949 +--- procps-3.1.15.old/test/ps/LT-mix/setup 2003-10-02 12:39:40.000000000 +1000
1950 ++++ procps-3.1.15/test/ps/LT-mix/setup 1970-01-01 10:00:00.000000000 +1000
1954 +diff -ruN procps-3.1.15.old/test/ps/LT-mix/stderr procps-3.1.15/test/ps/LT-mix/stderr
1955 +--- procps-3.1.15.old/test/ps/LT-mix/stderr 2003-10-02 12:40:03.000000000 +1000
1956 ++++ procps-3.1.15/test/ps/LT-mix/stderr 1970-01-01 10:00:00.000000000 +1000
1958 +-ERROR: Thread flags conflict; can't use both -L and -T.
1959 +-********* simple selection ********* ********* selection by list *********
1960 +--A all processes -C by command name
1961 +--N negate selection -G by real group ID (supports names)
1962 +--a all w/ tty except session leaders -U by real user ID (supports names)
1963 +--d all except session leaders -g by session leader OR by group name
1964 +--e all processes -p by process ID
1965 +-T all processes on this terminal -s processes in the sessions given
1966 +-a all w/ tty, including other users -t by tty
1967 +-g all, even group leaders! -u by effective user ID (supports names)
1968 +-r only running processes U processes for specified users
1969 +-x processes w/o controlling ttys t by tty
1970 +-*********** output format ********** *********** long options ***********
1971 +--o,o user-defined -f full --Group --User --pid --cols --ppid
1972 +--j,j job control s signal --group --user --sid --rows
1973 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
1974 +--l,l long u user-oriented --sort --tty --forest --version
1975 +--F extra full X registers --heading --no-heading
1976 +- ********* misc options *********
1977 +--V,V show version L list format codes f ASCII art forest
1978 +--m,m show threads S children in sum -y change -l format
1979 +--n,N set namelist file c true command name n numeric WCHAN,UID
1980 +--w,w wide output e show environment -H process hierarchy
1981 +diff -ruN procps-3.1.15.old/test/ps/O-O/header procps-3.1.15/test/ps/O-O/header
1982 +--- procps-3.1.15.old/test/ps/O-O/header 2003-10-02 12:01:36.000000000 +1000
1983 ++++ procps-3.1.15/test/ps/O-O/header 1970-01-01 10:00:00.000000000 +1000
1986 +\ No newline at end of file
1987 +diff -ruN procps-3.1.15.old/test/ps/O-O/setup procps-3.1.15/test/ps/O-O/setup
1988 +--- procps-3.1.15.old/test/ps/O-O/setup 2003-10-02 12:02:01.000000000 +1000
1989 ++++ procps-3.1.15/test/ps/O-O/setup 1970-01-01 10:00:00.000000000 +1000
1991 +-ARGS="-O wchan -O sess"
1993 +diff -ruN procps-3.1.15.old/test/ps/O-O/stderr procps-3.1.15/test/ps/O-O/stderr
1994 +--- procps-3.1.15.old/test/ps/O-O/stderr 2003-10-02 12:05:19.000000000 +1000
1995 ++++ procps-3.1.15/test/ps/O-O/stderr 1970-01-01 10:00:00.000000000 +1000
1997 +-ERROR: option -O can not follow other format options.
1998 +-********* simple selection ********* ********* selection by list *********
1999 +--A all processes -C by command name
2000 +--N negate selection -G by real group ID (supports names)
2001 +--a all w/ tty except session leaders -U by real user ID (supports names)
2002 +--d all except session leaders -g by session leader OR by group name
2003 +--e all processes -p by process ID
2004 +-T all processes on this terminal -s processes in the sessions given
2005 +-a all w/ tty, including other users -t by tty
2006 +-g all, even group leaders! -u by effective user ID (supports names)
2007 +-r only running processes U processes for specified users
2008 +-x processes w/o controlling ttys t by tty
2009 +-*********** output format ********** *********** long options ***********
2010 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2011 +--j,j job control s signal --group --user --sid --rows
2012 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2013 +--l,l long u user-oriented --sort --tty --forest --version
2014 +--F extra full X registers --heading --no-heading
2015 +- ********* misc options *********
2016 +--V,V show version L list format codes f ASCII art forest
2017 +--m,m show threads S children in sum -y change -l format
2018 +--n,N set namelist file c true command name n numeric WCHAN,UID
2019 +--w,w wide output e show environment -H process hierarchy
2020 +diff -ruN procps-3.1.15.old/test/ps/O-o/header procps-3.1.15/test/ps/O-o/header
2021 +--- procps-3.1.15.old/test/ps/O-o/header 2003-10-02 12:06:18.000000000 +1000
2022 ++++ procps-3.1.15/test/ps/O-o/header 1970-01-01 10:00:00.000000000 +1000
2024 +- PID WCHAN S TTY TIME COMMAND SESS
2025 +diff -ruN procps-3.1.15.old/test/ps/O-o/setup procps-3.1.15/test/ps/O-o/setup
2026 +--- procps-3.1.15.old/test/ps/O-o/setup 2003-10-02 12:05:41.000000000 +1000
2027 ++++ procps-3.1.15/test/ps/O-o/setup 1970-01-01 10:00:00.000000000 +1000
2029 +-ARGS="-O wchan -o sess"
2031 +diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header/header procps-3.1.15/test/ps/aix-pcpu-header/header
2032 +--- procps-3.1.15.old/test/ps/aix-pcpu-header/header 2003-09-03 07:26:05.000000000 +1000
2033 ++++ procps-3.1.15/test/ps/aix-pcpu-header/header 1970-01-01 10:00:00.000000000 +1000
2036 +diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header/setup procps-3.1.15/test/ps/aix-pcpu-header/setup
2037 +--- procps-3.1.15.old/test/ps/aix-pcpu-header/setup 2003-09-03 07:24:28.000000000 +1000
2038 ++++ procps-3.1.15/test/ps/aix-pcpu-header/setup 1970-01-01 10:00:00.000000000 +1000
2042 +diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header2/header procps-3.1.15/test/ps/aix-pcpu-header2/header
2043 +--- procps-3.1.15.old/test/ps/aix-pcpu-header2/header 2003-09-03 07:26:30.000000000 +1000
2044 ++++ procps-3.1.15/test/ps/aix-pcpu-header2/header 1970-01-01 10:00:00.000000000 +1000
2047 +diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header2/setup procps-3.1.15/test/ps/aix-pcpu-header2/setup
2048 +--- procps-3.1.15.old/test/ps/aix-pcpu-header2/setup 2003-09-03 07:25:22.000000000 +1000
2049 ++++ procps-3.1.15/test/ps/aix-pcpu-header2/setup 1970-01-01 10:00:00.000000000 +1000
2053 +diff -ruN procps-3.1.15.old/test/ps/bad-format-env/header procps-3.1.15/test/ps/bad-format-env/header
2054 +--- procps-3.1.15.old/test/ps/bad-format-env/header 2003-10-02 12:16:37.000000000 +1000
2055 ++++ procps-3.1.15/test/ps/bad-format-env/header 1970-01-01 10:00:00.000000000 +1000
2058 +diff -ruN procps-3.1.15.old/test/ps/bad-format-env/setup procps-3.1.15/test/ps/bad-format-env/setup
2059 +--- procps-3.1.15.old/test/ps/bad-format-env/setup 2003-10-02 12:16:22.000000000 +1000
2060 ++++ procps-3.1.15/test/ps/bad-format-env/setup 1970-01-01 10:00:00.000000000 +1000
2064 +-export PS_FORMAT=booger
2065 +diff -ruN procps-3.1.15.old/test/ps/bad-format-env/stderr procps-3.1.15/test/ps/bad-format-env/stderr
2066 +--- procps-3.1.15.old/test/ps/bad-format-env/stderr 2003-10-02 12:16:13.000000000 +1000
2067 ++++ procps-3.1.15/test/ps/bad-format-env/stderr 1970-01-01 10:00:00.000000000 +1000
2069 +-Warning: $PS_FORMAT ignored. (Unknown user-defined format specifier "booger".)
2070 +diff -ruN procps-3.1.15.old/test/ps/bogus-n-header/header procps-3.1.15/test/ps/bogus-n-header/header
2071 +--- procps-3.1.15.old/test/ps/bogus-n-header/header 2003-09-02 09:37:07.000000000 +1000
2072 ++++ procps-3.1.15/test/ps/bogus-n-header/header 1970-01-01 10:00:00.000000000 +1000
2074 +- PID TTY STAT TIME COMMAND
2075 +diff -ruN procps-3.1.15.old/test/ps/bogus-n-header/setup procps-3.1.15/test/ps/bogus-n-header/setup
2076 +--- procps-3.1.15.old/test/ps/bogus-n-header/setup 2003-09-02 09:34:40.000000000 +1000
2077 ++++ procps-3.1.15/test/ps/bogus-n-header/setup 1970-01-01 10:00:00.000000000 +1000
2081 +diff -ruN procps-3.1.15.old/test/ps/bogus-n-header/stderr procps-3.1.15/test/ps/bogus-n-header/stderr
2082 +--- procps-3.1.15.old/test/ps/bogus-n-header/stderr 2003-09-02 09:35:37.000000000 +1000
2083 ++++ procps-3.1.15/test/ps/bogus-n-header/stderr 1970-01-01 10:00:00.000000000 +1000
2085 +-Warning: bad syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html
2086 +diff -ruN procps-3.1.15.old/test/ps/bsd-T/header procps-3.1.15/test/ps/bsd-T/header
2087 +--- procps-3.1.15.old/test/ps/bsd-T/header 2003-09-02 11:54:41.000000000 +1000
2088 ++++ procps-3.1.15/test/ps/bsd-T/header 1970-01-01 10:00:00.000000000 +1000
2090 +- PID TTY STAT TIME COMMAND
2091 +diff -ruN procps-3.1.15.old/test/ps/bsd-T/setup procps-3.1.15/test/ps/bsd-T/setup
2092 +--- procps-3.1.15.old/test/ps/bsd-T/setup 2003-09-02 11:53:24.000000000 +1000
2093 ++++ procps-3.1.15/test/ps/bsd-T/setup 1970-01-01 10:00:00.000000000 +1000
2099 +-# default output is restricted to this tty
2103 +- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq`
2104 +- [ /dev/$PSTTY == $MYTTY ]
2106 +diff -ruN procps-3.1.15.old/test/ps/bsd-j-header/header procps-3.1.15/test/ps/bsd-j-header/header
2107 +--- procps-3.1.15.old/test/ps/bsd-j-header/header 2003-09-02 22:33:49.000000000 +1000
2108 ++++ procps-3.1.15/test/ps/bsd-j-header/header 1970-01-01 10:00:00.000000000 +1000
2110 +- PPID PID PGID SID TTY TPGID STAT UID TIME COMMAND
2111 +diff -ruN procps-3.1.15.old/test/ps/bsd-j-header/setup procps-3.1.15/test/ps/bsd-j-header/setup
2112 +--- procps-3.1.15.old/test/ps/bsd-j-header/setup 2003-09-02 22:32:53.000000000 +1000
2113 ++++ procps-3.1.15/test/ps/bsd-j-header/setup 1970-01-01 10:00:00.000000000 +1000
2117 +diff -ruN procps-3.1.15.old/test/ps/bsd-j-header2/header procps-3.1.15/test/ps/bsd-j-header2/header
2118 +--- procps-3.1.15.old/test/ps/bsd-j-header2/header 2003-09-02 23:16:25.000000000 +1000
2119 ++++ procps-3.1.15/test/ps/bsd-j-header2/header 1970-01-01 10:00:00.000000000 +1000
2121 +- USER PID PPID PGID SESS JOBC STAT TT TIME COMMAND
2122 +diff -ruN procps-3.1.15.old/test/ps/bsd-j-header2/setup procps-3.1.15/test/ps/bsd-j-header2/setup
2123 +--- procps-3.1.15.old/test/ps/bsd-j-header2/setup 2003-09-02 23:15:16.000000000 +1000
2124 ++++ procps-3.1.15/test/ps/bsd-j-header2/setup 1970-01-01 10:00:00.000000000 +1000
2126 +-export CMD_ENV=bsd
2129 +diff -ruN procps-3.1.15.old/test/ps/bsd-l-header/header procps-3.1.15/test/ps/bsd-l-header/header
2130 +--- procps-3.1.15.old/test/ps/bsd-l-header/header 2003-09-02 22:54:09.000000000 +1000
2131 ++++ procps-3.1.15/test/ps/bsd-l-header/header 1970-01-01 10:00:00.000000000 +1000
2133 +- F UID PID PPID PRI NI VSZ RSS WCHAN STAT TTY TIME COMMAND
2134 +diff -ruN procps-3.1.15.old/test/ps/bsd-l-header/setup procps-3.1.15/test/ps/bsd-l-header/setup
2135 +--- procps-3.1.15.old/test/ps/bsd-l-header/setup 2003-09-02 22:53:45.000000000 +1000
2136 ++++ procps-3.1.15/test/ps/bsd-l-header/setup 1970-01-01 10:00:00.000000000 +1000
2140 +diff -ruN procps-3.1.15.old/test/ps/bsd-l-header2/header procps-3.1.15/test/ps/bsd-l-header2/header
2141 +--- procps-3.1.15.old/test/ps/bsd-l-header2/header 2003-09-03 07:26:56.000000000 +1000
2142 ++++ procps-3.1.15/test/ps/bsd-l-header2/header 1970-01-01 10:00:00.000000000 +1000
2144 +- UID PID PPID CPU PRI NI VSZ RSS WCHAN STAT TT TIME COMMAND
2145 +diff -ruN procps-3.1.15.old/test/ps/bsd-l-header2/setup procps-3.1.15/test/ps/bsd-l-header2/setup
2146 +--- procps-3.1.15.old/test/ps/bsd-l-header2/setup 2003-09-03 07:21:19.000000000 +1000
2147 ++++ procps-3.1.15/test/ps/bsd-l-header2/setup 1970-01-01 10:00:00.000000000 +1000
2149 +-export CMD_ENV=bsd
2152 +diff -ruN procps-3.1.15.old/test/ps/bsd-s-header/header procps-3.1.15/test/ps/bsd-s-header/header
2153 +--- procps-3.1.15.old/test/ps/bsd-s-header/header 2003-09-02 22:55:32.000000000 +1000
2154 ++++ procps-3.1.15/test/ps/bsd-s-header/header 1970-01-01 10:00:00.000000000 +1000
2156 +- UID PID PENDING BLOCKED IGNORED CAUGHT STAT TTY TIME COMMAND
2157 +diff -ruN procps-3.1.15.old/test/ps/bsd-s-header/setup procps-3.1.15/test/ps/bsd-s-header/setup
2158 +--- procps-3.1.15.old/test/ps/bsd-s-header/setup 2003-09-02 22:55:06.000000000 +1000
2159 ++++ procps-3.1.15/test/ps/bsd-s-header/setup 1970-01-01 10:00:00.000000000 +1000
2163 +diff -ruN procps-3.1.15.old/test/ps/bsd-s-header2/header procps-3.1.15/test/ps/bsd-s-header2/header
2164 +--- procps-3.1.15.old/test/ps/bsd-s-header2/header 2003-09-03 07:21:33.000000000 +1000
2165 ++++ procps-3.1.15/test/ps/bsd-s-header2/header 1970-01-01 10:00:00.000000000 +1000
2167 +- UID PID PENDING BLOCKED IGNORED CAUGHT STAT TTY TIME COMMAND
2168 +diff -ruN procps-3.1.15.old/test/ps/bsd-s-header2/setup procps-3.1.15/test/ps/bsd-s-header2/setup
2169 +--- procps-3.1.15.old/test/ps/bsd-s-header2/setup 2003-09-03 07:21:40.000000000 +1000
2170 ++++ procps-3.1.15/test/ps/bsd-s-header2/setup 1970-01-01 10:00:00.000000000 +1000
2172 +-export CMD_ENV=bsd
2175 +diff -ruN procps-3.1.15.old/test/ps/bsd-selection/header procps-3.1.15/test/ps/bsd-selection/header
2176 +--- procps-3.1.15.old/test/ps/bsd-selection/header 2003-09-04 16:04:27.000000000 +1000
2177 ++++ procps-3.1.15/test/ps/bsd-selection/header 1970-01-01 10:00:00.000000000 +1000
2179 +- PID TTY STAT TIME COMMAND
2180 +diff -ruN procps-3.1.15.old/test/ps/bsd-selection/setup procps-3.1.15/test/ps/bsd-selection/setup
2181 +--- procps-3.1.15.old/test/ps/bsd-selection/setup 2003-09-13 13:47:22.000000000 +1000
2182 ++++ procps-3.1.15/test/ps/bsd-selection/setup 1970-01-01 10:00:00.000000000 +1000
2189 +-rm -f misc.tmp ready.tmp typescript.tmp
2192 +-# this'll do but... WHERE ARE THE MAN PAGES FOR PTY STUFF???
2193 +-(SHELL=`pwd`/script-child script typescript.tmp &>/dev/null) &
2194 +-while [ ! -f ready.tmp ] ; do sleep 0.01 ; done
2198 +- THIS_TTY=`tty | colrm 1 5`
2199 +- lines2=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY)$" | wc -l`
2200 +- lines3=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY|\?)$" | wc -l`
2201 +- [ $lines2 == 2 ] && [ $lines3 == 2 ]
2205 +- killall -9 got-no-tty
2206 +- kill -9 $SHELL_PID # the others should freely die
2207 +- rm -f misc.tmp ready.tmp typescript.tmp
2209 +diff -ruN procps-3.1.15.old/test/ps/bsd-t-1/header procps-3.1.15/test/ps/bsd-t-1/header
2210 +--- procps-3.1.15.old/test/ps/bsd-t-1/header 2003-09-02 11:55:23.000000000 +1000
2211 ++++ procps-3.1.15/test/ps/bsd-t-1/header 1970-01-01 10:00:00.000000000 +1000
2213 +- PID TTY STAT TIME COMMAND
2214 +diff -ruN procps-3.1.15.old/test/ps/bsd-t-1/setup procps-3.1.15/test/ps/bsd-t-1/setup
2215 +--- procps-3.1.15.old/test/ps/bsd-t-1/setup 2003-09-02 11:56:11.000000000 +1000
2216 ++++ procps-3.1.15/test/ps/bsd-t-1/setup 1970-01-01 10:00:00.000000000 +1000
2218 +-# default output is restricted to this tty
2226 +- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq`
2227 +- [ /dev/$PSTTY == $MYTTY ]
2229 +diff -ruN procps-3.1.15.old/test/ps/bsd-t-2/header procps-3.1.15/test/ps/bsd-t-2/header
2230 +--- procps-3.1.15.old/test/ps/bsd-t-2/header 2003-09-02 11:55:26.000000000 +1000
2231 ++++ procps-3.1.15/test/ps/bsd-t-2/header 1970-01-01 10:00:00.000000000 +1000
2233 +- PID TTY STAT TIME COMMAND
2234 +diff -ruN procps-3.1.15.old/test/ps/bsd-t-2/setup procps-3.1.15/test/ps/bsd-t-2/setup
2235 +--- procps-3.1.15.old/test/ps/bsd-t-2/setup 2003-09-02 11:56:54.000000000 +1000
2236 ++++ procps-3.1.15/test/ps/bsd-t-2/setup 1970-01-01 10:00:00.000000000 +1000
2238 +-# Ancient usage: t w/o arg is current tty
2243 +-# default output is restricted to this tty
2247 +- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq`
2248 +- [ /dev/$PSTTY == $MYTTY ]
2250 +diff -ruN procps-3.1.15.old/test/ps/bsd-t-3/header procps-3.1.15/test/ps/bsd-t-3/header
2251 +--- procps-3.1.15.old/test/ps/bsd-t-3/header 2003-09-02 11:55:27.000000000 +1000
2252 ++++ procps-3.1.15/test/ps/bsd-t-3/header 1970-01-01 10:00:00.000000000 +1000
2254 +- PID TTY STAT TIME COMMAND
2255 +diff -ruN procps-3.1.15.old/test/ps/bsd-t-3/setup procps-3.1.15/test/ps/bsd-t-3/setup
2256 +--- procps-3.1.15.old/test/ps/bsd-t-3/setup 2003-09-02 12:25:44.000000000 +1000
2257 ++++ procps-3.1.15/test/ps/bsd-t-3/setup 1970-01-01 10:00:00.000000000 +1000
2261 +-# two ways to interpret "ps t 42"
2263 +-# 1. as "ps t" with "ps 42" (PID 42)
2264 +-# 2. as "ps t42" (tty /dev/tty42)
2266 +-# The command doesn't seem to be legal BSD syntax, but we try...
2267 +-# We use interpretation #2, since BSD isn't known for ORing.
2268 +-# We'll assume PID 1 is "init" and not on /dev/tty1, and that
2269 +-# nothing on tty1 is named "init".
2276 +- ! egrep ' init' stdout >> /dev/null
2278 +diff -ruN procps-3.1.15.old/test/ps/bsd-t-4/header procps-3.1.15/test/ps/bsd-t-4/header
2279 +--- procps-3.1.15.old/test/ps/bsd-t-4/header 2003-09-02 11:55:29.000000000 +1000
2280 ++++ procps-3.1.15/test/ps/bsd-t-4/header 1970-01-01 10:00:00.000000000 +1000
2282 +- PID TTY STAT TIME COMMAND
2283 +diff -ruN procps-3.1.15.old/test/ps/bsd-t-4/setup procps-3.1.15/test/ps/bsd-t-4/setup
2284 +--- procps-3.1.15.old/test/ps/bsd-t-4/setup 2003-09-02 12:15:34.000000000 +1000
2285 ++++ procps-3.1.15/test/ps/bsd-t-4/setup 1970-01-01 10:00:00.000000000 +1000
2291 +-# Use 'Y' to avoid shell wildcard problems.
2294 +- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq | tr '?' 'Y'`
2295 +- [ $PSTTY == 'Y' ]
2297 +diff -ruN procps-3.1.15.old/test/ps/bsd-u-header/header procps-3.1.15/test/ps/bsd-u-header/header
2298 +--- procps-3.1.15.old/test/ps/bsd-u-header/header 2003-09-02 22:57:35.000000000 +1000
2299 ++++ procps-3.1.15/test/ps/bsd-u-header/header 1970-01-01 10:00:00.000000000 +1000
2301 +- USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
2302 +diff -ruN procps-3.1.15.old/test/ps/bsd-u-header/setup procps-3.1.15/test/ps/bsd-u-header/setup
2303 +--- procps-3.1.15.old/test/ps/bsd-u-header/setup 2003-09-02 22:57:20.000000000 +1000
2304 ++++ procps-3.1.15/test/ps/bsd-u-header/setup 1970-01-01 10:00:00.000000000 +1000
2308 +diff -ruN procps-3.1.15.old/test/ps/bsd-u-header2/header procps-3.1.15/test/ps/bsd-u-header2/header
2309 +--- procps-3.1.15.old/test/ps/bsd-u-header2/header 2003-09-03 07:27:09.000000000 +1000
2310 ++++ procps-3.1.15/test/ps/bsd-u-header2/header 1970-01-01 10:00:00.000000000 +1000
2312 +- USER PID %CPU %MEM VSZ RSS TT STAT STARTED TIME COMMAND
2313 +diff -ruN procps-3.1.15.old/test/ps/bsd-u-header2/setup procps-3.1.15/test/ps/bsd-u-header2/setup
2314 +--- procps-3.1.15.old/test/ps/bsd-u-header2/setup 2003-09-03 07:22:00.000000000 +1000
2315 ++++ procps-3.1.15/test/ps/bsd-u-header2/setup 1970-01-01 10:00:00.000000000 +1000
2317 +-export CMD_ENV=bsd
2320 +diff -ruN procps-3.1.15.old/test/ps/bsd-v-header/header procps-3.1.15/test/ps/bsd-v-header/header
2321 +--- procps-3.1.15.old/test/ps/bsd-v-header/header 2003-09-02 22:56:43.000000000 +1000
2322 ++++ procps-3.1.15/test/ps/bsd-v-header/header 1970-01-01 10:00:00.000000000 +1000
2324 +- PID TTY STAT TIME MAJFL TRS DRS RSS %MEM COMMAND
2325 +diff -ruN procps-3.1.15.old/test/ps/bsd-v-header/setup procps-3.1.15/test/ps/bsd-v-header/setup
2326 +--- procps-3.1.15.old/test/ps/bsd-v-header/setup 2003-09-02 22:56:10.000000000 +1000
2327 ++++ procps-3.1.15/test/ps/bsd-v-header/setup 1970-01-01 10:00:00.000000000 +1000
2331 +diff -ruN procps-3.1.15.old/test/ps/bsd-v-header2/header procps-3.1.15/test/ps/bsd-v-header2/header
2332 +--- procps-3.1.15.old/test/ps/bsd-v-header2/header 2003-09-03 07:27:16.000000000 +1000
2333 ++++ procps-3.1.15/test/ps/bsd-v-header2/header 1970-01-01 10:00:00.000000000 +1000
2335 +- PID STAT TIME SL RE PAGEIN VSZ RSS LIM TSIZ %CPU %MEM COMMAND
2336 +diff -ruN procps-3.1.15.old/test/ps/bsd-v-header2/setup procps-3.1.15/test/ps/bsd-v-header2/setup
2337 +--- procps-3.1.15.old/test/ps/bsd-v-header2/setup 2003-09-03 07:22:17.000000000 +1000
2338 ++++ procps-3.1.15/test/ps/bsd-v-header2/setup 1970-01-01 10:00:00.000000000 +1000
2340 +-export CMD_ENV=bsd
2343 +diff -ruN procps-3.1.15.old/test/ps/dynix-F-header/header procps-3.1.15/test/ps/dynix-F-header/header
2344 +--- procps-3.1.15.old/test/ps/dynix-F-header/header 2003-09-02 22:31:23.000000000 +1000
2345 ++++ procps-3.1.15/test/ps/dynix-F-header/header 1970-01-01 10:00:00.000000000 +1000
2347 +- UID PID PPID C SZ RSS PSR STIME TTY TIME CMD
2348 +diff -ruN procps-3.1.15.old/test/ps/dynix-F-header/setup procps-3.1.15/test/ps/dynix-F-header/setup
2349 +--- procps-3.1.15.old/test/ps/dynix-F-header/setup 2003-09-02 22:30:43.000000000 +1000
2350 ++++ procps-3.1.15/test/ps/dynix-F-header/setup 1970-01-01 10:00:00.000000000 +1000
2354 +diff -ruN procps-3.1.15.old/test/ps/fail-aix-Q/header procps-3.1.15/test/ps/fail-aix-Q/header
2355 +--- procps-3.1.15.old/test/ps/fail-aix-Q/header 2003-10-02 11:31:34.000000000 +1000
2356 ++++ procps-3.1.15/test/ps/fail-aix-Q/header 1970-01-01 10:00:00.000000000 +1000
2359 +\ No newline at end of file
2360 +diff -ruN procps-3.1.15.old/test/ps/fail-aix-Q/setup procps-3.1.15/test/ps/fail-aix-Q/setup
2361 +--- procps-3.1.15.old/test/ps/fail-aix-Q/setup 2003-10-02 11:32:11.000000000 +1000
2362 ++++ procps-3.1.15/test/ps/fail-aix-Q/setup 1970-01-01 10:00:00.000000000 +1000
2366 +diff -ruN procps-3.1.15.old/test/ps/fail-aix-Q/stderr procps-3.1.15/test/ps/fail-aix-Q/stderr
2367 +--- procps-3.1.15.old/test/ps/fail-aix-Q/stderr 2003-10-02 11:33:07.000000000 +1000
2368 ++++ procps-3.1.15/test/ps/fail-aix-Q/stderr 1970-01-01 10:00:00.000000000 +1000
2370 +-ERROR: Unknown AIX field descriptor.
2371 +-********* simple selection ********* ********* selection by list *********
2372 +--A all processes -C by command name
2373 +--N negate selection -G by real group ID (supports names)
2374 +--a all w/ tty except session leaders -U by real user ID (supports names)
2375 +--d all except session leaders -g by session leader OR by group name
2376 +--e all processes -p by process ID
2377 +-T all processes on this terminal -s processes in the sessions given
2378 +-a all w/ tty, including other users -t by tty
2379 +-g all, even group leaders! -u by effective user ID (supports names)
2380 +-r only running processes U processes for specified users
2381 +-x processes w/o controlling ttys t by tty
2382 +-*********** output format ********** *********** long options ***********
2383 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2384 +--j,j job control s signal --group --user --sid --rows
2385 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2386 +--l,l long u user-oriented --sort --tty --forest --version
2387 +--F extra full X registers --heading --no-heading
2388 +- ********* misc options *********
2389 +--V,V show version L list format codes f ASCII art forest
2390 +--m,m show threads S children in sum -y change -l format
2391 +--n,N set namelist file c true command name n numeric WCHAN,UID
2392 +--w,w wide output e show environment -H process hierarchy
2393 +diff -ruN procps-3.1.15.old/test/ps/fail-aix-improper/header procps-3.1.15/test/ps/fail-aix-improper/header
2394 +--- procps-3.1.15.old/test/ps/fail-aix-improper/header 2003-10-02 11:34:09.000000000 +1000
2395 ++++ procps-3.1.15/test/ps/fail-aix-improper/header 1970-01-01 10:00:00.000000000 +1000
2398 +\ No newline at end of file
2399 +diff -ruN procps-3.1.15.old/test/ps/fail-aix-improper/setup procps-3.1.15/test/ps/fail-aix-improper/setup
2400 +--- procps-3.1.15.old/test/ps/fail-aix-improper/setup 2003-10-02 11:34:22.000000000 +1000
2401 ++++ procps-3.1.15/test/ps/fail-aix-improper/setup 1970-01-01 10:00:00.000000000 +1000
2405 +diff -ruN procps-3.1.15.old/test/ps/fail-aix-improper/stderr procps-3.1.15/test/ps/fail-aix-improper/stderr
2406 +--- procps-3.1.15.old/test/ps/fail-aix-improper/stderr 2003-10-02 11:34:40.000000000 +1000
2407 ++++ procps-3.1.15/test/ps/fail-aix-improper/stderr 1970-01-01 10:00:00.000000000 +1000
2409 +-ERROR: Improper AIX field descriptor.
2410 +-********* simple selection ********* ********* selection by list *********
2411 +--A all processes -C by command name
2412 +--N negate selection -G by real group ID (supports names)
2413 +--a all w/ tty except session leaders -U by real user ID (supports names)
2414 +--d all except session leaders -g by session leader OR by group name
2415 +--e all processes -p by process ID
2416 +-T all processes on this terminal -s processes in the sessions given
2417 +-a all w/ tty, including other users -t by tty
2418 +-g all, even group leaders! -u by effective user ID (supports names)
2419 +-r only running processes U processes for specified users
2420 +-x processes w/o controlling ttys t by tty
2421 +-*********** output format ********** *********** long options ***********
2422 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2423 +--j,j job control s signal --group --user --sid --rows
2424 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2425 +--l,l long u user-oriented --sort --tty --forest --version
2426 +--F extra full X registers --heading --no-heading
2427 +- ********* misc options *********
2428 +--V,V show version L list format codes f ASCII art forest
2429 +--m,m show threads S children in sum -y change -l format
2430 +--n,N set namelist file c true command name n numeric WCHAN,UID
2431 +--w,w wide output e show environment -H process hierarchy
2432 +diff -ruN procps-3.1.15.old/test/ps/fail-improper-sort/header procps-3.1.15/test/ps/fail-improper-sort/header
2433 +--- procps-3.1.15.old/test/ps/fail-improper-sort/header 2003-10-02 11:47:57.000000000 +1000
2434 ++++ procps-3.1.15/test/ps/fail-improper-sort/header 1970-01-01 10:00:00.000000000 +1000
2437 +\ No newline at end of file
2438 +diff -ruN procps-3.1.15.old/test/ps/fail-improper-sort/setup procps-3.1.15/test/ps/fail-improper-sort/setup
2439 +--- procps-3.1.15.old/test/ps/fail-improper-sort/setup 2003-10-02 11:48:15.000000000 +1000
2440 ++++ procps-3.1.15/test/ps/fail-improper-sort/setup 1970-01-01 10:00:00.000000000 +1000
2444 +diff -ruN procps-3.1.15.old/test/ps/fail-improper-sort/stderr procps-3.1.15/test/ps/fail-improper-sort/stderr
2445 +--- procps-3.1.15.old/test/ps/fail-improper-sort/stderr 2003-10-02 12:22:31.000000000 +1000
2446 ++++ procps-3.1.15/test/ps/fail-improper-sort/stderr 1970-01-01 10:00:00.000000000 +1000
2448 +-ERROR: Improper sort list
2449 +-********* simple selection ********* ********* selection by list *********
2450 +--A all processes -C by command name
2451 +--N negate selection -G by real group ID (supports names)
2452 +--a all w/ tty except session leaders -U by real user ID (supports names)
2453 +--d all except session leaders -g by session leader OR by group name
2454 +--e all processes -p by process ID
2455 +-T all processes on this terminal -s processes in the sessions given
2456 +-a all w/ tty, including other users -t by tty
2457 +-g all, even group leaders! -u by effective user ID (supports names)
2458 +-r only running processes U processes for specified users
2459 +-x processes w/o controlling ttys t by tty
2460 +-*********** output format ********** *********** long options ***********
2461 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2462 +--j,j job control s signal --group --user --sid --rows
2463 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2464 +--l,l long u user-oriented --sort --tty --forest --version
2465 +--F extra full X registers --heading --no-heading
2466 +- ********* misc options *********
2467 +--V,V show version L list format codes f ASCII art forest
2468 +--m,m show threads S children in sum -y change -l format
2469 +--n,N set namelist file c true command name n numeric WCHAN,UID
2470 +--w,w wide output e show environment -H process hierarchy
2471 +diff -ruN procps-3.1.15.old/test/ps/fail-improper-spec/header procps-3.1.15/test/ps/fail-improper-spec/header
2472 +--- procps-3.1.15.old/test/ps/fail-improper-spec/header 2003-10-02 11:37:17.000000000 +1000
2473 ++++ procps-3.1.15/test/ps/fail-improper-spec/header 1970-01-01 10:00:00.000000000 +1000
2476 +\ No newline at end of file
2477 +diff -ruN procps-3.1.15.old/test/ps/fail-improper-spec/setup procps-3.1.15/test/ps/fail-improper-spec/setup
2478 +--- procps-3.1.15.old/test/ps/fail-improper-spec/setup 2003-10-02 11:37:34.000000000 +1000
2479 ++++ procps-3.1.15/test/ps/fail-improper-spec/setup 1970-01-01 10:00:00.000000000 +1000
2483 +diff -ruN procps-3.1.15.old/test/ps/fail-improper-spec/stderr procps-3.1.15/test/ps/fail-improper-spec/stderr
2484 +--- procps-3.1.15.old/test/ps/fail-improper-spec/stderr 2003-10-02 11:37:52.000000000 +1000
2485 ++++ procps-3.1.15/test/ps/fail-improper-spec/stderr 1970-01-01 10:00:00.000000000 +1000
2487 +-ERROR: Improper format list.
2488 +-********* simple selection ********* ********* selection by list *********
2489 +--A all processes -C by command name
2490 +--N negate selection -G by real group ID (supports names)
2491 +--a all w/ tty except session leaders -U by real user ID (supports names)
2492 +--d all except session leaders -g by session leader OR by group name
2493 +--e all processes -p by process ID
2494 +-T all processes on this terminal -s processes in the sessions given
2495 +-a all w/ tty, including other users -t by tty
2496 +-g all, even group leaders! -u by effective user ID (supports names)
2497 +-r only running processes U processes for specified users
2498 +-x processes w/o controlling ttys t by tty
2499 +-*********** output format ********** *********** long options ***********
2500 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2501 +--j,j job control s signal --group --user --sid --rows
2502 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2503 +--l,l long u user-oriented --sort --tty --forest --version
2504 +--F extra full X registers --heading --no-heading
2505 +- ********* misc options *********
2506 +--V,V show version L list format codes f ASCII art forest
2507 +--m,m show threads S children in sum -y change -l format
2508 +--n,N set namelist file c true command name n numeric WCHAN,UID
2509 +--w,w wide output e show environment -H process hierarchy
2510 +diff -ruN procps-3.1.15.old/test/ps/fail-macro-width/header procps-3.1.15/test/ps/fail-macro-width/header
2511 +--- procps-3.1.15.old/test/ps/fail-macro-width/header 2003-10-02 11:42:15.000000000 +1000
2512 ++++ procps-3.1.15/test/ps/fail-macro-width/header 1970-01-01 10:00:00.000000000 +1000
2515 +\ No newline at end of file
2516 +diff -ruN procps-3.1.15.old/test/ps/fail-macro-width/setup procps-3.1.15/test/ps/fail-macro-width/setup
2517 +--- procps-3.1.15.old/test/ps/fail-macro-width/setup 2003-10-02 11:42:30.000000000 +1000
2518 ++++ procps-3.1.15/test/ps/fail-macro-width/setup 1970-01-01 10:00:00.000000000 +1000
2520 +-ARGS="-o DefBSD:6"
2522 +diff -ruN procps-3.1.15.old/test/ps/fail-macro-width/stderr procps-3.1.15/test/ps/fail-macro-width/stderr
2523 +--- procps-3.1.15.old/test/ps/fail-macro-width/stderr 2003-10-02 11:42:46.000000000 +1000
2524 ++++ procps-3.1.15/test/ps/fail-macro-width/stderr 1970-01-01 10:00:00.000000000 +1000
2526 +-ERROR: Can't set width for a macro (multi-column) format specifier.
2527 +-********* simple selection ********* ********* selection by list *********
2528 +--A all processes -C by command name
2529 +--N negate selection -G by real group ID (supports names)
2530 +--a all w/ tty except session leaders -U by real user ID (supports names)
2531 +--d all except session leaders -g by session leader OR by group name
2532 +--e all processes -p by process ID
2533 +-T all processes on this terminal -s processes in the sessions given
2534 +-a all w/ tty, including other users -t by tty
2535 +-g all, even group leaders! -u by effective user ID (supports names)
2536 +-r only running processes U processes for specified users
2537 +-x processes w/o controlling ttys t by tty
2538 +-*********** output format ********** *********** long options ***********
2539 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2540 +--j,j job control s signal --group --user --sid --rows
2541 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2542 +--l,l long u user-oriented --sort --tty --forest --version
2543 +--F extra full X registers --heading --no-heading
2544 +- ********* misc options *********
2545 +--V,V show version L list format codes f ASCII art forest
2546 +--m,m show threads S children in sum -y change -l format
2547 +--n,N set namelist file c true command name n numeric WCHAN,UID
2548 +--w,w wide output e show environment -H process hierarchy
2549 +diff -ruN procps-3.1.15.old/test/ps/fail-no-sort-key/header procps-3.1.15/test/ps/fail-no-sort-key/header
2550 +--- procps-3.1.15.old/test/ps/fail-no-sort-key/header 2003-10-02 11:50:26.000000000 +1000
2551 ++++ procps-3.1.15/test/ps/fail-no-sort-key/header 1970-01-01 10:00:00.000000000 +1000
2554 +\ No newline at end of file
2555 +diff -ruN procps-3.1.15.old/test/ps/fail-no-sort-key/setup procps-3.1.15/test/ps/fail-no-sort-key/setup
2556 +--- procps-3.1.15.old/test/ps/fail-no-sort-key/setup 2003-10-02 11:50:39.000000000 +1000
2557 ++++ procps-3.1.15/test/ps/fail-no-sort-key/setup 1970-01-01 10:00:00.000000000 +1000
2561 +diff -ruN procps-3.1.15.old/test/ps/fail-no-sort-key/stderr procps-3.1.15/test/ps/fail-no-sort-key/stderr
2562 +--- procps-3.1.15.old/test/ps/fail-no-sort-key/stderr 2003-10-02 11:51:05.000000000 +1000
2563 ++++ procps-3.1.15/test/ps/fail-no-sort-key/stderr 1970-01-01 10:00:00.000000000 +1000
2565 +-ERROR: Long sort specification must follow --sort.
2566 +-********* simple selection ********* ********* selection by list *********
2567 +--A all processes -C by command name
2568 +--N negate selection -G by real group ID (supports names)
2569 +--a all w/ tty except session leaders -U by real user ID (supports names)
2570 +--d all except session leaders -g by session leader OR by group name
2571 +--e all processes -p by process ID
2572 +-T all processes on this terminal -s processes in the sessions given
2573 +-a all w/ tty, including other users -t by tty
2574 +-g all, even group leaders! -u by effective user ID (supports names)
2575 +-r only running processes U processes for specified users
2576 +-x processes w/o controlling ttys t by tty
2577 +-*********** output format ********** *********** long options ***********
2578 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2579 +--j,j job control s signal --group --user --sid --rows
2580 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2581 +--l,l long u user-oriented --sort --tty --forest --version
2582 +--F extra full X registers --heading --no-heading
2583 +- ********* misc options *********
2584 +--V,V show version L list format codes f ASCII art forest
2585 +--m,m show threads S children in sum -y change -l format
2586 +--n,N set namelist file c true command name n numeric WCHAN,UID
2587 +--w,w wide output e show environment -H process hierarchy
2588 +diff -ruN procps-3.1.15.old/test/ps/fail-no-width/header procps-3.1.15/test/ps/fail-no-width/header
2589 +--- procps-3.1.15.old/test/ps/fail-no-width/header 2003-10-02 11:40:56.000000000 +1000
2590 ++++ procps-3.1.15/test/ps/fail-no-width/header 1970-01-01 10:00:00.000000000 +1000
2593 +\ No newline at end of file
2594 +diff -ruN procps-3.1.15.old/test/ps/fail-no-width/setup procps-3.1.15/test/ps/fail-no-width/setup
2595 +--- procps-3.1.15.old/test/ps/fail-no-width/setup 2003-10-02 11:41:22.000000000 +1000
2596 ++++ procps-3.1.15/test/ps/fail-no-width/setup 1970-01-01 10:00:00.000000000 +1000
2598 +-ARGS="-o pid:,f,comm"
2600 +diff -ruN procps-3.1.15.old/test/ps/fail-no-width/stderr procps-3.1.15/test/ps/fail-no-width/stderr
2601 +--- procps-3.1.15.old/test/ps/fail-no-width/stderr 2003-10-02 11:40:56.000000000 +1000
2602 ++++ procps-3.1.15/test/ps/fail-no-width/stderr 1970-01-01 10:00:00.000000000 +1000
2604 +-ERROR: Column widths must be unsigned decimal numbers.
2605 +-********* simple selection ********* ********* selection by list *********
2606 +--A all processes -C by command name
2607 +--N negate selection -G by real group ID (supports names)
2608 +--a all w/ tty except session leaders -U by real user ID (supports names)
2609 +--d all except session leaders -g by session leader OR by group name
2610 +--e all processes -p by process ID
2611 +-T all processes on this terminal -s processes in the sessions given
2612 +-a all w/ tty, including other users -t by tty
2613 +-g all, even group leaders! -u by effective user ID (supports names)
2614 +-r only running processes U processes for specified users
2615 +-x processes w/o controlling ttys t by tty
2616 +-*********** output format ********** *********** long options ***********
2617 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2618 +--j,j job control s signal --group --user --sid --rows
2619 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2620 +--l,l long u user-oriented --sort --tty --forest --version
2621 +--F extra full X registers --heading --no-heading
2622 +- ********* misc options *********
2623 +--V,V show version L list format codes f ASCII art forest
2624 +--m,m show threads S children in sum -y change -l format
2625 +--n,N set namelist file c true command name n numeric WCHAN,UID
2626 +--w,w wide output e show environment -H process hierarchy
2627 +diff -ruN procps-3.1.15.old/test/ps/fail-nondecimal/header procps-3.1.15/test/ps/fail-nondecimal/header
2628 +--- procps-3.1.15.old/test/ps/fail-nondecimal/header 2003-10-02 11:39:38.000000000 +1000
2629 ++++ procps-3.1.15/test/ps/fail-nondecimal/header 1970-01-01 10:00:00.000000000 +1000
2632 +\ No newline at end of file
2633 +diff -ruN procps-3.1.15.old/test/ps/fail-nondecimal/setup procps-3.1.15/test/ps/fail-nondecimal/setup
2634 +--- procps-3.1.15.old/test/ps/fail-nondecimal/setup 2003-10-02 11:40:07.000000000 +1000
2635 ++++ procps-3.1.15/test/ps/fail-nondecimal/setup 1970-01-01 10:00:00.000000000 +1000
2637 +-ARGS="-o pid:f,comm"
2639 +diff -ruN procps-3.1.15.old/test/ps/fail-nondecimal/stderr procps-3.1.15/test/ps/fail-nondecimal/stderr
2640 +--- procps-3.1.15.old/test/ps/fail-nondecimal/stderr 2003-10-02 11:40:30.000000000 +1000
2641 ++++ procps-3.1.15/test/ps/fail-nondecimal/stderr 1970-01-01 10:00:00.000000000 +1000
2643 +-ERROR: Column widths must be unsigned decimal numbers.
2644 +-********* simple selection ********* ********* selection by list *********
2645 +--A all processes -C by command name
2646 +--N negate selection -G by real group ID (supports names)
2647 +--a all w/ tty except session leaders -U by real user ID (supports names)
2648 +--d all except session leaders -g by session leader OR by group name
2649 +--e all processes -p by process ID
2650 +-T all processes on this terminal -s processes in the sessions given
2651 +-a all w/ tty, including other users -t by tty
2652 +-g all, even group leaders! -u by effective user ID (supports names)
2653 +-r only running processes U processes for specified users
2654 +-x processes w/o controlling ttys t by tty
2655 +-*********** output format ********** *********** long options ***********
2656 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2657 +--j,j job control s signal --group --user --sid --rows
2658 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2659 +--l,l long u user-oriented --sort --tty --forest --version
2660 +--F extra full X registers --heading --no-heading
2661 +- ********* misc options *********
2662 +--V,V show version L list format codes f ASCII art forest
2663 +--m,m show threads S children in sum -y change -l format
2664 +--n,N set namelist file c true command name n numeric WCHAN,UID
2665 +--w,w wide output e show environment -H process hierarchy
2666 +diff -ruN procps-3.1.15.old/test/ps/fail-oj/header procps-3.1.15/test/ps/fail-oj/header
2667 +--- procps-3.1.15.old/test/ps/fail-oj/header 2003-09-02 13:47:18.000000000 +1000
2668 ++++ procps-3.1.15/test/ps/fail-oj/header 1970-01-01 10:00:00.000000000 +1000
2671 +\ No newline at end of file
2672 +diff -ruN procps-3.1.15.old/test/ps/fail-oj/setup procps-3.1.15/test/ps/fail-oj/setup
2673 +--- procps-3.1.15.old/test/ps/fail-oj/setup 2003-09-02 13:47:54.000000000 +1000
2674 ++++ procps-3.1.15/test/ps/fail-oj/setup 1970-01-01 10:00:00.000000000 +1000
2678 +diff -ruN procps-3.1.15.old/test/ps/fail-oj/stderr procps-3.1.15/test/ps/fail-oj/stderr
2679 +--- procps-3.1.15.old/test/ps/fail-oj/stderr 2003-09-02 13:49:02.000000000 +1000
2680 ++++ procps-3.1.15/test/ps/fail-oj/stderr 1970-01-01 10:00:00.000000000 +1000
2682 +-ERROR: Can't use output modifiers with user-defined output
2683 +-********* simple selection ********* ********* selection by list *********
2684 +--A all processes -C by command name
2685 +--N negate selection -G by real group ID (supports names)
2686 +--a all w/ tty except session leaders -U by real user ID (supports names)
2687 +--d all except session leaders -g by session leader OR by group name
2688 +--e all processes -p by process ID
2689 +-T all processes on this terminal -s processes in the sessions given
2690 +-a all w/ tty, including other users -t by tty
2691 +-g all, even group leaders! -u by effective user ID (supports names)
2692 +-r only running processes U processes for specified users
2693 +-x processes w/o controlling ttys t by tty
2694 +-*********** output format ********** *********** long options ***********
2695 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2696 +--j,j job control s signal --group --user --sid --rows
2697 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2698 +--l,l long u user-oriented --sort --tty --forest --version
2699 +--F extra full X registers --heading --no-heading
2700 +- ********* misc options *********
2701 +--V,V show version L list format codes f ASCII art forest
2702 +--m,m show threads S children in sum -y change -l format
2703 +--n,N set namelist file c true command name n numeric WCHAN,UID
2704 +--w,w wide output e show environment -H process hierarchy
2705 +diff -ruN procps-3.1.15.old/test/ps/fail-unknown-sort/header procps-3.1.15/test/ps/fail-unknown-sort/header
2706 +--- procps-3.1.15.old/test/ps/fail-unknown-sort/header 2003-10-02 11:49:27.000000000 +1000
2707 ++++ procps-3.1.15/test/ps/fail-unknown-sort/header 1970-01-01 10:00:00.000000000 +1000
2710 +\ No newline at end of file
2711 +diff -ruN procps-3.1.15.old/test/ps/fail-unknown-sort/setup procps-3.1.15/test/ps/fail-unknown-sort/setup
2712 +--- procps-3.1.15.old/test/ps/fail-unknown-sort/setup 2003-10-02 11:49:41.000000000 +1000
2713 ++++ procps-3.1.15/test/ps/fail-unknown-sort/setup 1970-01-01 10:00:00.000000000 +1000
2715 +-ARGS="--sort booger"
2717 +diff -ruN procps-3.1.15.old/test/ps/fail-unknown-sort/stderr procps-3.1.15/test/ps/fail-unknown-sort/stderr
2718 +--- procps-3.1.15.old/test/ps/fail-unknown-sort/stderr 2003-10-02 11:50:09.000000000 +1000
2719 ++++ procps-3.1.15/test/ps/fail-unknown-sort/stderr 1970-01-01 10:00:00.000000000 +1000
2721 +-ERROR: Unknown sort specifier.
2722 +-********* simple selection ********* ********* selection by list *********
2723 +--A all processes -C by command name
2724 +--N negate selection -G by real group ID (supports names)
2725 +--a all w/ tty except session leaders -U by real user ID (supports names)
2726 +--d all except session leaders -g by session leader OR by group name
2727 +--e all processes -p by process ID
2728 +-T all processes on this terminal -s processes in the sessions given
2729 +-a all w/ tty, including other users -t by tty
2730 +-g all, even group leaders! -u by effective user ID (supports names)
2731 +-r only running processes U processes for specified users
2732 +-x processes w/o controlling ttys t by tty
2733 +-*********** output format ********** *********** long options ***********
2734 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2735 +--j,j job control s signal --group --user --sid --rows
2736 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2737 +--l,l long u user-oriented --sort --tty --forest --version
2738 +--F extra full X registers --heading --no-heading
2739 +- ********* misc options *********
2740 +--V,V show version L list format codes f ASCII art forest
2741 +--m,m show threads S children in sum -y change -l format
2742 +--n,N set namelist file c true command name n numeric WCHAN,UID
2743 +--w,w wide output e show environment -H process hierarchy
2744 +diff -ruN procps-3.1.15.old/test/ps/fail-unknown-spec/header procps-3.1.15/test/ps/fail-unknown-spec/header
2745 +--- procps-3.1.15.old/test/ps/fail-unknown-spec/header 2003-10-02 11:35:33.000000000 +1000
2746 ++++ procps-3.1.15/test/ps/fail-unknown-spec/header 1970-01-01 10:00:00.000000000 +1000
2749 +\ No newline at end of file
2750 +diff -ruN procps-3.1.15.old/test/ps/fail-unknown-spec/setup procps-3.1.15/test/ps/fail-unknown-spec/setup
2751 +--- procps-3.1.15.old/test/ps/fail-unknown-spec/setup 2003-10-02 11:35:52.000000000 +1000
2752 ++++ procps-3.1.15/test/ps/fail-unknown-spec/setup 1970-01-01 10:00:00.000000000 +1000
2756 +diff -ruN procps-3.1.15.old/test/ps/fail-unknown-spec/stderr procps-3.1.15/test/ps/fail-unknown-spec/stderr
2757 +--- procps-3.1.15.old/test/ps/fail-unknown-spec/stderr 2003-10-02 11:36:05.000000000 +1000
2758 ++++ procps-3.1.15/test/ps/fail-unknown-spec/stderr 1970-01-01 10:00:00.000000000 +1000
2760 +-ERROR: Unknown user-defined format specifier "boogers".
2761 +-********* simple selection ********* ********* selection by list *********
2762 +--A all processes -C by command name
2763 +--N negate selection -G by real group ID (supports names)
2764 +--a all w/ tty except session leaders -U by real user ID (supports names)
2765 +--d all except session leaders -g by session leader OR by group name
2766 +--e all processes -p by process ID
2767 +-T all processes on this terminal -s processes in the sessions given
2768 +-a all w/ tty, including other users -t by tty
2769 +-g all, even group leaders! -u by effective user ID (supports names)
2770 +-r only running processes U processes for specified users
2771 +-x processes w/o controlling ttys t by tty
2772 +-*********** output format ********** *********** long options ***********
2773 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2774 +--j,j job control s signal --group --user --sid --rows
2775 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2776 +--l,l long u user-oriented --sort --tty --forest --version
2777 +--F extra full X registers --heading --no-heading
2778 +- ********* misc options *********
2779 +--V,V show version L list format codes f ASCII art forest
2780 +--m,m show threads S children in sum -y change -l format
2781 +--n,N set namelist file c true command name n numeric WCHAN,UID
2782 +--w,w wide output e show environment -H process hierarchy
2783 +diff -ruN procps-3.1.15.old/test/ps/fail-xx/header procps-3.1.15/test/ps/fail-xx/header
2784 +--- procps-3.1.15.old/test/ps/fail-xx/header 2003-09-02 09:43:13.000000000 +1000
2785 ++++ procps-3.1.15/test/ps/fail-xx/header 1970-01-01 10:00:00.000000000 +1000
2788 +\ No newline at end of file
2789 +diff -ruN procps-3.1.15.old/test/ps/fail-xx/setup procps-3.1.15/test/ps/fail-xx/setup
2790 +--- procps-3.1.15.old/test/ps/fail-xx/setup 2003-09-02 09:41:38.000000000 +1000
2791 ++++ procps-3.1.15/test/ps/fail-xx/setup 1970-01-01 10:00:00.000000000 +1000
2795 +diff -ruN procps-3.1.15.old/test/ps/fail-xx/stderr procps-3.1.15/test/ps/fail-xx/stderr
2796 +--- procps-3.1.15.old/test/ps/fail-xx/stderr 2003-09-02 09:42:04.000000000 +1000
2797 ++++ procps-3.1.15/test/ps/fail-xx/stderr 1970-01-01 10:00:00.000000000 +1000
2799 +-ERROR: Unsupported SysV option.
2800 +-********* simple selection ********* ********* selection by list *********
2801 +--A all processes -C by command name
2802 +--N negate selection -G by real group ID (supports names)
2803 +--a all w/ tty except session leaders -U by real user ID (supports names)
2804 +--d all except session leaders -g by session leader OR by group name
2805 +--e all processes -p by process ID
2806 +-T all processes on this terminal -s processes in the sessions given
2807 +-a all w/ tty, including other users -t by tty
2808 +-g all, even group leaders! -u by effective user ID (supports names)
2809 +-r only running processes U processes for specified users
2810 +-x processes w/o controlling ttys t by tty
2811 +-*********** output format ********** *********** long options ***********
2812 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2813 +--j,j job control s signal --group --user --sid --rows
2814 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2815 +--l,l long u user-oriented --sort --tty --forest --version
2816 +--F extra full X registers --heading --no-heading
2817 +- ********* misc options *********
2818 +--V,V show version L list format codes f ASCII art forest
2819 +--m,m show threads S children in sum -y change -l format
2820 +--n,N set namelist file c true command name n numeric WCHAN,UID
2821 +--w,w wide output e show environment -H process hierarchy
2822 +diff -ruN procps-3.1.15.old/test/ps/hpux-H-simple/setup procps-3.1.15/test/ps/hpux-H-simple/setup
2823 +--- procps-3.1.15.old/test/ps/hpux-H-simple/setup 2003-09-03 10:15:28.000000000 +1000
2824 ++++ procps-3.1.15/test/ps/hpux-H-simple/setup 1970-01-01 10:00:00.000000000 +1000
2826 +-ARGS="-HC fork-you -o comm="
2831 +-./fork-you 3 4 5 6 7 8 9
2834 +- diff -Naurd stdout $TESTNAME/stdout >> /dev/null
2838 +- killall -9 fork-you
2840 +diff -ruN procps-3.1.15.old/test/ps/hpux-H-simple/stdout procps-3.1.15/test/ps/hpux-H-simple/stdout
2841 +--- procps-3.1.15.old/test/ps/hpux-H-simple/stdout 2003-09-03 09:51:00.000000000 +1000
2842 ++++ procps-3.1.15/test/ps/hpux-H-simple/stdout 1970-01-01 10:00:00.000000000 +1000
2853 +diff -ruN procps-3.1.15.old/test/ps/jyclf-header/header procps-3.1.15/test/ps/jyclf-header/header
2854 +--- procps-3.1.15.old/test/ps/jyclf-header/header 2003-09-02 13:57:34.000000000 +1000
2855 ++++ procps-3.1.15/test/ps/jyclf-header/header 1970-01-01 10:00:00.000000000 +1000
2857 +- S UID PID PPID PGID SID CLS PRI RSS SZ WCHAN STIME TTY TIME CMD
2858 +diff -ruN procps-3.1.15.old/test/ps/jyclf-header/setup procps-3.1.15/test/ps/jyclf-header/setup
2859 +--- procps-3.1.15.old/test/ps/jyclf-header/setup 2003-09-02 13:55:34.000000000 +1000
2860 ++++ procps-3.1.15/test/ps/jyclf-header/setup 1970-01-01 10:00:00.000000000 +1000
2864 +diff -ruN procps-3.1.15.old/test/ps/linux-lf-header/header procps-3.1.15/test/ps/linux-lf-header/header
2865 +--- procps-3.1.15.old/test/ps/linux-lf-header/header 2003-09-02 14:03:14.000000000 +1000
2866 ++++ procps-3.1.15/test/ps/linux-lf-header/header 1970-01-01 10:00:00.000000000 +1000
2868 +- F S USER PID PPID C PRI NI P SZ WCHAN STIME TTY TIME CMD
2869 +diff -ruN procps-3.1.15.old/test/ps/linux-lf-header/setup procps-3.1.15/test/ps/linux-lf-header/setup
2870 +--- procps-3.1.15.old/test/ps/linux-lf-header/setup 2003-09-02 14:04:14.000000000 +1000
2871 ++++ procps-3.1.15/test/ps/linux-lf-header/setup 1970-01-01 10:00:00.000000000 +1000
2873 +-export CMD_ENV=linux
2876 +diff -ruN procps-3.1.15.old/test/ps/mH-mix/header procps-3.1.15/test/ps/mH-mix/header
2877 +--- procps-3.1.15.old/test/ps/mH-mix/header 2003-10-02 12:38:52.000000000 +1000
2878 ++++ procps-3.1.15/test/ps/mH-mix/header 1970-01-01 10:00:00.000000000 +1000
2881 +\ No newline at end of file
2882 +diff -ruN procps-3.1.15.old/test/ps/mH-mix/setup procps-3.1.15/test/ps/mH-mix/setup
2883 +--- procps-3.1.15.old/test/ps/mH-mix/setup 2003-10-02 12:39:25.000000000 +1000
2884 ++++ procps-3.1.15/test/ps/mH-mix/setup 1970-01-01 10:00:00.000000000 +1000
2888 +diff -ruN procps-3.1.15.old/test/ps/mH-mix/stderr procps-3.1.15/test/ps/mH-mix/stderr
2889 +--- procps-3.1.15.old/test/ps/mH-mix/stderr 2003-10-02 12:40:18.000000000 +1000
2890 ++++ procps-3.1.15/test/ps/mH-mix/stderr 1970-01-01 10:00:00.000000000 +1000
2892 +-ERROR: Thread flags conflict; can't use H with m or -m.
2893 +-********* simple selection ********* ********* selection by list *********
2894 +--A all processes -C by command name
2895 +--N negate selection -G by real group ID (supports names)
2896 +--a all w/ tty except session leaders -U by real user ID (supports names)
2897 +--d all except session leaders -g by session leader OR by group name
2898 +--e all processes -p by process ID
2899 +-T all processes on this terminal -s processes in the sessions given
2900 +-a all w/ tty, including other users -t by tty
2901 +-g all, even group leaders! -u by effective user ID (supports names)
2902 +-r only running processes U processes for specified users
2903 +-x processes w/o controlling ttys t by tty
2904 +-*********** output format ********** *********** long options ***********
2905 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2906 +--j,j job control s signal --group --user --sid --rows
2907 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2908 +--l,l long u user-oriented --sort --tty --forest --version
2909 +--F extra full X registers --heading --no-heading
2910 +- ********* misc options *********
2911 +--V,V show version L list format codes f ASCII art forest
2912 +--m,m show threads S children in sum -y change -l format
2913 +--n,N set namelist file c true command name n numeric WCHAN,UID
2914 +--w,w wide output e show environment -H process hierarchy
2915 +diff -ruN procps-3.1.15.old/test/ps/mH-mix2/header procps-3.1.15/test/ps/mH-mix2/header
2916 +--- procps-3.1.15.old/test/ps/mH-mix2/header 2003-10-02 12:38:58.000000000 +1000
2917 ++++ procps-3.1.15/test/ps/mH-mix2/header 1970-01-01 10:00:00.000000000 +1000
2920 +\ No newline at end of file
2921 +diff -ruN procps-3.1.15.old/test/ps/mH-mix2/setup procps-3.1.15/test/ps/mH-mix2/setup
2922 +--- procps-3.1.15.old/test/ps/mH-mix2/setup 2003-10-02 12:39:15.000000000 +1000
2923 ++++ procps-3.1.15/test/ps/mH-mix2/setup 1970-01-01 10:00:00.000000000 +1000
2927 +diff -ruN procps-3.1.15.old/test/ps/mH-mix2/stderr procps-3.1.15/test/ps/mH-mix2/stderr
2928 +--- procps-3.1.15.old/test/ps/mH-mix2/stderr 2003-10-02 12:40:20.000000000 +1000
2929 ++++ procps-3.1.15/test/ps/mH-mix2/stderr 1970-01-01 10:00:00.000000000 +1000
2931 +-ERROR: Thread flags conflict; can't use H with m or -m.
2932 +-********* simple selection ********* ********* selection by list *********
2933 +--A all processes -C by command name
2934 +--N negate selection -G by real group ID (supports names)
2935 +--a all w/ tty except session leaders -U by real user ID (supports names)
2936 +--d all except session leaders -g by session leader OR by group name
2937 +--e all processes -p by process ID
2938 +-T all processes on this terminal -s processes in the sessions given
2939 +-a all w/ tty, including other users -t by tty
2940 +-g all, even group leaders! -u by effective user ID (supports names)
2941 +-r only running processes U processes for specified users
2942 +-x processes w/o controlling ttys t by tty
2943 +-*********** output format ********** *********** long options ***********
2944 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2945 +--j,j job control s signal --group --user --sid --rows
2946 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2947 +--l,l long u user-oriented --sort --tty --forest --version
2948 +--F extra full X registers --heading --no-heading
2949 +- ********* misc options *********
2950 +--V,V show version L list format codes f ASCII art forest
2951 +--m,m show threads S children in sum -y change -l format
2952 +--n,N set namelist file c true command name n numeric WCHAN,UID
2953 +--w,w wide output e show environment -H process hierarchy
2954 +diff -ruN procps-3.1.15.old/test/ps/mm-mix/header procps-3.1.15/test/ps/mm-mix/header
2955 +--- procps-3.1.15.old/test/ps/mm-mix/header 2003-10-02 12:37:41.000000000 +1000
2956 ++++ procps-3.1.15/test/ps/mm-mix/header 1970-01-01 10:00:00.000000000 +1000
2959 +\ No newline at end of file
2960 +diff -ruN procps-3.1.15.old/test/ps/mm-mix/setup procps-3.1.15/test/ps/mm-mix/setup
2961 +--- procps-3.1.15.old/test/ps/mm-mix/setup 2003-10-02 12:37:57.000000000 +1000
2962 ++++ procps-3.1.15/test/ps/mm-mix/setup 1970-01-01 10:00:00.000000000 +1000
2966 +diff -ruN procps-3.1.15.old/test/ps/mm-mix/stderr procps-3.1.15/test/ps/mm-mix/stderr
2967 +--- procps-3.1.15.old/test/ps/mm-mix/stderr 2003-10-02 12:38:11.000000000 +1000
2968 ++++ procps-3.1.15/test/ps/mm-mix/stderr 1970-01-01 10:00:00.000000000 +1000
2970 +-ERROR: Thread flags conflict; can't use both m and -m.
2971 +-********* simple selection ********* ********* selection by list *********
2972 +--A all processes -C by command name
2973 +--N negate selection -G by real group ID (supports names)
2974 +--a all w/ tty except session leaders -U by real user ID (supports names)
2975 +--d all except session leaders -g by session leader OR by group name
2976 +--e all processes -p by process ID
2977 +-T all processes on this terminal -s processes in the sessions given
2978 +-a all w/ tty, including other users -t by tty
2979 +-g all, even group leaders! -u by effective user ID (supports names)
2980 +-r only running processes U processes for specified users
2981 +-x processes w/o controlling ttys t by tty
2982 +-*********** output format ********** *********** long options ***********
2983 +--o,o user-defined -f full --Group --User --pid --cols --ppid
2984 +--j,j job control s signal --group --user --sid --rows
2985 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
2986 +--l,l long u user-oriented --sort --tty --forest --version
2987 +--F extra full X registers --heading --no-heading
2988 +- ********* misc options *********
2989 +--V,V show version L list format codes f ASCII art forest
2990 +--m,m show threads S children in sum -y change -l format
2991 +--n,N set namelist file c true command name n numeric WCHAN,UID
2992 +--w,w wide output e show environment -H process hierarchy
2993 +diff -ruN procps-3.1.15.old/test/ps/multi-sort/header procps-3.1.15/test/ps/multi-sort/header
2994 +--- procps-3.1.15.old/test/ps/multi-sort/header 2003-10-02 12:08:50.000000000 +1000
2995 ++++ procps-3.1.15/test/ps/multi-sort/header 1970-01-01 10:00:00.000000000 +1000
2998 +\ No newline at end of file
2999 +diff -ruN procps-3.1.15.old/test/ps/multi-sort/setup procps-3.1.15/test/ps/multi-sort/setup
3000 +--- procps-3.1.15.old/test/ps/multi-sort/setup 2003-10-02 12:09:10.000000000 +1000
3001 ++++ procps-3.1.15/test/ps/multi-sort/setup 1970-01-01 10:00:00.000000000 +1000
3003 +-ARGS="--sort wchan --sort sess"
3005 +diff -ruN procps-3.1.15.old/test/ps/multi-sort/stderr procps-3.1.15/test/ps/multi-sort/stderr
3006 +--- procps-3.1.15.old/test/ps/multi-sort/stderr 2003-10-02 12:09:23.000000000 +1000
3007 ++++ procps-3.1.15/test/ps/multi-sort/stderr 1970-01-01 10:00:00.000000000 +1000
3009 +-ERROR: Multiple sort options.
3010 +-********* simple selection ********* ********* selection by list *********
3011 +--A all processes -C by command name
3012 +--N negate selection -G by real group ID (supports names)
3013 +--a all w/ tty except session leaders -U by real user ID (supports names)
3014 +--d all except session leaders -g by session leader OR by group name
3015 +--e all processes -p by process ID
3016 +-T all processes on this terminal -s processes in the sessions given
3017 +-a all w/ tty, including other users -t by tty
3018 +-g all, even group leaders! -u by effective user ID (supports names)
3019 +-r only running processes U processes for specified users
3020 +-x processes w/o controlling ttys t by tty
3021 +-*********** output format ********** *********** long options ***********
3022 +--o,o user-defined -f full --Group --User --pid --cols --ppid
3023 +--j,j job control s signal --group --user --sid --rows
3024 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
3025 +--l,l long u user-oriented --sort --tty --forest --version
3026 +--F extra full X registers --heading --no-heading
3027 +- ********* misc options *********
3028 +--V,V show version L list format codes f ASCII art forest
3029 +--m,m show threads S children in sum -y change -l format
3030 +--n,N set namelist file c true command name n numeric WCHAN,UID
3031 +--w,w wide output e show environment -H process hierarchy
3032 +diff -ruN procps-3.1.15.old/test/ps/o-O/header procps-3.1.15/test/ps/o-O/header
3033 +--- procps-3.1.15.old/test/ps/o-O/header 2003-10-02 12:03:27.000000000 +1000
3034 ++++ procps-3.1.15/test/ps/o-O/header 1970-01-01 10:00:00.000000000 +1000
3037 +\ No newline at end of file
3038 +diff -ruN procps-3.1.15.old/test/ps/o-O/setup procps-3.1.15/test/ps/o-O/setup
3039 +--- procps-3.1.15.old/test/ps/o-O/setup 2003-10-02 12:04:40.000000000 +1000
3040 ++++ procps-3.1.15/test/ps/o-O/setup 1970-01-01 10:00:00.000000000 +1000
3042 +-ARGS="-o wchan -O sess"
3044 +diff -ruN procps-3.1.15.old/test/ps/o-O/stderr procps-3.1.15/test/ps/o-O/stderr
3045 +--- procps-3.1.15.old/test/ps/o-O/stderr 2003-10-02 12:06:35.000000000 +1000
3046 ++++ procps-3.1.15/test/ps/o-O/stderr 1970-01-01 10:00:00.000000000 +1000
3048 +-ERROR: option -O can not follow other format options.
3049 +-********* simple selection ********* ********* selection by list *********
3050 +--A all processes -C by command name
3051 +--N negate selection -G by real group ID (supports names)
3052 +--a all w/ tty except session leaders -U by real user ID (supports names)
3053 +--d all except session leaders -g by session leader OR by group name
3054 +--e all processes -p by process ID
3055 +-T all processes on this terminal -s processes in the sessions given
3056 +-a all w/ tty, including other users -t by tty
3057 +-g all, even group leaders! -u by effective user ID (supports names)
3058 +-r only running processes U processes for specified users
3059 +-x processes w/o controlling ttys t by tty
3060 +-*********** output format ********** *********** long options ***********
3061 +--o,o user-defined -f full --Group --User --pid --cols --ppid
3062 +--j,j job control s signal --group --user --sid --rows
3063 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
3064 +--l,l long u user-oriented --sort --tty --forest --version
3065 +--F extra full X registers --heading --no-heading
3066 +- ********* misc options *********
3067 +--V,V show version L list format codes f ASCII art forest
3068 +--m,m show threads S children in sum -y change -l format
3069 +--n,N set namelist file c true command name n numeric WCHAN,UID
3070 +--w,w wide output e show environment -H process hierarchy
3071 +diff -ruN procps-3.1.15.old/test/ps/o-o/header procps-3.1.15/test/ps/o-o/header
3072 +--- procps-3.1.15.old/test/ps/o-o/header 2003-10-02 12:07:18.000000000 +1000
3073 ++++ procps-3.1.15/test/ps/o-o/header 1970-01-01 10:00:00.000000000 +1000
3076 +diff -ruN procps-3.1.15.old/test/ps/o-o/setup procps-3.1.15/test/ps/o-o/setup
3077 +--- procps-3.1.15.old/test/ps/o-o/setup 2003-10-02 12:07:08.000000000 +1000
3078 ++++ procps-3.1.15/test/ps/o-o/setup 1970-01-01 10:00:00.000000000 +1000
3080 +-ARGS="-o wchan -o sess"
3082 +diff -ruN procps-3.1.15.old/test/ps/old-m-1/header procps-3.1.15/test/ps/old-m-1/header
3083 +--- procps-3.1.15.old/test/ps/old-m-1/header 2003-09-02 09:46:21.000000000 +1000
3084 ++++ procps-3.1.15/test/ps/old-m-1/header 1970-01-01 10:00:00.000000000 +1000
3086 +- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND
3087 +diff -ruN procps-3.1.15.old/test/ps/old-m-1/setup procps-3.1.15/test/ps/old-m-1/setup
3088 +--- procps-3.1.15.old/test/ps/old-m-1/setup 2003-09-02 09:46:06.000000000 +1000
3089 ++++ procps-3.1.15/test/ps/old-m-1/setup 1970-01-01 10:00:00.000000000 +1000
3091 +-export CMD_ENV=old
3094 +diff -ruN procps-3.1.15.old/test/ps/old-m-2/header procps-3.1.15/test/ps/old-m-2/header
3095 +--- procps-3.1.15.old/test/ps/old-m-2/header 2003-09-02 09:47:13.000000000 +1000
3096 ++++ procps-3.1.15/test/ps/old-m-2/header 1970-01-01 10:00:00.000000000 +1000
3098 +- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND
3099 +diff -ruN procps-3.1.15.old/test/ps/old-m-2/setup procps-3.1.15/test/ps/old-m-2/setup
3100 +--- procps-3.1.15.old/test/ps/old-m-2/setup 2003-09-02 09:47:47.000000000 +1000
3101 ++++ procps-3.1.15/test/ps/old-m-2/setup 1970-01-01 10:00:00.000000000 +1000
3103 +-export CMD_ENV=unix
3104 +-export PS_PERSONALITY=old
3107 +diff -ruN procps-3.1.15.old/test/ps/old-m-3/header procps-3.1.15/test/ps/old-m-3/header
3108 +--- procps-3.1.15.old/test/ps/old-m-3/header 2003-09-02 09:47:15.000000000 +1000
3109 ++++ procps-3.1.15/test/ps/old-m-3/header 1970-01-01 10:00:00.000000000 +1000
3111 +- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND
3112 +diff -ruN procps-3.1.15.old/test/ps/old-m-3/setup procps-3.1.15/test/ps/old-m-3/setup
3113 +--- procps-3.1.15.old/test/ps/old-m-3/setup 2003-09-02 09:47:58.000000000 +1000
3114 ++++ procps-3.1.15/test/ps/old-m-3/setup 1970-01-01 10:00:00.000000000 +1000
3116 +-export CMD_ENV=old
3119 +diff -ruN procps-3.1.15.old/test/ps/old-m-4/header procps-3.1.15/test/ps/old-m-4/header
3120 +--- procps-3.1.15.old/test/ps/old-m-4/header 2003-09-02 09:47:16.000000000 +1000
3121 ++++ procps-3.1.15/test/ps/old-m-4/header 1970-01-01 10:00:00.000000000 +1000
3123 +- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND
3124 +diff -ruN procps-3.1.15.old/test/ps/old-m-4/setup procps-3.1.15/test/ps/old-m-4/setup
3125 +--- procps-3.1.15.old/test/ps/old-m-4/setup 2003-09-02 09:50:11.000000000 +1000
3126 ++++ procps-3.1.15/test/ps/old-m-4/setup 1970-01-01 10:00:00.000000000 +1000
3128 +-export I_WANT_A_BROKEN_PS=
3131 +diff -ruN procps-3.1.15.old/test/ps/pcpu-sort-threaded/setup procps-3.1.15/test/ps/pcpu-sort-threaded/setup
3132 +--- procps-3.1.15.old/test/ps/pcpu-sort-threaded/setup 2003-10-19 13:48:43.000000000 +1000
3133 ++++ procps-3.1.15/test/ps/pcpu-sort-threaded/setup 1970-01-01 10:00:00.000000000 +1000
3135 +-ARGS="-e --sort=pcpu -o cp="
3140 +- sort -n < stdout > sorted.tmp
3141 +- diff -Naurd stdout sorted.tmp >> /dev/null
3143 +diff -ruN procps-3.1.15.old/test/ps/suv-conflicts/header procps-3.1.15/test/ps/suv-conflicts/header
3144 +--- procps-3.1.15.old/test/ps/suv-conflicts/header 2003-10-02 12:12:30.000000000 +1000
3145 ++++ procps-3.1.15/test/ps/suv-conflicts/header 1970-01-01 10:00:00.000000000 +1000
3148 +\ No newline at end of file
3149 +diff -ruN procps-3.1.15.old/test/ps/suv-conflicts/setup procps-3.1.15/test/ps/suv-conflicts/setup
3150 +--- procps-3.1.15.old/test/ps/suv-conflicts/setup 2003-10-02 12:13:26.000000000 +1000
3151 ++++ procps-3.1.15/test/ps/suv-conflicts/setup 1970-01-01 10:00:00.000000000 +1000
3155 +diff -ruN procps-3.1.15.old/test/ps/suv-conflicts/stderr procps-3.1.15/test/ps/suv-conflicts/stderr
3156 +--- procps-3.1.15.old/test/ps/suv-conflicts/stderr 2003-10-02 12:13:41.000000000 +1000
3157 ++++ procps-3.1.15/test/ps/suv-conflicts/stderr 1970-01-01 10:00:00.000000000 +1000
3159 +-ERROR: Conflicting format options.
3160 +-********* simple selection ********* ********* selection by list *********
3161 +--A all processes -C by command name
3162 +--N negate selection -G by real group ID (supports names)
3163 +--a all w/ tty except session leaders -U by real user ID (supports names)
3164 +--d all except session leaders -g by session leader OR by group name
3165 +--e all processes -p by process ID
3166 +-T all processes on this terminal -s processes in the sessions given
3167 +-a all w/ tty, including other users -t by tty
3168 +-g all, even group leaders! -u by effective user ID (supports names)
3169 +-r only running processes U processes for specified users
3170 +-x processes w/o controlling ttys t by tty
3171 +-*********** output format ********** *********** long options ***********
3172 +--o,o user-defined -f full --Group --User --pid --cols --ppid
3173 +--j,j job control s signal --group --user --sid --rows
3174 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
3175 +--l,l long u user-oriented --sort --tty --forest --version
3176 +--F extra full X registers --heading --no-heading
3177 +- ********* misc options *********
3178 +--V,V show version L list format codes f ASCII art forest
3179 +--m,m show threads S children in sum -y change -l format
3180 +--n,N set namelist file c true command name n numeric WCHAN,UID
3181 +--w,w wide output e show environment -H process hierarchy
3182 +diff -ruN procps-3.1.15.old/test/ps/sysv-selection/header procps-3.1.15/test/ps/sysv-selection/header
3183 +--- procps-3.1.15.old/test/ps/sysv-selection/header 2003-09-04 16:13:34.000000000 +1000
3184 ++++ procps-3.1.15/test/ps/sysv-selection/header 1970-01-01 10:00:00.000000000 +1000
3187 +diff -ruN procps-3.1.15.old/test/ps/sysv-selection/setup procps-3.1.15/test/ps/sysv-selection/setup
3188 +--- procps-3.1.15.old/test/ps/sysv-selection/setup 2003-09-13 13:59:04.000000000 +1000
3189 ++++ procps-3.1.15/test/ps/sysv-selection/setup 1970-01-01 10:00:00.000000000 +1000
3196 +-rm -f misc.tmp ready.tmp typescript.tmp
3199 +-# this'll do but... WHERE ARE THE MAN PAGES FOR PTY STUFF???
3200 +-(SHELL=`pwd`/script-child script typescript.tmp &>/dev/null) &
3201 +-while [ ! -f ready.tmp ] ; do sleep 0.01 ; done
3205 +- THIS_TTY=`tty | colrm 1 5`
3206 +- lines1=`awk '{print $2}' < stdout | sort -u | egrep "^($THIS_TTY)$" | wc -l`
3207 +- lines3=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY|\?)$" | wc -l`
3208 +- [ $lines1 == 1 ] && [ $lines3 == 1 ]
3212 +- killall -9 got-no-tty
3213 +- kill -9 $SHELL_PID # the others should freely die
3214 +- rm -f misc.tmp ready.tmp typescript.tmp
3216 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-H/header procps-3.1.15/test/ps/thread-nosort-H/header
3217 +--- procps-3.1.15.old/test/ps/thread-nosort-H/header 2003-10-20 10:57:52.000000000 +1000
3218 ++++ procps-3.1.15/test/ps/thread-nosort-H/header 1970-01-01 10:00:00.000000000 +1000
3220 +- PID TTY STAT TIME COMMAND
3221 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-H/setup procps-3.1.15/test/ps/thread-nosort-H/setup
3222 +--- procps-3.1.15.old/test/ps/thread-nosort-H/setup 2003-10-20 10:50:16.000000000 +1000
3223 ++++ procps-3.1.15/test/ps/thread-nosort-H/setup 1970-01-01 10:00:00.000000000 +1000
3225 +-ARGS="-C clone-once H"
3233 +- [ `wc -l < stdout` == 3 ]
3237 +- killall -9 clone-once
3239 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-HL/header procps-3.1.15/test/ps/thread-nosort-HL/header
3240 +--- procps-3.1.15.old/test/ps/thread-nosort-HL/header 2003-10-20 10:57:52.000000000 +1000
3241 ++++ procps-3.1.15/test/ps/thread-nosort-HL/header 1970-01-01 10:00:00.000000000 +1000
3243 +- PID LWP TTY STAT TIME COMMAND
3244 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-HL/setup procps-3.1.15/test/ps/thread-nosort-HL/setup
3245 +--- procps-3.1.15.old/test/ps/thread-nosort-HL/setup 2003-10-20 10:50:16.000000000 +1000
3246 ++++ procps-3.1.15/test/ps/thread-nosort-HL/setup 1970-01-01 10:00:00.000000000 +1000
3248 +-ARGS="-C clone-once H -L"
3256 +- [ `wc -l < stdout` == 3 ]
3260 +- killall -9 clone-once
3262 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-Hm/setup procps-3.1.15/test/ps/thread-nosort-Hm/setup
3263 +--- procps-3.1.15.old/test/ps/thread-nosort-Hm/setup 2003-10-20 10:50:16.000000000 +1000
3264 ++++ procps-3.1.15/test/ps/thread-nosort-Hm/setup 1970-01-01 10:00:00.000000000 +1000
3266 +-ARGS="-C clone-once Hm"
3268 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-Hm/stderr procps-3.1.15/test/ps/thread-nosort-Hm/stderr
3269 +--- procps-3.1.15.old/test/ps/thread-nosort-Hm/stderr 2003-10-20 10:58:35.000000000 +1000
3270 ++++ procps-3.1.15/test/ps/thread-nosort-Hm/stderr 1970-01-01 10:00:00.000000000 +1000
3272 +-ERROR: Thread flags conflict; can't use H with m or -m.
3273 +-********* simple selection ********* ********* selection by list *********
3274 +--A all processes -C by command name
3275 +--N negate selection -G by real group ID (supports names)
3276 +--a all w/ tty except session leaders -U by real user ID (supports names)
3277 +--d all except session leaders -g by session leader OR by group name
3278 +--e all processes -p by process ID
3279 +-T all processes on this terminal -s processes in the sessions given
3280 +-a all w/ tty, including other users -t by tty
3281 +-g all, even group leaders! -u by effective user ID (supports names)
3282 +-r only running processes U processes for specified users
3283 +-x processes w/o controlling ttys t by tty
3284 +-*********** output format ********** *********** long options ***********
3285 +--o,o user-defined -f full --Group --User --pid --cols --ppid
3286 +--j,j job control s signal --group --user --sid --rows
3287 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
3288 +--l,l long u user-oriented --sort --tty --forest --version
3289 +--F extra full X registers --heading --no-heading
3290 +- ********* misc options *********
3291 +--V,V show version L list format codes f ASCII art forest
3292 +--m,m show threads S children in sum -y change -l format
3293 +--n,N set namelist file c true command name n numeric WCHAN,UID
3294 +--w,w wide output e show environment -H process hierarchy
3295 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-L/header procps-3.1.15/test/ps/thread-nosort-L/header
3296 +--- procps-3.1.15.old/test/ps/thread-nosort-L/header 2003-10-20 10:57:52.000000000 +1000
3297 ++++ procps-3.1.15/test/ps/thread-nosort-L/header 1970-01-01 10:00:00.000000000 +1000
3299 +- PID LWP TTY TIME CMD
3300 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-L/setup procps-3.1.15/test/ps/thread-nosort-L/setup
3301 +--- procps-3.1.15.old/test/ps/thread-nosort-L/setup 2003-10-20 10:50:16.000000000 +1000
3302 ++++ procps-3.1.15/test/ps/thread-nosort-L/setup 1970-01-01 10:00:00.000000000 +1000
3304 +-ARGS="-C clone-once -L"
3312 +- [ `wc -l < stdout` == 3 ]
3316 +- killall -9 clone-once
3318 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-default/header procps-3.1.15/test/ps/thread-nosort-default/header
3319 +--- procps-3.1.15.old/test/ps/thread-nosort-default/header 2003-10-20 10:57:53.000000000 +1000
3320 ++++ procps-3.1.15/test/ps/thread-nosort-default/header 1970-01-01 10:00:00.000000000 +1000
3323 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-default/setup procps-3.1.15/test/ps/thread-nosort-default/setup
3324 +--- procps-3.1.15.old/test/ps/thread-nosort-default/setup 2003-10-20 10:50:16.000000000 +1000
3325 ++++ procps-3.1.15/test/ps/thread-nosort-default/setup 1970-01-01 10:00:00.000000000 +1000
3327 +-ARGS="-C clone-once"
3335 +- [ `wc -l < stdout` == 2 ]
3339 +- killall -9 clone-once
3341 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-m/header procps-3.1.15/test/ps/thread-nosort-m/header
3342 +--- procps-3.1.15.old/test/ps/thread-nosort-m/header 2003-10-20 10:57:53.000000000 +1000
3343 ++++ procps-3.1.15/test/ps/thread-nosort-m/header 1970-01-01 10:00:00.000000000 +1000
3345 +- PID TTY STAT TIME COMMAND
3346 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-m/setup procps-3.1.15/test/ps/thread-nosort-m/setup
3347 +--- procps-3.1.15.old/test/ps/thread-nosort-m/setup 2003-10-20 10:50:16.000000000 +1000
3348 ++++ procps-3.1.15/test/ps/thread-nosort-m/setup 1970-01-01 10:00:00.000000000 +1000
3350 +-ARGS="-C clone-once m"
3358 +- [ `wc -l < stdout` == 4 ]
3362 +- killall -9 clone-once
3364 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-mL/header procps-3.1.15/test/ps/thread-nosort-mL/header
3365 +--- procps-3.1.15.old/test/ps/thread-nosort-mL/header 2003-10-20 10:57:53.000000000 +1000
3366 ++++ procps-3.1.15/test/ps/thread-nosort-mL/header 1970-01-01 10:00:00.000000000 +1000
3368 +- PID LWP TTY TIME CMD
3369 +diff -ruN procps-3.1.15.old/test/ps/thread-nosort-mL/setup procps-3.1.15/test/ps/thread-nosort-mL/setup
3370 +--- procps-3.1.15.old/test/ps/thread-nosort-mL/setup 2003-10-20 10:50:16.000000000 +1000
3371 ++++ procps-3.1.15/test/ps/thread-nosort-mL/setup 1970-01-01 10:00:00.000000000 +1000
3373 +-ARGS="-C clone-once -mL"
3381 +- [ `wc -l < stdout` == 4 ]
3385 +- killall -9 clone-once
3387 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-H/header procps-3.1.15/test/ps/thread-sorted-H/header
3388 +--- procps-3.1.15.old/test/ps/thread-sorted-H/header 2003-10-20 10:57:53.000000000 +1000
3389 ++++ procps-3.1.15/test/ps/thread-sorted-H/header 1970-01-01 10:00:00.000000000 +1000
3391 +- PID TTY STAT TIME COMMAND
3392 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-H/setup procps-3.1.15/test/ps/thread-sorted-H/setup
3393 +--- procps-3.1.15.old/test/ps/thread-sorted-H/setup 2003-10-20 10:45:59.000000000 +1000
3394 ++++ procps-3.1.15/test/ps/thread-sorted-H/setup 1970-01-01 10:00:00.000000000 +1000
3396 +-ARGS="-C clone-once --sort=pid H"
3404 +- [ `wc -l < stdout` == 3 ]
3408 +- killall -9 clone-once
3410 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-HL/header procps-3.1.15/test/ps/thread-sorted-HL/header
3411 +--- procps-3.1.15.old/test/ps/thread-sorted-HL/header 2003-10-20 10:57:53.000000000 +1000
3412 ++++ procps-3.1.15/test/ps/thread-sorted-HL/header 1970-01-01 10:00:00.000000000 +1000
3414 +- PID LWP TTY STAT TIME COMMAND
3415 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-HL/setup procps-3.1.15/test/ps/thread-sorted-HL/setup
3416 +--- procps-3.1.15.old/test/ps/thread-sorted-HL/setup 2003-10-20 10:45:16.000000000 +1000
3417 ++++ procps-3.1.15/test/ps/thread-sorted-HL/setup 1970-01-01 10:00:00.000000000 +1000
3419 +-ARGS="-C clone-once --sort=pid H -L"
3427 +- [ `wc -l < stdout` == 3 ]
3431 +- killall -9 clone-once
3433 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-Hm/setup procps-3.1.15/test/ps/thread-sorted-Hm/setup
3434 +--- procps-3.1.15.old/test/ps/thread-sorted-Hm/setup 2003-10-20 10:47:00.000000000 +1000
3435 ++++ procps-3.1.15/test/ps/thread-sorted-Hm/setup 1970-01-01 10:00:00.000000000 +1000
3437 +-ARGS="-C clone-once --sort=pid Hm"
3439 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-Hm/stderr procps-3.1.15/test/ps/thread-sorted-Hm/stderr
3440 +--- procps-3.1.15.old/test/ps/thread-sorted-Hm/stderr 2003-10-20 10:58:47.000000000 +1000
3441 ++++ procps-3.1.15/test/ps/thread-sorted-Hm/stderr 1970-01-01 10:00:00.000000000 +1000
3443 +-ERROR: Thread flags conflict; can't use H with m or -m.
3444 +-********* simple selection ********* ********* selection by list *********
3445 +--A all processes -C by command name
3446 +--N negate selection -G by real group ID (supports names)
3447 +--a all w/ tty except session leaders -U by real user ID (supports names)
3448 +--d all except session leaders -g by session leader OR by group name
3449 +--e all processes -p by process ID
3450 +-T all processes on this terminal -s processes in the sessions given
3451 +-a all w/ tty, including other users -t by tty
3452 +-g all, even group leaders! -u by effective user ID (supports names)
3453 +-r only running processes U processes for specified users
3454 +-x processes w/o controlling ttys t by tty
3455 +-*********** output format ********** *********** long options ***********
3456 +--o,o user-defined -f full --Group --User --pid --cols --ppid
3457 +--j,j job control s signal --group --user --sid --rows
3458 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
3459 +--l,l long u user-oriented --sort --tty --forest --version
3460 +--F extra full X registers --heading --no-heading
3461 +- ********* misc options *********
3462 +--V,V show version L list format codes f ASCII art forest
3463 +--m,m show threads S children in sum -y change -l format
3464 +--n,N set namelist file c true command name n numeric WCHAN,UID
3465 +--w,w wide output e show environment -H process hierarchy
3466 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-L/header procps-3.1.15/test/ps/thread-sorted-L/header
3467 +--- procps-3.1.15.old/test/ps/thread-sorted-L/header 2003-10-20 10:57:53.000000000 +1000
3468 ++++ procps-3.1.15/test/ps/thread-sorted-L/header 1970-01-01 10:00:00.000000000 +1000
3470 +- PID LWP TTY TIME CMD
3471 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-L/setup procps-3.1.15/test/ps/thread-sorted-L/setup
3472 +--- procps-3.1.15.old/test/ps/thread-sorted-L/setup 2003-10-20 10:45:35.000000000 +1000
3473 ++++ procps-3.1.15/test/ps/thread-sorted-L/setup 1970-01-01 10:00:00.000000000 +1000
3475 +-ARGS="-C clone-once --sort=pid -L"
3483 +- [ `wc -l < stdout` == 3 ]
3487 +- killall -9 clone-once
3489 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-default/header procps-3.1.15/test/ps/thread-sorted-default/header
3490 +--- procps-3.1.15.old/test/ps/thread-sorted-default/header 2003-10-20 10:57:53.000000000 +1000
3491 ++++ procps-3.1.15/test/ps/thread-sorted-default/header 1970-01-01 10:00:00.000000000 +1000
3494 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-default/setup procps-3.1.15/test/ps/thread-sorted-default/setup
3495 +--- procps-3.1.15.old/test/ps/thread-sorted-default/setup 2003-10-20 10:47:53.000000000 +1000
3496 ++++ procps-3.1.15/test/ps/thread-sorted-default/setup 1970-01-01 10:00:00.000000000 +1000
3498 +-ARGS="-C clone-once --sort=pid"
3506 +- [ `wc -l < stdout` == 2 ]
3510 +- killall -9 clone-once
3512 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-m/header procps-3.1.15/test/ps/thread-sorted-m/header
3513 +--- procps-3.1.15.old/test/ps/thread-sorted-m/header 2003-10-20 10:57:53.000000000 +1000
3514 ++++ procps-3.1.15/test/ps/thread-sorted-m/header 1970-01-01 10:00:00.000000000 +1000
3516 +- PID TTY STAT TIME COMMAND
3517 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-m/setup procps-3.1.15/test/ps/thread-sorted-m/setup
3518 +--- procps-3.1.15.old/test/ps/thread-sorted-m/setup 2003-10-20 10:42:59.000000000 +1000
3519 ++++ procps-3.1.15/test/ps/thread-sorted-m/setup 1970-01-01 10:00:00.000000000 +1000
3521 +-ARGS="-C clone-once --sort=pid m"
3529 +- [ `wc -l < stdout` == 4 ]
3533 +- killall -9 clone-once
3535 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-mL/header procps-3.1.15/test/ps/thread-sorted-mL/header
3536 +--- procps-3.1.15.old/test/ps/thread-sorted-mL/header 2003-10-20 10:57:54.000000000 +1000
3537 ++++ procps-3.1.15/test/ps/thread-sorted-mL/header 1970-01-01 10:00:00.000000000 +1000
3539 +- PID LWP TTY TIME CMD
3540 +diff -ruN procps-3.1.15.old/test/ps/thread-sorted-mL/setup procps-3.1.15/test/ps/thread-sorted-mL/setup
3541 +--- procps-3.1.15.old/test/ps/thread-sorted-mL/setup 2003-10-20 10:44:46.000000000 +1000
3542 ++++ procps-3.1.15/test/ps/thread-sorted-mL/setup 1970-01-01 10:00:00.000000000 +1000
3544 +-ARGS="-C clone-once --sort=pid -mL"
3552 +- [ `wc -l < stdout` == 4 ]
3556 +- killall -9 clone-once
3558 +diff -ruN procps-3.1.15.old/test/ps/unix-comm/setup procps-3.1.15/test/ps/unix-comm/setup
3559 +--- procps-3.1.15.old/test/ps/unix-comm/setup 2003-09-02 10:33:46.000000000 +1000
3560 ++++ procps-3.1.15/test/ps/unix-comm/setup 1970-01-01 10:00:00.000000000 +1000
3567 +- grep "ps$" stdout >> /dev/null
3569 +diff -ruN procps-3.1.15.old/test/ps/unix-doc/setup procps-3.1.15/test/ps/unix-doc/setup
3570 +--- procps-3.1.15.old/test/ps/unix-doc/setup 2003-09-03 13:38:37.000000000 +1000
3571 ++++ procps-3.1.15/test/ps/unix-doc/setup 1970-01-01 10:00:00.000000000 +1000
3573 +-# The UNIX+POSIX standard requires that, except for "args" and "comm",
3574 +-# the documentation must warn about any implementation-defined
3575 +-# format specifiers that may contain blanks.
3577 +-# Using "ps L" to grab the list isn't proper, but it's needed.
3579 +-# This is our list for the man page:
3592 +-# It gets to 819 last I checked
3593 +-export COLUMNS=1111
3595 +-biglist=`$TESTME L \
3596 +- | egrep -v '^(comm|args|cmd|comm|command|fname|ucmd|ucomm|lstart|bsdstart|start) ' \
3597 +- | awk '{printf("%s,",$1);}'`
3598 +-numcols=`echo $biglist | tr -dc , | wc -c`
3605 +- while read -a myarray; do
3606 +- [ ${#myarray[*]} == $numcols ] || return 1
3610 +diff -ruN procps-3.1.15.old/test/ps/unix-f-args/setup procps-3.1.15/test/ps/unix-f-args/setup
3611 +--- procps-3.1.15.old/test/ps/unix-f-args/setup 2003-09-02 10:33:18.000000000 +1000
3612 ++++ procps-3.1.15/test/ps/unix-f-args/setup 1970-01-01 10:00:00.000000000 +1000
3619 +- grep "ps -f$" stdout >> /dev/null
3621 +diff -ruN procps-3.1.15.old/test/ps/unix-f-header/header procps-3.1.15/test/ps/unix-f-header/header
3622 +--- procps-3.1.15.old/test/ps/unix-f-header/header 2003-09-02 08:40:35.000000000 +1000
3623 ++++ procps-3.1.15/test/ps/unix-f-header/header 1970-01-01 10:00:00.000000000 +1000
3625 +- UID PID PPID C STIME TTY TIME CMD
3626 +diff -ruN procps-3.1.15.old/test/ps/unix-f-header/setup procps-3.1.15/test/ps/unix-f-header/setup
3627 +--- procps-3.1.15.old/test/ps/unix-f-header/setup 2003-09-02 08:37:18.000000000 +1000
3628 ++++ procps-3.1.15/test/ps/unix-f-header/setup 1970-01-01 10:00:00.000000000 +1000
3632 +diff -ruN procps-3.1.15.old/test/ps/unix-fl-header/header procps-3.1.15/test/ps/unix-fl-header/header
3633 +--- procps-3.1.15.old/test/ps/unix-fl-header/header 2003-09-02 08:53:56.000000000 +1000
3634 ++++ procps-3.1.15/test/ps/unix-fl-header/header 1970-01-01 10:00:00.000000000 +1000
3636 +- F S UID PID PPID C PRI NI ADDR SZ WCHAN STIME TTY TIME CMD
3637 +diff -ruN procps-3.1.15.old/test/ps/unix-fl-header/setup procps-3.1.15/test/ps/unix-fl-header/setup
3638 +--- procps-3.1.15.old/test/ps/unix-fl-header/setup 2003-09-02 08:55:32.000000000 +1000
3639 ++++ procps-3.1.15/test/ps/unix-fl-header/setup 1970-01-01 10:00:00.000000000 +1000
3643 +diff -ruN procps-3.1.15.old/test/ps/unix-header/header procps-3.1.15/test/ps/unix-header/header
3644 +--- procps-3.1.15.old/test/ps/unix-header/header 2003-09-02 08:53:56.000000000 +1000
3645 ++++ procps-3.1.15/test/ps/unix-header/header 1970-01-01 10:00:00.000000000 +1000
3648 +diff -ruN procps-3.1.15.old/test/ps/unix-header/setup procps-3.1.15/test/ps/unix-header/setup
3649 +--- procps-3.1.15.old/test/ps/unix-header/setup 2003-09-02 08:55:09.000000000 +1000
3650 ++++ procps-3.1.15/test/ps/unix-header/setup 1970-01-01 10:00:00.000000000 +1000
3654 +diff -ruN procps-3.1.15.old/test/ps/unix-l-header/header procps-3.1.15/test/ps/unix-l-header/header
3655 +--- procps-3.1.15.old/test/ps/unix-l-header/header 2003-09-02 08:53:56.000000000 +1000
3656 ++++ procps-3.1.15/test/ps/unix-l-header/header 1970-01-01 10:00:00.000000000 +1000
3658 +- F S UID PID PPID C PRI NI ADDR SZ WCHAN TTY TIME CMD
3659 +diff -ruN procps-3.1.15.old/test/ps/unix-l-header/setup procps-3.1.15/test/ps/unix-l-header/setup
3660 +--- procps-3.1.15.old/test/ps/unix-l-header/setup 2003-09-02 08:55:49.000000000 +1000
3661 ++++ procps-3.1.15/test/ps/unix-l-header/setup 1970-01-01 10:00:00.000000000 +1000
3665 +diff -ruN procps-3.1.15.old/test/ps/unix-lf-header/header procps-3.1.15/test/ps/unix-lf-header/header
3666 +--- procps-3.1.15.old/test/ps/unix-lf-header/header 2003-09-02 08:53:56.000000000 +1000
3667 ++++ procps-3.1.15/test/ps/unix-lf-header/header 1970-01-01 10:00:00.000000000 +1000
3669 +- F S UID PID PPID C PRI NI ADDR SZ WCHAN STIME TTY TIME CMD
3670 +diff -ruN procps-3.1.15.old/test/ps/unix-lf-header/setup procps-3.1.15/test/ps/unix-lf-header/setup
3671 +--- procps-3.1.15.old/test/ps/unix-lf-header/setup 2003-09-02 08:55:39.000000000 +1000
3672 ++++ procps-3.1.15/test/ps/unix-lf-header/setup 1970-01-01 10:00:00.000000000 +1000
3676 +diff -ruN procps-3.1.15.old/test/ps/unix-o-header-all/header procps-3.1.15/test/ps/unix-o-header-all/header
3677 +--- procps-3.1.15.old/test/ps/unix-o-header-all/header 2003-09-02 09:23:24.000000000 +1000
3678 ++++ procps-3.1.15/test/ps/unix-o-header-all/header 1970-01-01 10:00:00.000000000 +1000
3680 +- COMMAND COMMAND ELAPSED GROUP NI %CPU PGID PID PPID RGROUP RUSER TIME TT USER VSZ
3681 +diff -ruN procps-3.1.15.old/test/ps/unix-o-header-all/setup procps-3.1.15/test/ps/unix-o-header-all/setup
3682 +--- procps-3.1.15.old/test/ps/unix-o-header-all/setup 2003-09-02 09:23:11.000000000 +1000
3683 ++++ procps-3.1.15/test/ps/unix-o-header-all/setup 1970-01-01 10:00:00.000000000 +1000
3685 +-ARGS="-o args,comm,etime,group,nice,pcpu,pgid,pid,ppid,rgroup,ruser,time,tty,user,vsz"
3687 +diff -ruN procps-3.1.15.old/test/ps/unix-o-header-dup/header procps-3.1.15/test/ps/unix-o-header-dup/header
3688 +--- procps-3.1.15.old/test/ps/unix-o-header-dup/header 2003-09-02 09:16:50.000000000 +1000
3689 ++++ procps-3.1.15/test/ps/unix-o-header-dup/header 1970-01-01 10:00:00.000000000 +1000
3692 +diff -ruN procps-3.1.15.old/test/ps/unix-o-header-dup/setup procps-3.1.15/test/ps/unix-o-header-dup/setup
3693 +--- procps-3.1.15.old/test/ps/unix-o-header-dup/setup 2003-09-02 09:16:22.000000000 +1000
3694 ++++ procps-3.1.15/test/ps/unix-o-header-dup/setup 1970-01-01 10:00:00.000000000 +1000
3696 +-ARGS="-o pid,tty -o pid,ppid"
3698 +diff -ruN procps-3.1.15.old/test/ps/unix-o-header-evil/header procps-3.1.15/test/ps/unix-o-header-evil/header
3699 +--- procps-3.1.15.old/test/ps/unix-o-header-evil/header 2003-09-02 12:39:36.000000000 +1000
3700 ++++ procps-3.1.15/test/ps/unix-o-header-evil/header 1970-01-01 10:00:00.000000000 +1000
3702 +- PPID PID FOO,tty PPID
3703 +diff -ruN procps-3.1.15.old/test/ps/unix-o-header-evil/setup procps-3.1.15/test/ps/unix-o-header-evil/setup
3704 +--- procps-3.1.15.old/test/ps/unix-o-header-evil/setup 2003-09-02 12:39:19.000000000 +1000
3705 ++++ procps-3.1.15/test/ps/unix-o-header-evil/setup 1970-01-01 10:00:00.000000000 +1000
3707 +-ARGS="-o ppid -o pid,ppid=FOO,tty -o ppid"
3709 +diff -ruN procps-3.1.15.old/test/ps/unix-o-header-nil/setup procps-3.1.15/test/ps/unix-o-header-nil/setup
3710 +--- procps-3.1.15.old/test/ps/unix-o-header-nil/setup 2003-09-02 10:08:33.000000000 +1000
3711 ++++ procps-3.1.15/test/ps/unix-o-header-nil/setup 1970-01-01 10:00:00.000000000 +1000
3718 +- ! grep PID stdout >> /dev/null
3720 +diff -ruN procps-3.1.15.old/test/ps/unix-selection/header procps-3.1.15/test/ps/unix-selection/header
3721 +--- procps-3.1.15.old/test/ps/unix-selection/header 2003-09-04 16:13:48.000000000 +1000
3722 ++++ procps-3.1.15/test/ps/unix-selection/header 1970-01-01 10:00:00.000000000 +1000
3725 +diff -ruN procps-3.1.15.old/test/ps/unix-selection/setup procps-3.1.15/test/ps/unix-selection/setup
3726 +--- procps-3.1.15.old/test/ps/unix-selection/setup 2003-09-13 14:00:48.000000000 +1000
3727 ++++ procps-3.1.15/test/ps/unix-selection/setup 1970-01-01 10:00:00.000000000 +1000
3734 +-rm -f misc.tmp ready.tmp typescript.tmp
3737 +-# this'll do but... WHERE ARE THE MAN PAGES FOR PTY STUFF???
3738 +-(SHELL=`pwd`/script-child script typescript.tmp &>/dev/null) &
3739 +-while [ ! -f ready.tmp ] ; do sleep 0.01 ; done
3743 +- THIS_TTY=`tty | colrm 1 5`
3744 +- lines1=`awk '{print $2}' < stdout | sort -u | egrep "^($THIS_TTY)$" | wc -l`
3745 +- lines3=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY|\?)$" | wc -l`
3746 +- [ $lines1 == 1 ] && [ $lines3 == 1 ]
3750 +- killall -9 got-no-tty
3751 +- kill -9 $SHELL_PID # the others should freely die
3752 +- rm -f misc.tmp ready.tmp typescript.tmp
3754 +diff -ruN procps-3.1.15.old/test/ps/unix-tty-default/setup procps-3.1.15/test/ps/unix-tty-default/setup
3755 +--- procps-3.1.15.old/test/ps/unix-tty-default/setup 2003-09-02 11:36:37.000000000 +1000
3756 ++++ procps-3.1.15/test/ps/unix-tty-default/setup 1970-01-01 10:00:00.000000000 +1000
3762 +-# default output is restricted to this tty
3766 +- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq`
3767 +- if [ /dev/$PSTTY != $MYTTY ] ; then
3772 +diff -ruN procps-3.1.15.old/test/ps/unix-tty-name/setup procps-3.1.15/test/ps/unix-tty-name/setup
3773 +--- procps-3.1.15.old/test/ps/unix-tty-name/setup 2003-09-02 10:42:55.000000000 +1000
3774 ++++ procps-3.1.15/test/ps/unix-tty-name/setup 1970-01-01 10:00:00.000000000 +1000
3776 +-ARGS="-otty= -p$$"
3782 +- PSTTY=`printf /dev/ ; cat stdout`
3783 +- [ $MYTTY == $PSTTY ]
3785 +diff -ruN procps-3.1.15.old/test/ps/unix-tty-names/setup procps-3.1.15/test/ps/unix-tty-names/setup
3786 +--- procps-3.1.15.old/test/ps/unix-tty-names/setup 2003-09-02 11:17:09.000000000 +1000
3787 ++++ procps-3.1.15/test/ps/unix-tty-names/setup 1970-01-01 10:00:00.000000000 +1000
3793 +-# the UNIX spec allows:
3795 +-# /dev/ttyS0 as ttyS0
3796 +-# /dev/ttyS0 as S0 (OK to chop a leading "tty")
3797 +-# /dev/console as console
3798 +-# /foo/bar as bar or /foo/bar (poorly unspecified)
3799 +-# -nothing- as ? or - (poorly unspecified, we use '?')
3801 +-# Also, the format must agree with what "who" uses.
3802 +-# Linux "who" doesn't strip "tty" off of /dev/ttyS0, etc.,
3803 +-# so that's illegal in a Linux environment.
3805 +-# junk the '?' to avoid shell wildcard expansion
3808 +- for i in `tr -d '?' < stdout | sort -u` ; do
3809 +- if [ ! -c /dev/$i -a ! -c /$i ] ; then
3815 +diff -ruN procps-3.1.15.old/test/ps/unix-vsz/setup procps-3.1.15/test/ps/unix-vsz/setup
3816 +--- procps-3.1.15.old/test/ps/unix-vsz/setup 2003-09-11 10:24:38.000000000 +1000
3817 ++++ procps-3.1.15/test/ps/unix-vsz/setup 1970-01-01 10:00:00.000000000 +1000
3819 +-# The standard describes the "vsz" format as:
3820 +-# The size of the process in (virtual) memory
3821 +-# in 1024 byte units as a decimal integer.
3823 +-# It's hard to tell 1000-byte from 1024-byte units,
3824 +-# but easy to tell 1024-byte from 512-byte or 2 kB.
3825 +-# On a 64-bit system, watch for 4 GB troubles as well.
3827 +-# throw in the PID to ensure whitespace on the left
3828 +-ARGS="-C gigabyte -o pid= -o vsz="
3833 +-BITSIZE=`./gigabyte`
3836 +- if [ $BITSIZE == 32bit ] ; then
3837 +- egrep ' 1......$' stdout >> /dev/null
3839 +- egrep ' 1.......$' stdout >> /dev/null
3844 +- killall -9 gigabyte
3846 +diff -ruN procps-3.1.15.old/test/ps/unix-wchan/setup procps-3.1.15/test/ps/unix-wchan/setup
3847 +--- procps-3.1.15.old/test/ps/unix-wchan/setup 2003-09-02 12:25:15.000000000 +1000
3848 ++++ procps-3.1.15/test/ps/unix-wchan/setup 1970-01-01 10:00:00.000000000 +1000
3854 +-# Make sure we're getting back real wchan data,
3855 +-# not just "WCHAN", "-", "0", "*", and hex digits.
3856 +-# Assumes usage of letters [g-z].
3859 +- egrep '[g-z]' stdout >> /dev/null
3861 +diff -ruN procps-3.1.15.old/test/ps/y-needs-l/header procps-3.1.15/test/ps/y-needs-l/header
3862 +--- procps-3.1.15.old/test/ps/y-needs-l/header 2003-10-02 12:10:34.000000000 +1000
3863 ++++ procps-3.1.15/test/ps/y-needs-l/header 1970-01-01 10:00:00.000000000 +1000
3866 +\ No newline at end of file
3867 +diff -ruN procps-3.1.15.old/test/ps/y-needs-l/setup procps-3.1.15/test/ps/y-needs-l/setup
3868 +--- procps-3.1.15.old/test/ps/y-needs-l/setup 2003-10-02 12:10:45.000000000 +1000
3869 ++++ procps-3.1.15/test/ps/y-needs-l/setup 1970-01-01 10:00:00.000000000 +1000
3873 +diff -ruN procps-3.1.15.old/test/ps/y-needs-l/stderr procps-3.1.15/test/ps/y-needs-l/stderr
3874 +--- procps-3.1.15.old/test/ps/y-needs-l/stderr 2003-10-02 12:10:56.000000000 +1000
3875 ++++ procps-3.1.15/test/ps/y-needs-l/stderr 1970-01-01 10:00:00.000000000 +1000
3877 +-ERROR: Modifier -y without format -l makes no sense.
3878 +-********* simple selection ********* ********* selection by list *********
3879 +--A all processes -C by command name
3880 +--N negate selection -G by real group ID (supports names)
3881 +--a all w/ tty except session leaders -U by real user ID (supports names)
3882 +--d all except session leaders -g by session leader OR by group name
3883 +--e all processes -p by process ID
3884 +-T all processes on this terminal -s processes in the sessions given
3885 +-a all w/ tty, including other users -t by tty
3886 +-g all, even group leaders! -u by effective user ID (supports names)
3887 +-r only running processes U processes for specified users
3888 +-x processes w/o controlling ttys t by tty
3889 +-*********** output format ********** *********** long options ***********
3890 +--o,o user-defined -f full --Group --User --pid --cols --ppid
3891 +--j,j job control s signal --group --user --sid --rows
3892 +--O,O preloaded -o v virtual memory --cumulative --format --deselect
3893 +--l,l long u user-oriented --sort --tty --forest --version
3894 +--F extra full X registers --heading --no-heading
3895 +- ********* misc options *********
3896 +--V,V show version L list format codes f ASCII art forest
3897 +--m,m show threads S children in sum -y change -l format
3898 +--n,N set namelist file c true command name n numeric WCHAN,UID
3899 +--w,w wide output e show environment -H process hierarchy
3900 +diff -ruN procps-3.1.15.old/test/ps/zombie-args/setup procps-3.1.15/test/ps/zombie-args/setup
3901 +--- procps-3.1.15.old/test/ps/zombie-args/setup 2003-09-04 13:43:31.000000000 +1000
3902 ++++ procps-3.1.15/test/ps/zombie-args/setup 1970-01-01 10:00:00.000000000 +1000
3904 +-ARGS="-H -C the_living_dead -o args"
3909 +-# the -H is just to ensure predictable output ordering
3911 +-# assumes that the processes won't get swapped out before ps runs
3916 +- diff -Naurd stdout $TESTNAME/stdout >> /dev/null
3920 +- killall -9 the_living_dead
3922 +diff -ruN procps-3.1.15.old/test/ps/zombie-args/stdout procps-3.1.15/test/ps/zombie-args/stdout
3923 +--- procps-3.1.15.old/test/ps/zombie-args/stdout 2003-09-04 13:44:01.000000000 +1000
3924 ++++ procps-3.1.15/test/ps/zombie-args/stdout 1970-01-01 10:00:00.000000000 +1000
3928 +- [the_living_dead] <defunct>
3929 +diff -ruN procps-3.1.15.old/test/ps/zombie-comm/setup procps-3.1.15/test/ps/zombie-comm/setup
3930 +--- procps-3.1.15.old/test/ps/zombie-comm/setup 2003-09-04 13:43:44.000000000 +1000
3931 ++++ procps-3.1.15/test/ps/zombie-comm/setup 1970-01-01 10:00:00.000000000 +1000
3933 +-ARGS="-H -C the_living_dead -o comm"
3938 +-# the -H is just to ensure predictable output ordering
3943 +- diff -Naurd stdout $TESTNAME/stdout >> /dev/null
3947 +- killall -9 the_living_dead
3949 +diff -ruN procps-3.1.15.old/test/ps/zombie-comm/stdout procps-3.1.15/test/ps/zombie-comm/stdout
3950 +--- procps-3.1.15.old/test/ps/zombie-comm/stdout 2003-09-04 13:44:12.000000000 +1000
3951 ++++ procps-3.1.15/test/ps/zombie-comm/stdout 1970-01-01 10:00:00.000000000 +1000
3955 +- the_living_dead <defunct>
3956 +diff -ruN procps-3.1.15.old/test/ps/zombie-wchan/setup procps-3.1.15/test/ps/zombie-wchan/setup
3957 +--- procps-3.1.15.old/test/ps/zombie-wchan/setup 2003-09-04 13:52:41.000000000 +1000
3958 ++++ procps-3.1.15/test/ps/zombie-wchan/setup 1970-01-01 10:00:00.000000000 +1000
3960 +-ARGS="-C the_living_dead -o wchan,stat,comm"
3968 +- egrep 'exit.*Z.*defunct' stdout >> /dev/null
3972 +- killall -9 the_living_dead
3974 +diff -ruN procps-3.1.15.old/test/runtests procps-3.1.15/test/runtests
3975 +--- procps-3.1.15.old/test/runtests 2003-09-03 12:09:08.000000000 +1000
3976 ++++ procps-3.1.15/test/runtests 1970-01-01 10:00:00.000000000 +1000
3980 +-export TESTME=${PSPROG:-../ps/ps}
3981 +-for i in ps/*-* ; do ./onetest $i ; done
3982 +diff -ruN procps-3.1.15.old/test/script-child procps-3.1.15/test/script-child
3983 +--- procps-3.1.15.old/test/script-child 2003-09-04 14:43:28.000000000 +1000
3984 ++++ procps-3.1.15/test/script-child 1970-01-01 10:00:00.000000000 +1000
3989 +-# SHELL=/path/to/this/script script trashfile
3991 +-echo SCRIPT_PID=$PPID > misc.tmp
3992 +-echo SHELL_PID=$$ >> misc.tmp
3993 +-echo SHELL_TTY=`/usr/bin/tty | colrm 1 5` >> misc.tmp
3994 +-mv misc.tmp ready.tmp # atomic op
3995 +-while /bin/true ; do sleep 42 ; done
3996 +diff -ruN procps-3.1.15.old/test/sid-breaks-ttys.c procps-3.1.15/test/sid-breaks-ttys.c
3997 +--- procps-3.1.15.old/test/sid-breaks-ttys.c 2003-09-08 13:28:24.000000000 +1000
3998 ++++ procps-3.1.15/test/sid-breaks-ttys.c 1970-01-01 10:00:00.000000000 +1000
4000 +-#include <sys/types.h>
4001 +-#include <unistd.h>
4002 +-#include <signal.h>
4006 +-static void die(int signo){
4011 +-static void hang(void){
4015 +-int main(int argc, char *argv[]){
4020 +- signal(SIGHUP,die);
4021 +- if(fork()) hang(); // parent later killed as readyness signal
4023 +- // second one exits, to enable setsid(), and the resulting
4024 +- // zombie will be reaped by init after 1st process killed
4025 +- if(fork()) _exit(0);
4027 +- if(setsid()==-1){
4028 +- kill(one,SIGKILL); // hopefully the shell will complain
4029 +- _exit(42); // kind of tough to report errors
4032 +- kill(one,SIGHUP); // let the shell know we're ready
4038 +diff -ruN procps-3.1.15.old/test/sidious.c procps-3.1.15/test/sidious.c
4039 +--- procps-3.1.15.old/test/sidious.c 2003-09-08 13:58:20.000000000 +1000
4040 ++++ procps-3.1.15/test/sidious.c 1970-01-01 10:00:00.000000000 +1000
4042 +-// ps fTo sess,pgid,pid,tty,ppid,tpgid,args -C a.out
4044 +-#include <sys/types.h>
4045 +-#include <unistd.h>
4046 +-#include <signal.h>
4047 +-#include <sys/stat.h>
4048 +-#include <fcntl.h>
4049 +-#include <stdlib.h> // undocumented grantpt,unlockpt,ptsname,openpt,posix_openpt
4050 +-//#include <pty.h> // undocumented openpty,forkpty
4054 +-static void die(int signo){
4059 +-//static void sigchld_handler(int signo){
4061 +-// kill(one,SIGHUP); // kill parent
4064 +-static void hang(void){
4068 +-int main(int argc, char *argv[]){
4076 +- signal(SIGHUP,die);
4077 +- if(fork()) hang(); // parent later killed as readyness signal
4079 +- // second one exits, to enable setsid(), and the resulting
4080 +- // zombie will be reaped by init after 1st process killed
4081 +- if(fork()) _exit(0);
4084 +- master = open("/dev/ptmx", O_RDWR|O_NOCTTY);
4086 +- // could fork, but don't bother
4087 +- // (won't be doing anything with the master side)
4089 +- // could change child's UID, but don't bother
4090 +- // (would make the tests require running as root)
4092 +- // not in the man pages!!!
4094 +- unlockpt(master);
4096 +- if(setsid()==-1){
4097 +- kill(one,SIGKILL); // hopefully the shell will complain
4098 +- _exit(42); // kind of tough to report errors
4101 +- slave = open(ptsname(master), O_RDWR);
4103 +- // push STREAMS tty stuff, just to have an example of it
4104 +- ioctl(slave, I_PUSH, "ptem");
4105 +- ioctl(slave, I_PUSH, "ldterm");
4108 +- // On SysV, slave open got us a TTY. On BSD, we must do this:
4109 +- ioctl(fd, TIOCSCTTY, NULL);
4113 +- kill(one,SIGHUP); // let the shell know we're ready
4119 +diff -ruN procps-3.1.15.old/test/th.c procps-3.1.15/test/th.c
4120 +--- procps-3.1.15.old/test/th.c 2003-09-14 01:35:42.000000000 +1000
4121 ++++ procps-3.1.15/test/th.c 1970-01-01 10:00:00.000000000 +1000
4123 +-#include <unistd.h>
4124 +-#include <pthread.h>
4126 +-void *hanger(void *vp){
4131 +-int main(int argc, char *argv[]){
4132 +- pthread_t thread;
4135 +- pthread_create(&thread, NULL, hanger, NULL);
4137 +- return 0; // keep gcc happy
4139 +diff -ruN procps-3.1.15.old/test/the_living_dead.c procps-3.1.15/test/the_living_dead.c
4140 +--- procps-3.1.15.old/test/the_living_dead.c 2003-09-04 13:36:54.000000000 +1000
4141 ++++ procps-3.1.15/test/the_living_dead.c 1970-01-01 10:00:00.000000000 +1000
4143 +-#include <sys/types.h>
4144 +-#include <unistd.h>
4145 +-#include <signal.h>
4149 +-static void die(int signo){
4154 +-static void sigchld_handler(int signo){
4156 +- kill(one,SIGHUP); // kill parent
4159 +-static void hang(void){
4163 +-int main(int argc, char *argv[]){
4170 +- signal(SIGHUP,die);
4171 +- if(fork()) hang(); // parent later killed as readyness signal
4175 +- signal(SIGCHLD,sigchld_handler);
4176 +- kill(three,SIGHUP); // create the zombie
4182 --- procps-3.1.15.orig/debian/control
4183 +++ procps-3.1.15/debian/control
4188 +Maintainer: Craig Small <csmall@debian.org>
4189 +Build-Depends: debhelper (>> 4.1.1), libncurses5-dev, make (>= 3.78.1-8), dpatch
4190 +Standards-Version: 3.6.0
4195 +Depends: ${shlibs:Depends}
4196 +Conflicts: watch, libproc-dev (<< 1:1.2.6-2), w-bassman (<< 1.0-3), procps-nonfree, pgrep (<< 3.3-5)
4197 +Replaces: watch, bsdutils (<< 2.9x-1)
4199 +Description: The /proc file system utilities
4200 + These are utilities to browse the /proc filesystem, which is not a real file
4201 + system but a way for the kernel to provide information about the status of
4202 + entries in its process table. (e.g. running, stopped or "zombie")
4203 + Both command line and full screen utilities are provided. Ncurses is needed
4204 + for the full screen utilities. More information can be found at procps
4205 + website http://procps.sf.net/
4207 +Package: libproc-dev
4211 +Depends: libc6-dev, procps (= ${Source-Version})
4212 +Description: library for accessing process information from /proc
4213 + These are the header files for libproc. Some packages using libproc
4214 + to access process information from /proc need these to compile.
4216 --- procps-3.1.15.orig/debian/rules
4217 +++ procps-3.1.15/debian/rules
4220 +# Sample debian/rules that uses debhelper.
4221 +# GNU copyright 1997 to 1999 by Joey Hess.
4223 +# Uncomment this to turn on verbose mode.
4224 +#export DH_VERBOSE=1
4226 +# Include dpatch stuff
4227 +include /usr/share/dpatch/dpatch.make
4231 +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
4232 + INSTALL_PROGRAM += -s
4238 +build-stamp: patch-stamp
4241 + # Add here commands to compile the package.
4243 + SHARED=0 $(MAKE) proc/libproc.a
4244 + mv proc/libproc.a static
4246 + $(MAKE) W_SHOWFROM=\-DW_SHOWFROM
4250 +clean: clean1 unpatch
4256 + # Add here commands to clean up after the build process.
4268 + # Add here commands to install the package into debian/procps.
4269 + $(MAKE) ln_f="ln -sf" ldconfig=echo DESTDIR=$(CURDIR)/debian/procps install
4270 + install --mode 644 -o root -g root debian/sysctl.conf $(CURDIR)/debian/procps/etc
4271 + # Rename w as there are two of them
4272 + (cd $(CURDIR)/debian/procps/usr/bin && mv w w.procps )
4273 + (cd $(CURDIR)/debian/procps/usr/share/man/man1 && mv w.1 w.procps.1 )
4275 + # Work-around until proc includes fixed
4276 + (cp proc/*.h $(CURDIR)/debian/procps/usr/include/proc)
4277 + cp static/libproc.a $(CURDIR)/debian/libproc-dev/usr/lib
4279 + dh_movefiles --sourcedir=debian/procps
4280 + rmdir $(CURDIR)/debian/procps/usr/include/proc
4282 +# Build architecture-independent files here.
4283 +binary-indep: build install
4284 +# We have nothing to do by default.
4286 +# Build architecture-dependent files here.
4287 +binary-arch: build install
4290 +# dh_installdebconf
4292 + dh_installexamples
4294 +# dh_installlogrotate
4295 +# dh_installemacsen
4298 + dh_installinit --update-rcd-params='start 30 S .' --init-script='procps.sh'
4303 + dh_installchangelogs NEWS
4308 + dh_makeshlibs -V "procps (>= 3.1.14), procps (<< 3.1.15)"
4311 + dh_shlibdeps -Lprocps -ldebian/procps/lib
4316 +binary: binary-indep binary-arch
4317 +.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean1
4318 --- procps-3.1.15.orig/debian/changelog
4319 +++ procps-3.1.15/debian/changelog
4321 +procps (1:3.1.15-2) unstable; urgency=low
4323 + * Removed offending test directory Closes: #227933
4325 + -- Craig Small <csmall@debian.org> Tue, 20 Jan 2004 10:20:44 +1100
4327 +procps (1:3.1.15-1) unstable; urgency=low
4329 + * Now uses dpatch to handle the various patches
4330 + * New upstream release
4331 + - Supports SELINUX flags for kernel v2.6 Closes: #193648
4332 + - Hide kernel PID bug Closes: #217278, #219730, #217525, #224470
4333 + - Fixed top auto-margins problem Closes: #217559
4334 + * Fix top manual page Closes: #225089
4335 + * Patch so SELINUX flags work in v2.4 kernels
4336 + * Extra +s in ps.1 removed Closes: #218220
4337 + * Added patch so sysctl has quiet -q flag Closes: #189100
4339 + -- Craig Small <csmall@debian.org> Fri, 26 Dec 2003 18:02:59 +1100
4341 +procps (1:3.1.14-1) unstable; urgency=low
4343 + * New upstream release
4345 + -- Craig Small <csmall@debian.org> Wed, 22 Oct 2003 11:59:53 +1000
4347 +procps (1:3.1.13-1) unstable; urgency=low
4349 + * New upstream release
4351 + -- Craig Small <csmall@debian.org> Wed, 24 Sep 2003 16:10:42 +1000
4353 +procps (1:3.1.12-1) unstable; urgency=low
4355 + * New upstream release
4356 + ps: $PS_FORMAT works properly Closes: #201575
4357 + man page: /var/run/utmp, not /etc/utmp Closes: #206583
4358 + required flags moved out of CFLAGS Closes: #205429
4361 + -- Craig Small <csmall@debian.org> Sat, 13 Sep 2003 21:11:09 +1000
4363 +procps (1:3.1.11-2) unstable; urgency=low
4365 + * Made shlibs have a specific version Closes: #199118
4366 + * libproc.a is back in libproc-dev, use it
4367 + * Added README to libproc-dev for people who use the library
4369 + -- Craig Small <csmall@debian.org> Wed, 20 Aug 2003 15:31:59 +1000
4371 +procps (1:3.1.11-1) unstable; urgency=low
4373 + * 3.1.11 New upstream version
4374 + - handle GPLONLY_ symbols Closes: #143549, #188374
4375 + * freeproc now defined Closes: #189047
4376 + * warning in readproc.c fixed Closes: #197346
4377 + * Removed optarg and optind defines Closes: #197343
4378 + * Fixed saved_start_time warning Closes: #197342
4380 + -- Craig Small <csmall@debian.org> Thu, 24 Jul 2003 17:02:36 +1000
4382 +procps (1:3.1.9-1) unstable; urgency=low
4384 + * New upstream source
4385 + * memory sizes fixed for 64-bit w/ gcc 3.x Closes: #194376, #191933
4386 + * Doesn't segfault if /proc not mounted Closes: #172735
4387 + * No warning in top about memory key Closes: #188271
4388 + * More info in kill man page Closes: #182414
4389 + * Document the different oO options Closes: #169301
4390 + * Updated stabndards version to 3.5.9
4391 + * Changed disk to backing storage Closes: #175925
4393 + -- Craig Small <csmall@debian.org> Mon, 2 Jun 2003 02:31:03 +1000
4395 +procps (1:3.1.8-1) unstable; urgency=low
4397 + * New upstream release
4398 + watch man page fixed, Closes #182246
4399 + * Changed section for libproc-dev
4401 + -- Craig Small <csmall@debian.org> Tue, 1 Apr 2003 10:19:05 +1000
4403 +procps (1:3.1.6-1) unstable; urgency=low
4405 + * New upstream release
4406 + - watch has --no-title option Closes: #179862
4407 + - ps -C can compare very long names Closes: #178127
4408 + * Fixed descriptions in manual pages Closes: #179046
4409 + * w wont crash if /proc unreadable Closes: #169398
4411 + -- Craig Small <csmall@debian.org> Sat, 22 Feb 2003 21:33:45 +1100
4413 +procps (1:3.1.5-1) unstable; urgency=low
4415 + * New upstream version
4416 + - watch don't drop empty lines Closes: #171005
4417 + - top has old sort keys Closes: #167249
4418 + - now count Inact_laundry as needed Closes: #172163
4420 + -- Craig Small <csmall@debian.org> Mon, 6 Jan 2003 13:49:32 +1100
4422 +procps (1:3.1.3-1) unstable; urgency=low
4424 + * New upstream source
4426 + -- Craig Small <csmall@debian.org> Fri, 13 Dec 2002 16:16:36 +1100
4428 +procps (1:3.1.1-1) unstable; urgency=low
4430 + * New upstream source
4431 + - vmstats reports memort counts Closes: #169774
4433 + -- Craig Small <csmall@debian.org> Wed, 4 Dec 2002 15:57:13 +1100
4435 +procps (1:3.1.0-1) unstable; urgency=low
4437 + * New upstream version
4438 + - vmstat displays IO-wait time instead of bogus "w"
4439 + - when IO-wait hidden, count as idle, not as sys
4440 + - pmap command added (like Sun has)
4441 + * Manual pages cleaned up Closes: #165970, #164481
4443 + -- Craig Small <csmall@debian.org> Mon, 11 Nov 2002 12:03:46 +1100
4445 +procps (1:3.0.5-1) unstable; urgency=low
4447 + * New upstream version
4448 + - top tolerates super-wide displays Closes: #165497
4449 + - ELF note warning gone for some kernels Closes: #165900
4450 + - Fix ps and top man pages a bit, dropped bugs severity.
4452 + -- Craig Small <csmall@debian.org> Tue, 29 Oct 2002 22:04:36 +1100
4454 +procps (1:3.0.4-1) unstable; urgency=low
4456 + * New upstream version
4457 + - ELF note warning removed Closes: #165093, #165343
4458 + - top works for most TERM= settings Closes: #164864, #164956
4459 + * w has FROM column again by default Closes: #165252
4460 + * debhelper dependency version fixed Closes: #165083
4461 + * ps.1 looks a bit better now Closes: #16448
4463 + -- Craig Small <csmall@debian.org> Mon, 21 Oct 2002 08:30:04 +1000
4465 +procps (1:3.0.3-1) unstable; urgency=low
4467 + * New upstream version
4468 + - w works with KOI8 locale Closes: #153043
4469 + - fix top for non-SMP 2.2.xx and 2.0.xx Closes: #164231
4470 + - negative idle time fixed Closes: #126260
4471 + - sysctl handles new vlan interface Closes: #140386
4472 + - vmstat documentation update Closes: #157935, #155684
4473 + - "skill -n blah blah blah" lets you test options Closes: #158630
4474 + - fixed ps --sort crash Closes: #164226
4475 + - vmstat compiles with latest gcc-3.x Closes: #164348
4476 + - bad (int*) cast in top removed Closes: #164468
4477 + - Support new/improved statistics interfaces in 2.5 /proc Closes: #164013
4478 + - top defaults to old layout and sort by pid Closes: #164277
4479 + - rant moved out of top.1 man page Closes: #164520
4480 + - top runs much faster Closes: #87779
4482 + -- Craig Small <csmall@debian.org> Sat, 12 Oct 2002 21:44:23 +1000
4484 +procps (1:3.0.0-2) unstable; urgency=low
4486 + * Fixed pkill and skill, auto* is so broken. Closes: #163940, #163944
4487 + * Moved libproc.so.3 into /lib as it's needed early Closes: #163981,#163899
4489 + -- Craig Small <csmall@debian.org> Thu, 10 Oct 2002 07:19:45 +1000
4491 +procps (1:3.0.0-1) unstable; urgency=low
4493 + * New upstream source Closes: #163698
4494 + - top has SMP Closes: #162316, #62282, #94896, #98277, #117040, #117735
4495 + - SELINUX support Closes: #142892
4496 + - top defaults to signal 15 to kill pids with Closes: #72158
4497 + - 64-bit time reduces the overflow problem Closes: #82382, #155908
4498 + - "w" program better at determining what a user is doing
4499 + Closes: #88758, 115529
4500 + - oldps is gone Closes: #101917
4501 + - Handles /proc/tty/drivers Closes: #108654, #154046
4502 + - Supports scanf where locale uses , for decimal point Closes: #126873
4503 + - uptime --help now calls itself uptime Closes: #128880
4504 + - ps faster Closes: #147731
4505 + - top calculates screen better Closes: #162296
4506 + - top allows sorts by pid or swapped memory Closes: #79868, #159446
4507 + - support for s/390 Closes: #126295
4508 + - statm buffer size increased Closes: #145085
4509 + - new top has no typos Closes: #148918
4510 + - new top can handle lots of tasks Closes: #70900
4511 + * Fixed init.d file so it follows policy Closes: #121945
4513 + -- Craig Small <csmall@debian.org> Tue, 8 Oct 2002 12:29:45 +1000
4515 +procps (1:2.0.7-10) unstable; urgency=low
4517 + * Fixes ps crash when system.map is exact multiple of 1024
4518 + Thankyou Colin for the patch! Closes: #109237, #142292
4520 + -- Craig Small <csmall@eye-net.com.au> Fri, 12 Apr 2002 21:02:04 +1000
4522 +procps (1:2.0.7-9) unstable; urgency=low
4524 + * Sanity checking for Number of CPU Closes: #127561, #122617
4525 + This will keep the m68k and ARM boys happy.
4526 + * uptime usage fixed Closes: #138351
4527 + * kill man page NAME updated Closes: #119400
4528 + * Better explanation for load average in uptime(1) Closes: #140902
4529 + * utmp in correct location in w(1) Closes: #115725
4531 + -- Craig Small <csmall@eye-net.com.au> Mon, 8 Apr 2002 14:18:20 +1000
4533 +procps (1:2.0.7-8) unstable; urgency=low
4535 + * Removed -ggdb Closes: #117203
4537 + -- Craig Small <csmall@eye-net.com.au> Sat, 27 Oct 2001 07:02:38 +1000
4539 +procps (1:2.0.7-7) unstable; urgency=low
4541 + * Added os/390 patches Closes: #113494
4542 + * w manpage now gives correct location for utmp Closes: #110723
4543 + * watch wrap-around problem fixed Closes: #111759
4544 + * Programs are compilied -O2 Closes: #108652
4546 + -- Craig Small <csmall@eye-net.com.au> Wed, 26 Sep 2001 08:08:43 +1000
4548 +procps (1:2.0.7-6) unstable; urgency=low
4550 + * Re-fixed command line interpretation Closes: #103101
4552 + -- Craig Small <csmall@eye-net.com.au> Tue, 10 Jul 2001 17:32:02 +1000
4554 +procps (1:2.0.7-5) unstable; urgency=low
4556 + * watch now copys strings better. Closes: #95404, #97948, #99780
4557 + * skill.1 loads tbl Closes: #92242, #67899
4558 + * long usernames are shown Closes: #86205, #94957
4559 + * Remove /etc/rcS.d/S30procps with good ole rm Closes: #92184
4560 + * /etc/init.d/procps.sh calls itself that Closes: #93302
4561 + * Cannot write config in secure mode Closes: #93948
4563 + -- Craig Small <csmall@debian.org> Sun, 29 Apr 2001 14:55:20 +1000
4565 +procps (1:2.0.7-4) unstable; urgency=low
4567 + * watch doesnt crash with long command lines Closes: #88592, #87693
4568 + * bumped up a buffer in a proc read Closes: #85775
4569 + * Now we use 24 hour time Closes: #85640
4570 + * pgrep calls itself pgrep Closes: #86630
4571 + * Corrected symlink in libproc-dev Closes: #87865
4573 + -- Craig Small <csmall@debian.org> Mon, 19 Mar 2001 10:13:27 +1100
4575 +procps (1:2.0.7-3) unstable; urgency=low
4577 + * Conflicts with pgrep, so no more conflicts Closes: #82835
4578 + * Minor fixes to ps.1 manpage Closes: #81921
4579 + * watch highlighs correctly Closes: #77737
4580 + * top wont die with evil HOMEs, Closes: #81452
4581 + * removed reference to suidregister
4582 + * Remore -L reference in kill.1 Closes: #85913
4584 + -- Craig Small <csmall@debian.org> Thu, 8 Feb 2001 12:44:58 +1100
4586 +procps (1:2.0.7-2) unstable; urgency=medium
4588 + * Moved kill back again, dammit why is the makefile so broken
4590 + * Watch uses locale Closes: #82739
4591 + * top's scanf is protected from evil locale problems Closes: #82671, #69128
4592 + (Big thankyou to Guillaume for lending a test account)
4594 + -- Craig Small <csmall@debian.org> Fri, 19 Jan 2001 09:15:36 +1100
4596 +procps (1:2.0.7-1) unstable; urgency=medium
4598 + * New upstream version (010114)
4599 + - Merges 2.0.7 code from RedHat Closes: #80832
4600 + - Made note that Shared memory report will be junk due to kernel
4602 + - Remove html and null stuff from man page Closes: #81920
4603 + - vsize is kB in man page Closes: #82210
4604 + - man pages look better Closes: #70055, #70941
4605 + - vmstat increase Closes: #77886
4606 + - w tries harder to find things Closes: #24531
4607 + - 15 char user names Closes: #71211
4608 + * No HOME overflow in top Closes: 81452
4609 + * Added menu Hints Closes: #80051, #82324
4612 + -- Craig Small <csmall@debian.org> Wed, 17 Jan 2001 08:57:24 +1100
4614 +procps (1:2.0.6-9) unstable; urgency=medium
4616 + * added libncurses5-dev to build-depends, Closes: #67533
4617 + * Put kill back into /bin Closes #67580, #67582
4618 + * Put 2.0.6-7 ps.1 back in Closes: #67451
4620 + -- Craig Small <csmall@debian.org> Tue, 25 Jul 2000 08:13:21 +1000
4622 +procps (1:2.0.6-8) unstable; urgency=low
4624 + * New upstream source:
4625 + * - sysctl EOF bug fixed Closes: #62877
4626 + * - stop crashes with unmounted /proc Closes: #63512, #55177
4627 + * - Versions checking tolerates RH /proc/ksyms Closes: #59798
4628 + * - Top works better with SMP Closes: #34734, #56547, #59703
4630 + -- Craig Small <csmall@debian.org> Fri, 14 Jul 2000 22:33:44 +1000
4632 +procps (1:2.0.6-7) unstable; urgency=low
4634 + * Fixed missing version Closes: #62207, #62484, #59112
4635 + * Stop crashes with umounted /proc Closes: #63512, #55177
4636 + * Nicer man pages Closes: #63495, #59406
4637 + * Fixed sysctl eof bug Closes: #62877
4638 + * watch wraps properly Closes: #60913
4639 + * watch handles tabs Closes: #46213
4640 + * watch honors locale settings Closes: #63762
4641 + * now versioned replaces line for bsdutils
4643 + -- Craig Small <csmall@debian.org> Mon, 29 May 2000 13:31:54 +1000
4645 +procps (1:2.0.6-6) unstable; urgency=low
4647 + * New patchlevel (000221)
4648 + * ps 'f' ASCII art forest fixed. Closes: #57134, #58644
4649 + * let insane people run ps setuid. Closes: #56701
4650 + * note that kernel 2.3 is now faster. Closes: #49130
4651 + * top with WCHAN was leaking memory. Closes: #58172, #52257, #56889
4652 + * can show current CPU. Closes: #37023
4653 + * w looks better now. Closes: #55952
4654 + * init.d/procps removed if exists. Closes: #55137, #55852
4655 + * Fixed skill/snice man page (thanks man-db maint!) Closes: #53736, #46743
4656 + * Fixed ps man page Closes: #58365
4658 + -- Craig Small <csmall@debian.org> Wed, 23 Feb 2000 10:31:37 +1100
4660 +procps (1:2.0.6-5) unstable; urgency=low
4662 + * New upstream source
4663 + * kill "_R(smp_|smp2gig_|2gig_)?[0-9a-fA-F]{8,}" Closes: #54394, #53208
4664 + * added type 'S' and scan past machine types Closes: #54396
4665 + * Fixed w(1) manpage Closes: #54709
4666 + * top now agrees with ps for RSS Closes: #52679
4668 + -- Craig Small <csmall@debian.org> Tue, 11 Jan 2000 08:23:56 +1100
4670 +procps (1:2.0.6-4) unstable; urgency=low
4672 + * procps init.d script quietly dies if not /etc/default/rcS Closes:
4674 + * Put the NEWS changelog back in Closes: #52678
4675 + * Fixed that damn Rsmp annoying message bug Closes: #48686
4676 + * Remove /etc/init.d/procps Closes: #53818
4678 + -- Craig Small <csmall@debian.org> Mon, 20 Dec 1999 11:14:53 +1100
4680 +procps (1:2.0.6-3) unstable; urgency=low
4682 + * Patched ps so it complains if you chmod 711 /proc Closes: #52481
4683 + * Did the same for top.
4684 + * Ditto for oldps.
4685 + * Changed and int to a char* Closes: #52482
4686 + * sysctl.conf file references sysctl.conf (5) not 8 Closes: #52385
4687 + * props init.d script changed to procps.sh Closes: #52228
4689 + -- Craig Small <csmall@debian.org> Mon, 13 Dec 1999 11:57:01 +1100
4691 +procps (1:2.0.6-2) unstable; urgency=low
4693 + * Changed psmisc from reccomends to suggests
4694 + * %MEM now works, Closes: #50010 #50055 #50148 #50356
4695 + * top doesn't crash with > 204 processes Closes: #50055
4696 + * Another libproc fd leak fixed Closes: #45398
4697 + * ps silently ignores m and -m for future compatibility Closes: #48308
4698 + * Added a sysctl.conf and other files as suggested Closes: #51098
4699 + * Fix start field instability
4700 + * ps.1 fixed Closes: #35137
4702 + -- Craig Small <csmall@debian.org> Tue, 7 Dec 1999 14:42:51 +1100
4704 +procps (1:2.0.6-1) unstable; urgency=low
4707 + * sysctl crash fixed, Closes: #49015
4708 + * libproc file descriptor leak fixed, Closes: #45398
4709 + * False positive System.map mismatches killed, Closes: #49047
4710 + * Supports 64 Hz for StrongARM/Shark Closes: #47461
4711 + * pr_time fixed, Closes: #46223
4712 + * libc num cpu workaround back in, Closes: #49039
4713 + * Fixed kill manpage, Closes: #47018
4714 + * This version definitely, absolutely has kill, Closes: #46762
4717 + -- Craig Small <csmall@debian.org> Fri, 5 Nov 1999 12:46:05 +1100
4719 +procps (1:2.0.3-5) unstable; urgency=low
4721 + * Changed conflicts with replaces
4723 + -- Craig Small <csmall@debian.org> Wed, 6 Oct 1999 14:36:48 +1000
4725 +procps (1:2.0.3-4) unstable; urgency=low
4727 + * support SMP systems with versioned kernel modules Closes: #45621, #46465
4728 + * Added kill to this (it is removed from bsdutils).
4729 + * We now need kill manpage, Closes: #46004
4731 + -- Craig Small <csmall@debian.org> Tue, 5 Oct 1999 10:28:01 +1000
4733 +procps (1:2.0.3-3) unstable; urgency=low
4735 + * System.map support for non-i386 Closes: #45592, #45250
4736 + * Do not require /proc/ksyms Closes: #45128, #45132, #45619
4737 + * Alternative w.1 points to the right spot, Closes: #45331
4738 + * Copyright for skill and snice and ps fixed, Closes: #45119
4740 + -- Craig Small <csmall@debian.org> Tue, 21 Sep 1999 16:31:59 +1000
4742 +procps (1:2.0.3-2) unstable; urgency=medium
4744 + * Now with top! Closes: #45106
4746 + -- Craig Small <csmall@debian.org> Wed, 15 Sep 1999 11:12:34 +1000
4748 +procps (1:2.0.3-1) unstable; urgency=low
4750 + * New upstream source
4751 + * Debian personality does m flag Closes: #44832
4752 + * Corrected typo in top.1 Closes: #44836
4753 + * New improved watch Closes: #29970
4755 + -- Craig Small <csmall@debian.org> Mon, 13 Sep 1999 16:59:16 +1000
4757 +procps (1:2.0.2-4) unstable; urgency=high
4759 + * Fixed the nasty ps formatting problem (Bug #40859 #40856 #40839 )
4761 + -- Craig Small <csmall@debian.org> Wed, 7 Jul 1999 08:41:54 +1000
4763 +procps (1:2.0.2-3) unstable; urgency=low
4765 + * New upstream patches/source
4766 + * SMB Hz wierdness fixed (Bug #33023 #33284)
4767 + * non-tty output does not get chopped at 80 columns (bug #36688)
4768 + * BSD personalities set the default selection and output format (bug #36698)
4769 + * Fixed collumn spacing problem (Bug #35309)
4770 + * Work around for borken libs that return 0 processors (Bug #36902)
4771 + * skill now uses process name not command line (Bug #19208)
4773 + -- Craig Small <csmall@debian.org> Mon, 5 Jul 1999 07:29:47 +1000
4775 +procps (1:2.0.2-2) unstable; urgency=low
4777 + * Removed kill and manual page (Bug #36421 #36551 #36375)
4778 + * Put in patch for bogus sysconf return (Bug #36494 #36532 #36581)
4780 + -- Craig Small <csmall@debian.org> Wed, 28 Apr 1999 09:04:59 +1000
4782 +procps (1:2.0.2-1) unstable; urgency=low
4784 + * New upstream version (Bug #34394 #27291 #34250 #34956 #35240 #35247
4785 + #35520 #35756 #34580 )
4787 + -- Craig Small <csmall@debian.org> Mon, 19 Apr 1999 13:26:48 +1000
4789 +procps (1:2.0.0-1) unstable; urgency=low
4791 + * New upstream version (Bug #33083 23347 33462 10556 33266 33371 )
4794 + -- Craig Small <csmall@debian.org> Mon, 15 Mar 1999 14:21:57 +1100
4796 +procps (1:1.9.0-2) unstable; urgency=low
4798 + * top now resumes (Bug #32106 )
4799 + * debhelper text problem fixed in postinst (Bug #32963 #33122 #33003 33117 )
4800 + * oldps and ps now use alternatives (Bug #33083 )
4801 + * ps s format now not ugly (Bug #28266 )
4802 + * watch command line help and man page correct (Bug #31702 )
4803 + * sessreg removed from package (Bug #32294 )
4804 + * ps doesn't display extra spaces (Bug #27799 )
4805 + * top has spaces in command lines again (Bug #33060 )
4806 + * ps now has personality (Bug #22923 #18429 )
4807 + * moved non-free skill and snice to non-free package.
4809 + -- Craig Small <csmall@debian.org> Tue, 9 Feb 1999 15:10:58 +1100
4811 +procps (1:1.9.0-1) unstable; urgency=low
4813 + * New Upstream source
4815 + -- Craig Small <csmall@debian.org> Thu, 4 Feb 1999 14:48:37 +1100
4817 +procps (1:1.2.9-3) unstable; urgency=low
4819 + * Linked to ncurses4
4821 + -- Craig Small <csmall@debian.org> Fri, 30 Oct 1998 14:13:02 +1100
4823 +procps (1:1.2.9-2) unstable; urgency=low
4825 + * top now has spaces in between command lines (Bug #28178 )
4826 + * --version or -V now shows proper version.
4828 + -- Craig Small <csmall@debian.org> Mon, 26 Oct 1998 08:55:59 +1100
4830 +procps (1:1.2.9-1) unstable; urgency=low
4832 + * New upstream version (Bug #27573 )
4833 + * Menu entry changed from System to Menu/System (Bug #27438 )
4834 + * Char variables changed to int for powerpc (Bug #26624 )
4835 + * libproc now nulls allocated structure (Bug #26225 )
4836 + * No longer uses psdevtab (yay!) (Bug #25388 )
4837 + * ps doesn't double space command line parameters (Bug #25306 #24293 )
4838 + * ps now silently ignores g flag for those BSD heads (Bug #24075 )
4840 + -- Craig Small <csmall@debian.org> Fri, 9 Oct 1998 09:15:11 +1000
4842 +procps (1:1.2.7-2) unstable; urgency=low
4844 + * Top can suspend twice (or three times even) (Bug #22997 )
4845 + * Libraries properly built (Bug #20010 )
4847 + -- Craig Small <csmall@debian.org> Mon, 1 Jun 1998 09:16:09 +1000
4849 +procps (1:1.2.7-1) frozen unstable; urgency=high
4851 + * New upstream source, fixes security bug (Bug #21475)
4853 + -- Craig Small <csmall@debian.org> Thu, 23 Apr 1998 08:04:54 +1000
4855 +procps (1:1.2.6-2) unstable; urgency=low
4857 + * Fixed Shared library dependencies (bugs #18388 #18394 18392 )
4858 + * Conflicts with earlier versions of w-bassman (bug #18389 )
4860 + -- Craig Small <csmall@debian.org> Mon, 23 Feb 1998 09:05:54 +1100
4862 +procps (1:1.2.6-1) unstable; urgency=low
4864 + * New upstream source.
4865 + * xload is undiverted (Bug #17102 )
4866 + * ps_fields.7.gz removed (Bug #18090 )
4867 + * Colour patches removed, color-related bugs gone (Bug #18008 #17217 #18090 )
4868 + * POSIX patches removed, cmd line bugs gone (Bug #15537 )
4869 + * w is now an alternative w.procps (Bug #17960 )
4870 + * skill now works with process names (Bug #17087 )
4871 + * ps and top man pages have their field descriptions (Bug #17360 )
4872 + * ps u fixed (Bug #17313 )
4873 + * Source code is no longer FUBAR (Bug #17892 )
4874 + * top now redraws screen after config screen (Bug #11896 )
4875 + * Circular dependency removed (Bug #16966 )
4876 + * top does mess up screens with wrong cmd line (Bug #17230 )
4877 + * top suspends with ctrl-Z (Bug #16703 )
4879 + -- Craig Small <csmall@debian.org> Tue, 17 Feb 1998 08:31:21 +1100
4881 +procps (1:1.2.5-2) unstable; urgency=low
4883 + * Moved /bin into /bin/ps (Bug #17001 )
4885 + -- Craig Small <csmall@debian.org> Tue, 13 Jan 1998 07:50:43 +1100
4887 +procps (1:1.2.5-1) unstable; urgency=low
4889 + * TTY selection works ( #16724 )
4890 + * top and ps now accept --colour and *_COLOURS
4891 + * xproc copyright file not compressed ( #14491 )
4892 + * All #include <proc/*.h> now #include "proc/*.h" ( #13482 )
4893 + * Copyright doesn't mention psmisc now ( #16704 )
4894 + * Moved ps back into /bin ( #16737 #16705 )
4895 + * New upstream source ( #16795 )
4897 + -- Craig Small <csmall@debian.org> Mon, 12 Jan 1998 08:35:10 +1100
4899 +procps (1:1.2.2-1) unstable; urgency=low
4902 + * Updated upstream source to 1.2.2 (instead of 1.2)
4903 + * Merged Helmut's color/command line patches into upstream.
4904 + * Copyright file is not compressed ( #14493 #14415 )
4905 + * psdatabase refreshed when installing ( #10693 )
4906 + * Fixed +/- line in free ( #10785 #10870 #11566 #12027 #12245 #12374 )
4907 + * w collumns corrected ( #10898 #13117 )
4908 + * top saves sort type ( #11553 )
4909 + * Linked to libc6 ( #11725 )
4910 + * top doesn't coredump with S option ( #11855 )
4911 + * skill works with given patch ( #12023 )
4912 + * libproc-dev has proper sym link ( #12697 )
4913 + * top -h doesn't change terminal settings ( #13513 )
4914 + * ps -s has "CAUGHT" not "CATCHED" ( #14342 )
4915 + * ps_colors.7 and ps_fields.7 reformatted ( #14109 #14544 #14545 )
4916 + * ps checks for tty before using colors ( #14596 )
4917 + * top sets stop signal handler later, stopping race ( #14769 )
4918 + * When using POSIX personality, processes show up ( #14780 )
4919 + * top checks for valid term type ( #15807 )
4920 + * xproc now Depends on procps-1.2.*-* ( #10762 #13347 )
4921 + * xproc dependencies fixed ( #12698 )
4923 + -- Craig Small <csmall@debian.org> Tue, 30 Dec 1997 11:33:54 +1100
4925 +procps (1.12.2.1) unstable; urgency=low
4927 + * Non-maintainer release, built for libc6.
4928 + * Added in free.c from new procps version 1.2.3 (from sunsite), seems to
4929 + fix all the problems with free reporting bogus valus.
4931 + -- Joey Hess <joeyh@master.debian.org> Fri, 24 Oct 1997 13:34:35 -0400
4933 +procps (1.12.2) stable unstable; urgency=low
4935 + * fixed meminfo handling again, as the fix wouldn't work on pre-2.1.x
4937 + * fixed free to use the meminfo routines from libproc.
4939 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Fri, 13 Jun 1997 22:42:14 +0200
4941 +procps (1.12.1) stable unstable; urgency=low
4943 + * fixed several bugs
4944 + * replaced utmp handling to support wrappers.
4945 + * added /proc/meminfo support for 2.1.x kernels.
4947 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Tue, 10 Jun 1997 23:59:41 +0200
4949 +procps (1.11.6) frozen unstable; urgency=medium
4951 + * psmisc 1.14 : new upstream version (mainly bugfixes)
4952 + * added a lot of new serial device major numbers to the device lookup
4953 + code. Somehow it seems there are new serial devices every other week.
4954 + * fixed a bug in top: broken .toprc may cause a segmentation fault.
4956 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sun, 4 May 1997 09:50:30 +0200
4958 +procps (1.11.5) frozen unstable; urgency=medium
4960 + * minor changes to make it compile with libc6
4961 + * fix top behaviour on machines having nonstandard NR_TASKS up to 4k
4964 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Fri, 18 Apr 1997 02:07:46 +0200
4966 +procps (1.11.4) unstable; urgency=medium
4968 + * strip libproc.so from unneeded symbols (Bug# 8311)
4969 + * fixed watch.1 example (Bug# 8169)
4970 + * partly fixed fuser sigsegv core dump (Bug# 8004)
4971 + * menu entries for xproc and procps (Bug# 8325)
4972 + * divertions for xmem and xload. (Bug# 7565)
4974 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sun, 13 Apr 1997 20:55:05 +0200
4976 +procps (1.11.3) unstable; urgency=low
4978 + * fixed uptime again, minor Makefile changes
4980 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Fri, 21 Feb 1997 16:22:04 +0100
4982 +procps (1.11.2) unstable; urgency=medium
4984 + * fixed typo in ps_fields.7 (Bug#5457)
4985 + * fixed typo in debian/rules (Bug #5585)
4986 + * fixed bug in w introduced in 1.11.1 (Bugs #5489, #5694, #5695, #5705).
4987 + * added support for non-standard serial devices (long overdue - Bug
4989 + * fixed uptime option handling (Bug #6099).
4990 + * fixed top problems with missing/corrupted utmp (Bug #5819).
4991 + * fixed manpage problems (Bug #5936).
4993 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Wed, 19 Feb 1997 18:49:26 +0100
4995 +procps (1.11.1) unstable; urgency=low
4997 + * fixed bug in w <username>
4998 + * automatic resize if field length is exceeded. This changed the shared
4999 + library, so popping the major number.
5000 + * fixed numeric WCHAN output on Alphas and stupid bug in ps (again,
5001 + thanks to H. Koenig).
5002 + * fixed top memory statistics for systems with more than 100M memory or
5005 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Tue, 12 Nov 1996 02:57:18 +0100
5007 +procps (1.10.1) unstable; urgency=low
5009 + * merged in ALPHA & Sparc patches
5010 + (from ftp.azstarnet.com:/pub/linux/axp/glibc)
5011 + * fixed ps --deselect/-N for pid lists
5012 + * use shared libs from now on, install shlibs again
5013 + * manpages for libproc
5014 + * static lib compiled without -fPIC
5015 + * added libproc package for development installing libproc headers,
5016 + manpages and static library.
5017 + * fixed PROC_REAL bug when PROC_FILLSTATUS isn't set.
5018 + * fixed color bug in ps --forest
5019 + * added xproc package for xload, xmem, xidle, xcpustate
5020 + (XConsole left out as we use xconsole & klogd on debian)
5021 + * adapted xload manpage for xidle and xmem
5022 + * fixed xmem to cope with newer kernels (where shared pages are counted
5023 + once for each additional reference)
5024 + * fixed top change_fields bug (a field needs 24, not 21 spaces)
5025 + * fixed several Alpha bugs (thanks to Harald Koenig)
5026 + * due to popular demand, the old format for time intervals is back.
5027 + for all program using this, a toggle command line option has been
5028 + provided. The default behaviour depends on the compile time option
5029 + NEW_TIME_DEFAULT (see main Makefile)
5031 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Wed, 23 Oct 1996 21:30:54 +0200
5033 +procps (1.09.2) unstable; urgency=low
5035 + * fixed cpu nice % in summary
5036 + * fixed topsetup initialisation in top.h I messed up in last revision
5037 + * fixed pipe output bug
5038 + * fixed --deselect bug in SVR4/POSIX mode
5040 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sun, 20 Oct 1996 13:57:11 +0200
5042 +procps (1.09.1) unstable; urgency=low
5044 + * fixed ps -w bug displaying too many empty lines
5045 + * fixed SIGSEGV bug in ps -www
5046 + * fixed bug in top not calculating length of the command/args/env fields
5047 + at the field selection screen in some circumstances.
5048 + * fixed SIGSEGV bug when using environ field
5050 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sat, 12 Oct 1996 07:59:29 +0200
5052 +procps (1.09) experimental; urgency=low
5054 + * This is an experimental release of the procps suite. A lot of features have
5055 + been added since the 1.01(a) release:
5056 + - support for both BSD and POSIX (SVR4) style command line options.
5057 + - completely configurable display of information.
5058 + - colour markup of processes exceeding limits or belonging to a user.
5059 + Please take a look at /usr/doc/procps/NEWS and the manpages for a concise
5060 + list. This is how the next upstream release of procps may look
5061 + (i.e. it will look like this if there is not too much resistance).
5063 + -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sat, 5 Oct 1996 14:26:57 +0200
5064 --- procps-3.1.15.orig/kill.1
5065 +++ procps-3.1.15/kill.1
5067 kill \- send a signal to a process
5072 -kill pid ... Send SIGTERM to every process listed.
5073 -kill -signal pid ... Send a signal to every process listed.
5074 -kill -s signal pid ... Send a signal to every process listed.
5075 -kill -l List all signal names.
5076 -kill -L List all signal names in a nice table.
5077 -kill -l signal Convert a signal number into a name.
5078 -kill -V,--version Show version of program
5080 +\fBkill\fR [ -\fBsignal\fR | -s \fBsignal\fR ] \fBpid\fR ...
5082 +\fBkill\fR [ -L | -V, --version ]
5084 +\fBkill\fR -l [ \fBsignal\fR ]
5087 The default signal for kill is TERM. Use -l or -L to list available signals.
5092 -pkill(1) skill(1) kill(2) renice(1) nice(1) signal(7) killall(1)
5093 +.BR pkill (1), skill (1), kill (2), renice (1), nice (1), signal (7), killall (1).
5096 This command meets appropriate standards. The -L flag is Linux-specific.
5097 --- procps-3.1.15.orig/tload.c
5098 +++ procps-3.1.15/tload.c
5104 -extern char *optarg;
5106 static void alrm(int signo)
5109 --- procps-3.1.15.orig/pgrep.c
5110 +++ procps-3.1.15/pgrep.c
5112 preg = do_regcomp ();
5114 if (opt_newest) saved_start_time = 0ULL;
5115 - if (opt_oldest) saved_start_time = ~0ULL;
5117 + saved_start_time = ~0ULL;
5118 if (opt_newest) saved_pid = 0;
5119 if (opt_oldest) saved_pid = INT_MAX;
5121 --- procps-3.1.15.orig/top.1
5122 +++ procps-3.1.15/top.1
5124 The number of\fB major\fR page faults that have occurred for a task.
5125 A page fault occurs when a process attempts to read from or write to a virtual
5126 page that is not currently present in its address space.
5127 -A major page fault is when disk access is involved in making that
5129 +A major page fault is when backing storage access (such as a disk) is involved
5130 +in making that page available.
5133 v:\fB nDRT\fR \*(EM Dirty Pages count