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

ps: add build option to disable ps option warning

Browse Source 
Slackware seems to have this patch, while it is not in use(?) Well,
the upstream procps-ng allows one to disable warnings if that is
wanted. After all having this sort of 'feature' does not cost much,
while lacking it might annoy someone.

A patch from Slackware.

Reference: http://www.ftp.be/packages/slackware/slackware_source/a/procps/procps.nowarning.diff.gz
Backported-by: Sami Kerola <kerolasa@iki.fi>

Conflicts:

	proc/ksym.c
This commit is contained in:
unknown 2011-12-05 16:35:35 +01:00 committed by Craig Small
parent 86fe50d179
commit fe82a3246a
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -136,6 +136,14 @@ if test "x$enable_w_from" = xyes; then
AC_DEFINE(W_SHOWFROM, 1, [enable w from field by default]) AC_DEFINE(W_SHOWFROM, 1, [enable w from field by default])
fi fi
AC_ARG_ENABLE([whining],
AS_HELP_STRING([--disable-whining], [do not print unnessary warnings (slackware-ism)]),
[], enable_whining=yes
)
if test "x$enable_whining" = xyes; then
AC_DEFINE(BUILD_WITH_WHINE, 1, [should extra warnings be printed (slackware-ism)])
fi
if test x"$DEJAGNU" = x if test x"$DEJAGNU" = x
then then
DEJAGNU="\$(top_srcdir)/testsuite/global-conf.exp" DEJAGNU="\$(top_srcdir)/testsuite/global-conf.exp"

8
proc/ksym.c
View File

@ -418,18 +418,26 @@ good_match:;
} }
} }
#ifdef BUILD_WITH_WHINE
if(0){ if(0){
bad_match: bad_match:
message("Warning: %s does not match kernel data.\n", filename); message("Warning: %s does not match kernel data.\n", filename);
} }
#endif
if(0){ if(0){
bad_version: bad_version:
message("Warning: %s has an incorrect kernel version.\n", filename); message("Warning: %s has an incorrect kernel version.\n", filename);
} }
if(0){ if(0){
bad_alloc:
message("Warning: not enough memory available\n");
}
#ifdef BUILD_WITH_WHINE
if(0){
bad_parse: bad_parse:
message("Warning: %s not parseable as a System.map\n", filename); message("Warning: %s not parseable as a System.map\n", filename);
} }
#endif
if(0){ if(0){
bad_open: bad_open:
message("Warning: %s could not be opened as a System.map\n", filename); message("Warning: %s could not be opened as a System.map\n", filename);

11
ps/parser.c
View File

@ -1231,8 +1231,19 @@ try_bsd:
// for some non-default personalities. So "ps -ax" will parse // for some non-default personalities. So "ps -ax" will parse
// as SysV options... and you're screwed if you've been patching // as SysV options... and you're screwed if you've been patching
// out the friendly warning. Cut-over is likely to be in 2005. // out the friendly warning. Cut-over is likely to be in 2005.
#ifdef BUILD_WITH_WHINE
// Slackware:
// IMO, people can change old habits if and when user 'x' comes
// along. I still find this warning to be a POLA violation. No
// offense... that's the beauty of open source. You've got your
// ideas about this, and I have mine, and we're allowed to
// disagree. Nothing in the UNIX or POSIX standards requires
// this (annoying) warning to be displayed, and we're not
// changing the actual behavior of ps in any way. I know of no
// other 'ps' that produces this message.
if(!(personality & PER_FORCE_BSD)) if(!(personality & PER_FORCE_BSD))
fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n"); fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n");
#endif
// Remember: contact procps@freelists.org // Remember: contact procps@freelists.org
// if you should feel tempted. Be damn sure you understand all // if you should feel tempted. Be damn sure you understand all
// the issues. The same goes for other stuff too, BTW. Please ask. // the issues. The same goes for other stuff too, BTW. Please ask.