emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'master', remote-tracking branch 'sami/ng'

Browse Source
This commit is contained in:
Craig Small
2011-10-01 23:23:30 +10:00
parent f7fb8bddf4 367fd902da
commit b9a408372e
43 changed files with 452 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ps/Makefile.am Normal file
View File

@ -0,0 +1,28 @@
AM_CPPFLAGS = -include $(top_builddir)/config.h
AM_CFLAGS = -I../proc
AM_LDFLAGS = ../proc/libproc-ng.la
dist_man_MANS = ps.1
# Use `ginstall' in the definition of PROGRAMS and in dependencies to avoid
# confusion with the `install' target. The install rule transforms `ginstall'
# to install before applying any user-specified name transformations.
transform = s/pscommand/ps/; $(program_transform_name)
bin_PROGRAMS = pscommand
pscommand_SOURCES = \
common.h \
display.c \
global.c \
help.c \
output.c \
parser.c \
select.c \
sortformat.c \
stacktrace.c
EXTRA_DIST = \
HACKING \
it \
regression \
TRANSLATION

2
ps/display.c
View File

@ -46,7 +46,7 @@ static void signal_handler(int signo){
fprintf(stderr,
"\n\n"
"Signal %d (%s) caught by ps (%s).\n"
"Please send bug reports to <feedback@lists.sf.net> or <albert@users.sf.net>\n",
"Please send bug reports to <procps@freelists.org>\n",
signo,
signal_number_to_name(signo),
procps_version

40
ps/module.mk
View File

@ -1,40 +0,0 @@
# This file gets included into the main Makefile, in the top directory.
INSTALL += $(bin)ps $(man1)ps.1
# files to remove
CLEAN += ps/ps ps/debug
# a directory for cleaning
DIRS += ps/
# a file to create
ALL += ps/ps
PS_C := display global help output parser select sortformat
PSNAMES := $(addprefix ps/,$(PS_C))
PSOBJ := $(addsuffix .o,$(PSNAMES))
PSSRC := $(addsuffix .c,$(PSNAMES))
PS_X := COPYING HACKING TRANSLATION common.h module.mk it p ps.1 regression
TARFILES += $(PSSRC) $(addprefix ps/,$(PS_X))
ps/ps: $(PSOBJ) $(LIBPROC)
$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ $(ldl)
# This just adds the stacktrace code
ps/debug: $(PSOBJ) stacktrace.o $(LIBPROC)
$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -lefence $(ldl)
$(PSOBJ): %.o: %.c ps/common.h $(LIBPROC)
$(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $< -o $@
ps/stacktrace.o: ps/stacktrace.c
$(bin)ps: ps/ps
$(install) --mode a=rx $< $@
$(man1)ps.1 : ps/ps.1
$(install) --mode a=r $< $@
-rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz

6
ps/p
View File

@ -1,6 +0,0 @@
#!/bin/sh
#
# Wow, using $* causes great pain with: ps "pid,user pcpu,pmem"
# The "$@" won't break that into 2 arguments.
#
LD_LIBRARY_PATH=../proc exec ./ps "$@"

4
ps/parser.c
View File

@ -1160,7 +1160,7 @@ static const char *thread_option_check(void){
if(thread_flags&(TF_B_m|TF_U_m|TF_B_H)){
// Got a thread style, so format modification is a requirement?
// Maybe -T/-L has H thread style though. (sorting interaction?)
//return "Huh? Tell procps-feedback@lists.sf.net what you expected.";
//return "Huh? Tell procps@freelists.org what you expected.";
thread_flags |= TF_must_use;
}else{
// using -L/-T thread style, so format from elsewhere is OK
@ -1232,7 +1232,7 @@ try_bsd:
// out the friendly warning. Cut-over is likely to be in 2005.
if(!(personality & PER_FORCE_BSD))
fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n");
// Remember: contact albert@users.sf.net or procps-feedback@lists.sf.net
// Remember: contact procps@freelists.org
// if you should feel tempted. Be damn sure you understand all
// the issues. The same goes for other stuff too, BTW. Please ask.
// I'm happy to justify various implementation choices.

8
ps/ps.1
View File

@ -643,13 +643,13 @@ Print debugging info.
List all format specifiers.
.opt V
Print the procps version.
Print the procps-ng version.
.opt \-V
Print the procps version.
Print the procps-ng version.
.opt \-\-version
Print the procps version.
Print the procps-ng version.
.\" """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.PD
@ -1565,5 +1565,5 @@ Mossberger\-Tang wrote the generic BFD support for psupdate. Albert Cahalan
<albert@users.sf.net> rewrote ps for full Unix98 and BSD support, along with
some ugly hacks for obsolete and foreign syntax.
Please send bug reports to <procps\-feedback@lists.sf.net>.
Please send bug reports to <procps@freelists.org>.
No\ subscription is required or suggested.

4
ps/sortformat.c
View File

@ -800,7 +800,7 @@ const char *process_sf_options(int localbroken){
// with sorting. Do the threads remain grouped, with sorting
// by process, or do the threads get sorted by themselves?
if(sort_list && (thread_flags&TF_no_sort)){
return "Tell procps-feedback@lists.sf.net what you expected.";
return "Tell procps@freelists.org what you expected.";
}
// If nothing else, try to use $PS_FORMAT before the default.
@ -810,7 +810,7 @@ const char *process_sf_options(int localbroken){
if(tmp && *tmp){
const char *err;
sf_node sfn;
if(thread_flags&TF_must_use) return "Tell procps-feedback@sf.net what you want. (-L/-T, -m/m/H, and $PS_FORMAT)";
if(thread_flags&TF_must_use) return "Tell procps@freelists.org what you want. (-L/-T, -m/m/H, and $PS_FORMAT)";
sfn.sf = tmp;
sfn.f_cooked = NULL;
err = format_parse(&sfn);