ps: minor reformatting and trailing whitespace elimination

This patch mostly reorganizes include files and eliminates
some useless trailing whitespace.

It also adopts the standard procps-ng unconditional approach
to nls initialization.

diff --git a/ps/COPYING b/ps/COPYING
index 92b8903ff3fea7f49ef5c041b67a087bca21c5ec..066a80a2c82d3551021ceca9ad7de8aad3b50333 100644 (file)
--- a/ps/COPYING
+++ b/ps/COPYING
@@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an

diff --git a/ps/display.c b/ps/display.c
index 2917edb5017610c8470c0a0ab6f4551cf620f26d..99d1d18d9f46974cb4c2c5044a23b484925941c0 100644 (file)
--- a/ps/display.c
+++ b/ps/display.c
@@ -9,32 +9,26 @@
  * GNU Library General Public License for more details.
  */
 
-#include <stdlib.h>
+#include <grp.h>
+#include <locale.h>
+#include <pwd.h>
+#include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#if (__GNU_LIBRARY__ >= 6)
-# include <locale.h>
-#endif
-
-/* username lookups */
-#include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
-
-/* major/minor number */
 #include <sys/sysmacros.h>
+#include <sys/types.h>
 
-#include <signal.h>   /* catch signals */
-
-#include "common.h"
 #include "../proc/alloc.h"
-#include "../proc/wchan.h"
-#include "../proc/version.h"
 #include "../proc/readproc.h"
-#include "../proc/sysinfo.h"
 #include "../proc/sig.h"
+#include "../proc/sysinfo.h"
+#include "../proc/version.h"
+#include "../proc/wchan.h"
+
+#include "common.h"
 
 #ifndef SIGCHLD
 #define SIGCHLD SIGCLD
@@ -529,11 +523,9 @@ static void fancy_spew(void){
 
 /***** no comment */
 int main(int argc, char *argv[]){
-#if (__GNU_LIBRARY__ >= 6)
   setlocale (LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
-#endif
 
 #ifdef DEBUG
   init_stack_trace(argv[0]);

diff --git a/ps/global.c b/ps/global.c
index 4a88525c2bbe8c2b7144bad2cb121ec97812d685..8e3fbd211b0b65bf4c8c2bf5b02e5335d2d5fd8b 100644 (file)
--- a/ps/global.c
+++ b/ps/global.c
@@ -8,25 +8,26 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Library General Public License for more details.
  */
+
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <termios.h>
-#include <stdio.h>
 #include <unistd.h>
+
 #include <sys/ioctl.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
-#include <string.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-
-#include "common.h"
-
 #include <sys/sysmacros.h>
+#include <sys/types.h>
+
 #include "../proc/wchan.h"
 #include "../proc/version.h"
 #include "../proc/sysinfo.h"
 
+#include "common.h"
 
 #ifndef __GNU_LIBRARY__
 #define __GNU_LIBRARY__ -1

diff --git a/ps/output.c b/ps/output.c
index 5dbae861d98ebe85e585165ba952497a19d3b68e..6880c8b719b8f5de1575ef8e4e690b1903c745dc 100644 (file)
--- a/ps/output.c
+++ b/ps/output.c
@@ -21,7 +21,6 @@
  * For example, Digital prints the real-time signals.
  */
 
-
 /*
  * Data table idea:
  *
@@ -40,6 +39,7 @@
  */
 
 #include <ctype.h>
+#include <dlfcn.h>
 #include <fcntl.h>
 #include <grp.h>
 #include <limits.h>
@@ -47,13 +47,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
+#include <unistd.h>
+
 #include <sys/ioctl.h>
+#include <sys/mman.h>
 #include <sys/resource.h>
 #include <sys/types.h>
-#include <sys/mman.h>
-#include <time.h>
-#include <unistd.h>
-#include <dlfcn.h>
 
 #include "../proc/readproc.h"
 #include "../proc/sysinfo.h"
@@ -61,6 +61,7 @@
 #include "../proc/procps.h"
 #include "../proc/devname.h"
 #include "../proc/escape.h"
+
 #include "common.h"
 
 /* TODO:

diff --git a/ps/parser.c b/ps/parser.c
index 552face3d8108657af39064676f8aa62c6d90bc1..4fe9723fbbe3049d3ff614e46a296fb5b5d5bcbc 100644 (file)
--- a/ps/parser.c
+++ b/ps/parser.c
@@ -13,22 +13,21 @@
  * #define Print(fmt, args...) printf("Debug: " fmt, ## args)
  */
 
-#include <stdlib.h>
+#include <grp.h>
+#include <pwd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-
-/* username lookups */
-#include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
+#include <unistd.h>
 
 #include <sys/stat.h>
-#include <unistd.h>
+#include <sys/types.h>
 
-#include "common.h"
 #include "../proc/alloc.h"
 #include "../proc/version.h"
 
+#include "common.h"
+
 #define ARG_GNU  0
 #define ARG_END  1
 #define ARG_PGRP 2
@@ -154,8 +153,7 @@ found_it:
   return 0;
 }
 
-static int parse_usage_section(const char *opt)
-{
+static int parse_usage_section(const char *opt){
   if (!strcmp(opt, "s") || !strcmp(opt, "selection"))
     return USAGE_SELECTION;
   if (!strcmp(opt, "l") || !strcmp(opt, "list"))

diff --git a/ps/ps.1 b/ps/ps.1
index a2fa18cfd44ec747e81082fc461eccb86732c5ea..c08d39db72c034c5c39b160986f569c89f81ffe2 100644 (file)
--- a/ps/ps.1
+++ b/ps/ps.1
@@ -1085,7 +1085,7 @@ class     CLS     T{
 scheduling class of the process.  (alias
 .BR policy , \ cls ).
 Field's possible values are:
-.IP "" 2       
+.IP "" 2
 \-     not reported
 .br
 TS     SCHED_OTHER

diff --git a/ps/select.c b/ps/select.c
index 6b8220df47d5676d6ee545c51caafa0a017220cd..6a87fcc58a279b22fe474c7cc55896fc186af702 100644 (file)
--- a/ps/select.c
+++ b/ps/select.c
@@ -1,21 +1,22 @@
 /*
- * Copyright 1998-2002 by Albert Cahalan; all rights resered.         
+ * Copyright 1998-2002 by Albert Cahalan; all rights resered.
  * This file may be used subject to the terms and conditions of the
- * GNU Library General Public License Version 2, or any later version  
+ * GNU Library General Public License Version 2, or any later version
  * at your option, as published by the Free Software Foundation.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Library General Public License for more details.
- */                                 
+ */
 
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "common.h"
-#include "../proc/readproc.h"
 #include "../proc/procps.h"
+#include "../proc/readproc.h"
+
+#include "common.h"
 
 //#define process_group_leader(p) ((p)->pgid    == (p)->tgid)
 //#define some_other_user(p)      ((p)->euid    != cached_euid)

diff --git a/ps/sortformat.c b/ps/sortformat.c
index 663ffee437ae165ace740748858e413bf3ea0896..8b39915263ba704e4b3e21e9aacfe264b1663d7f 100644 (file)
--- a/ps/sortformat.c
+++ b/ps/sortformat.c
@@ -9,17 +9,17 @@
  * GNU Library General Public License for more details.
  */
 
-#include <stdlib.h>
+#include <grp.h>
+#include <pwd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
-/* username lookups */
 #include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
 
 #include "../proc/readproc.h"
 #include "../proc/sysinfo.h"
+
 #include "common.h"
 
 static sf_node *sf_list = NULL;         /* deferred sorting and formatting */

diff --git a/ps/stacktrace.c b/ps/stacktrace.c
index f16a2f859c3b57a71cc507d4bcd2b40b3a75a462..0cf0c8def89b444f4e402ab21c461032e3d8af72 100644 (file)
--- a/ps/stacktrace.c
+++ b/ps/stacktrace.c
@@ -5,14 +5,15 @@
  * Modified for easy use by Albert Cahalan.
  */
 
-#include <unistd.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
+
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 
 #include "common.h"