- do away with useless fwd-decls, redundant bb_printf calls, silence warning

  about comparing signed and unsigned and make stuff static.
   text    data     bss     dec     hex filename
   6944       0       0    6944    1b20 util-linux/ipcs.o.oorig
   6509       0       0    6509    196d util-linux/ipcs.o

TODO: bb_getopt_ulflags, and further simplifications

1 files changed, 204 insertions, 220 deletions

diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index f1463a8e3..6efe3d2b6 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -4,38 +4,7 @@
  * 01 Sept 2004 - Rodney Radford <rradford@mindspring.com>
  * Adapted for busybox from util-linux-2.12a.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * --- Pre-busybox history from util-linux-2.12a ------------------------
- *
- * 1999-02-22 Arkadiusz Mi˙kiewicz <misiek@pld.ORG.PL>
- * - added Native Language Support
- *
- * Patched to display the key field -- hy@picksys.com 12/18/96
- *
- * Patch from arnolds@ifns.de (Heinz-Ado Arnolds) applied Mon Jul 1
- * 19:30:41 1996 by janl@math.uio.no to add code missing in case PID:
- * clauses.
- *
- * Patches from Mike Jagdis (jaggy@purplet.demon.co.uk) applied
- * Wed Feb 8 12:12:21 1995 by faith@cs.unc.edu to print numeric uids
- * if no passwd file entry.
- *
- * Modified Sat Oct  9 10:55:28 1993 for 0.99.13
- * Original author unknown, may be "krishna balasub@cis.ohio-state.edu"
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdio.h>
@@ -128,97 +97,8 @@ union semun {
 #define TIME 4
 #define PID 5
 
-static void do_shm (char format);
-static void do_sem (char format);
-static void do_msg (char format);
-static void print_shm (int id);
-static void print_msg (int id);
-static void print_sem (int id);
-
-int ipcs_main (int argc, char **argv) {
-	int opt, msg = 0, sem = 0, shm = 0, id=0, print=0;
-	char format = 0;
-	char options[] = "atclupsmqi:ih?";
-
-	while ((opt = getopt (argc, argv, options)) != -1) {
-		switch (opt) {
-		case 'i':
-			id = atoi (optarg);
-			print = 1;
-			break;
-		case 'a':
-			msg = shm = sem = 1;
-			break;
-		case 'q':
-			msg = 1;
-			break;
-		case 's':
-			sem = 1;
-			break;
-		case 'm':
-			shm = 1;
-			break;
-		case 't':
-			format = TIME;
-			break;
-		case 'c':
-			format = CREATOR;
-			break;
-		case 'p':
-			format = PID;
-			break;
-		case 'l':
-			format = LIMITS;
-			break;
-		case 'u':
-			format = STATUS;
-			break;
-		case 'h':
-		case '?':
-			bb_show_usage();
-			bb_fflush_stdout_and_exit (0);
-		}
-	}
-
-	if  (print) {
-		if (shm) {
-			print_shm (id);
-			bb_fflush_stdout_and_exit (0);
-		}
-		if (sem) {
-			print_sem (id);
-			bb_fflush_stdout_and_exit (0);
-		}
-		if (msg) {
-			print_msg (id);
-			bb_fflush_stdout_and_exit (0);
-		}
-		bb_show_usage();
-		bb_fflush_stdout_and_exit (0);
-	}
-
-	if ( !shm && !msg && !sem)
-		msg = sem = shm = 1;
-	bb_printf ("\n");
 
-	if (shm) {
-		do_shm (format);
-		bb_printf ("\n");
-	}
-	if (sem) {
-		do_sem (format);
-		bb_printf ("\n");
-	}
-	if (msg) {
-		do_msg (format);
-		bb_printf ("\n");
-	}
-	return 0;
-}
-
-
-static void
-print_perms (int id, struct ipc_perm *ipcp) {
+static void print_perms (int id, struct ipc_perm *ipcp) {
 	struct passwd *pw;
 	struct group *gr;
 
@@ -244,7 +124,7 @@ print_perms (int id, struct ipc_perm *ipcp) {
 }
 
 
-void do_shm (char format)
+static void do_shm (char format)
 {
 	int maxid, shmid, id;
 	struct shmid_ds shmseg;
@@ -266,47 +146,51 @@ void do_shm (char format)
 			return;
 		/* glibc 2.1.3 and all earlier libc's have ints as fields
 		   of struct shminfo; glibc 2.1.91 has unsigned long; ach */
-		bb_printf ("max number of segments = %lu\n",
-			(unsigned long) shminfo.shmmni);
-		bb_printf ("max seg size (kbytes) = %lu\n",
-			(unsigned long) (shminfo.shmmax >> 10));
-		bb_printf ("max total shared memory (pages) = %lu\n",
-			(unsigned long) shminfo.shmall);
-		bb_printf ("min seg size (bytes) = %lu\n",
+		bb_printf ("max number of segments = %lu\n"
+			"max seg size (kbytes) = %lu\n"
+			"max total shared memory (pages) = %lu\n"
+			"min seg size (bytes) = %lu\n",
+			(unsigned long) shminfo.shmmni,
+			(unsigned long) (shminfo.shmmax >> 10),
+			(unsigned long) shminfo.shmall,
 			(unsigned long) shminfo.shmmin);
 		return;
 
 	case STATUS:
-		bb_printf ("------ Shared Memory Status --------\n");
-		bb_printf ("segments allocated %d\n", shm_info.used_ids);
-		bb_printf ("pages allocated %ld\n", shm_info.shm_tot);
-		bb_printf ("pages resident  %ld\n", shm_info.shm_rss);
-		bb_printf ("pages swapped   %ld\n", shm_info.shm_swp);
-		bb_printf ("Swap performance: %ld attempts\t %ld successes\n",
+		bb_printf ("------ Shared Memory Status --------\n"
+			"segments allocated %d\n"
+			"pages allocated %ld\n"
+			"pages resident  %ld\n"
+			"pages swapped   %ld\n"
+			"Swap performance: %ld attempts\t %ld successes\n",
+			shm_info.used_ids,
+			shm_info.shm_tot,
+			shm_info.shm_rss,
+			shm_info.shm_swp,
 			shm_info.swap_attempts, shm_info.swap_successes);
 		return;
 
 	case CREATOR:
-		bb_printf ("------ Shared Memory Segment Creators/Owners --------\n");
-		bb_printf ("%-10s %-10s %-10s %-10s %-10s %-10s\n",
-		 "shmid","perms","cuid","cgid","uid","gid");
+		bb_printf ("------ Shared Memory Segment Creators/Owners --------\n"
+			"%-10s %-10s %-10s %-10s %-10s %-10s\n",
+			"shmid","perms","cuid","cgid","uid","gid");
 		break;
 
 	case TIME:
-		bb_printf ("------ Shared Memory Attach/Detach/Change Times --------\n");
-		bb_printf ("%-10s %-10s %-20s %-20s %-20s\n",
+		bb_printf ("------ Shared Memory Attach/Detach/Change Times --------\n"
+			"%-10s %-10s %-20s %-20s %-20s\n",
 			"shmid","owner","attached","detached","changed");
 		break;
 
 	case PID:
-		bb_printf ("------ Shared Memory Creator/Last-op --------\n");
-		bb_printf ("%-10s %-10s %-10s %-10s\n",
+		bb_printf ("------ Shared Memory Creator/Last-op --------\n"
+			"%-10s %-10s %-10s %-10s\n",
 			"shmid","owner","cpid","lpid");
 		break;
 
 	default:
-		bb_printf ("------ Shared Memory Segments --------\n");
-		bb_printf ("%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n",
+		bb_printf ("------ Shared Memory Segments --------\n"
+			"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n",
 			"key","shmid","owner","perms","bytes","nattch","status");
 		break;
 	}
@@ -369,7 +253,7 @@ void do_shm (char format)
 }
 
 
-void do_sem (char format)
+static void do_sem (char format)
 {
 	int maxid, semid, id;
 	struct semid_ds semary;
@@ -391,28 +275,35 @@ void do_sem (char format)
 		arg.array = (ushort *) (void *) &seminfo; /* damn union */
 		if ((semctl (0, 0, IPC_INFO, arg)) < 0 )
 			return;
-		bb_printf ("max number of arrays = %d\n", seminfo.semmni);
-		bb_printf ("max semaphores per array = %d\n", seminfo.semmsl);
-		bb_printf ("max semaphores system wide = %d\n", seminfo.semmns);
-		bb_printf ("max ops per semop call = %d\n", seminfo.semopm);
-		bb_printf ("semaphore max value = %d\n", seminfo.semvmx);
+		bb_printf ("max number of arrays = %d\n"
+			"max semaphores per array = %d\n"
+			"max semaphores system wide = %d\n"
+			"max ops per semop call = %d\n"
+			"semaphore max value = %d\n",
+			seminfo.semmni,
+			seminfo.semmsl,
+			seminfo.semmns,
+			seminfo.semopm,
+			seminfo.semvmx);
 		return;
 
 	case STATUS:
-		bb_printf ("------ Semaphore Status --------\n");
-		bb_printf ("used arrays = %d\n", seminfo.semusz);
-		bb_printf ("allocated semaphores = %d\n", seminfo.semaem);
+		bb_printf ("------ Semaphore Status --------\n"
+			"used arrays = %d\n"
+			"allocated semaphores = %d\n",
+			seminfo.semusz,
+			seminfo.semaem);
 		return;
 
 	case CREATOR:
-		bb_printf ("------ Semaphore Arrays Creators/Owners --------\n");
-		bb_printf ("%-10s %-10s %-10s %-10s %-10s %-10s\n",
-		 "semid","perms","cuid","cgid","uid","gid");
+		bb_printf ("------ Semaphore Arrays Creators/Owners --------\n"
+			"%-10s %-10s %-10s %-10s %-10s %-10s\n",
+			"semid","perms","cuid","cgid","uid","gid");
 		break;
 
 	case TIME:
-		bb_printf ("------ Shared Memory Operation/Change Times --------\n");
-		bb_printf ("%-8s %-10s %-26.24s %-26.24s\n",
+		bb_printf ("------ Shared Memory Operation/Change Times --------\n"
+			"%-8s %-10s %-26.24s %-26.24s\n",
 			"shmid","owner","last-op","last-changed");
 		break;
 
@@ -420,8 +311,8 @@ void do_sem (char format)
 		break;
 
 	default:
-		bb_printf ("------ Semaphore Arrays --------\n");
-		bb_printf ("%-10s %-10s %-10s %-10s %-10s\n",
+		bb_printf ("------ Semaphore Arrays --------\n"
+			"%-10s %-10s %-10s %-10s %-10s\n",
 			"key","semid","owner","perms","nsems");
 		break;
 	}
@@ -471,7 +362,7 @@ void do_sem (char format)
 }
 
 
-void do_msg (char format)
+static void do_msg (char format)
 {
 	int maxid, msqid, id;
 	struct msqid_ds msgque;
@@ -489,41 +380,47 @@ void do_msg (char format)
 	case LIMITS:
 		if ((msgctl (0, IPC_INFO, (struct msqid_ds *) (void *) &msginfo)) < 0 )
 			return;
-		bb_printf ("------ Messages: Limits --------\n");
-		bb_printf ("max queues system wide = %d\n", msginfo.msgmni);
-		bb_printf ("max size of message (bytes) = %d\n", msginfo.msgmax);
-		bb_printf ("default max size of queue (bytes) = %d\n", msginfo.msgmnb);
+		bb_printf ("------ Messages: Limits --------\n"
+			"max queues system wide = %d\n"
+			"max size of message (bytes) = %d\n"
+			"default max size of queue (bytes) = %d\n",
+			msginfo.msgmni,
+			msginfo.msgmax,
+			msginfo.msgmnb);
 		return;
 
 	case STATUS:
-		bb_printf ("------ Messages: Status --------\n");
-		bb_printf ("allocated queues = %d\n", msginfo.msgpool);
-		bb_printf ("used headers = %d\n", msginfo.msgmap);
-		bb_printf ("used space = %d bytes\n", msginfo.msgtql);
+		bb_printf ("------ Messages: Status --------\n"
+			"allocated queues = %d\n"
+			"used headers = %d\n"
+			"used space = %d bytes\n",
+			msginfo.msgpool,
+			msginfo.msgmap,
+			msginfo.msgtql);
 		return;
 
 	case CREATOR:
-		bb_printf ("------ Message Queues: Creators/Owners --------\n");
-		bb_printf ("%-10s %-10s %-10s %-10s %-10s %-10s\n",
-		 "msqid","perms","cuid","cgid","uid","gid");
+		bb_printf ("------ Message Queues: Creators/Owners --------\n"
+			"%-10s %-10s %-10s %-10s %-10s %-10s\n",
+			"msqid","perms","cuid","cgid","uid","gid");
 		break;
 
 	case TIME:
-		bb_printf ("------ Message Queues Send/Recv/Change Times --------\n");
-		bb_printf ("%-8s %-10s %-20s %-20s %-20s\n",
+		bb_printf ("------ Message Queues Send/Recv/Change Times --------\n"
+			"%-8s %-10s %-20s %-20s %-20s\n",
 			"msqid","owner","send","recv","change");
 		break;
 
 	case PID:
-		bb_printf ("------ Message Queues PIDs --------\n");
-		bb_printf ("%-10s %-10s %-10s %-10s\n",
+		bb_printf ("------ Message Queues PIDs --------\n"
+			"%-10s %-10s %-10s %-10s\n",
 			"msqid","owner","lspid","lrpid");
 		break;
 
 	default:
-		bb_printf ("------ Message Queues --------\n");
-		bb_printf ("%-10s %-10s %-10s %-10s %-12s %-12s\n",
-			"key", "msqid", "owner", "perms","used-bytes", "messages");
+		bb_printf ("------ Message Queues --------\n"
+			"%-10s %-10s %-10s %-10s %-12s %-12s\n",
+			"key","msqid","owner","perms","used-bytes","messages");
 		break;
 	}
 
@@ -581,7 +478,7 @@ void do_msg (char format)
 }
 
 
-void print_shm (int shmid)
+static void print_shm (int shmid)
 {
 	struct shmid_ds shmds;
 	struct ipc_perm *ipcp = &shmds.shm_perm;
@@ -591,25 +488,27 @@ void print_shm (int shmid)
 		return;
 	}
 
-	bb_printf ("\nShared memory Segment shmid=%d\n", shmid);
-	bb_printf ("uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n",
-		ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid);
-	bb_printf ("mode=%#o\taccess_perms=%#o\n",
-		ipcp->mode, ipcp->mode & 0777);
-	bb_printf ("bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n",
+	bb_printf ("\nShared memory Segment shmid=%d\n"
+		"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+		"mode=%#o\taccess_perms=%#o\n"
+		"bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+		"att_time=%-26.24s\n"
+		"det_time=%-26.24s\n"
+		"change_time=%-26.24s\n"
+		"\n",
+		shmid,
+		ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid,
+		ipcp->mode, ipcp->mode & 0777,
 		(long) shmds.shm_segsz, shmds.shm_lpid, shmds.shm_cpid,
-		(long) shmds.shm_nattch);
-	bb_printf ("att_time=%-26.24s\n",
-		shmds.shm_atime ? ctime (&shmds.shm_atime) : "Not set");
-	bb_printf ("det_time=%-26.24s\n",
-		shmds.shm_dtime ? ctime (&shmds.shm_dtime) : "Not set");
-	bb_printf ("change_time=%-26.24s\n", ctime (&shmds.shm_ctime));
-	bb_printf ("\n");
+		(long) shmds.shm_nattch,
+		shmds.shm_atime ? ctime (&shmds.shm_atime) : "Not set",
+		shmds.shm_dtime ? ctime (&shmds.shm_dtime) : "Not set",
+		ctime (&shmds.shm_ctime));
 	return;
 }
 
 
-void print_msg (int msqid)
+static void print_msg (int msqid)
 {
 	struct msqid_ds buf;
 	struct ipc_perm *ipcp = &buf.msg_perm;
@@ -619,10 +518,15 @@ void print_msg (int msqid)
 		return;
 	}
 
-	bb_printf ("\nMessage Queue msqid=%d\n", msqid);
-	bb_printf ("uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n",
-		ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, ipcp->mode);
-	bb_printf ("cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n",
+	bb_printf ("\nMessage Queue msqid=%d\n"
+		"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+		"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
+		"send_time=%-26.24s\n"
+		"rcv_time=%-26.24s\n"
+		"change_time=%-26.24s\n"
+		"\n",
+		msqid,
+		ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, ipcp->mode,
 		/*
 		 * glibc-2.1.3 and earlier has unsigned short;
 		 * glibc-2.1.91 has variation between
@@ -630,23 +534,19 @@ void print_msg (int msqid)
 		 * Austin has msgqnum_t (for msg_qbytes)
 		 */
 		(long) buf.msg_cbytes, (long) buf.msg_qbytes,
-		(long) buf.msg_qnum, buf.msg_lspid, buf.msg_lrpid);
-	bb_printf ("send_time=%-26.24s\n",
-		buf.msg_stime ? ctime (&buf.msg_stime) : "Not set");
-	bb_printf ("rcv_time=%-26.24s\n",
-		buf.msg_rtime ? ctime (&buf.msg_rtime) : "Not set");
-	bb_printf ("change_time=%-26.24s\n",
+		(long) buf.msg_qnum, buf.msg_lspid, buf.msg_lrpid,
+		buf.msg_stime ? ctime (&buf.msg_stime) : "Not set",
+		buf.msg_rtime ? ctime (&buf.msg_rtime) : "Not set",
 		buf.msg_ctime ? ctime (&buf.msg_ctime) : "Not set");
-	bb_printf ("\n");
 	return;
 }
 
-void print_sem (int semid)
+static void print_sem (int semid)
 {
 	struct semid_ds semds;
 	struct ipc_perm *ipcp = &semds.sem_perm;
 	union semun arg;
-	int i;
+	unsigned int i;
 
 	arg.buf = &semds;
 	if (semctl (semid, 0, IPC_STAT, arg) < 0) {
@@ -654,21 +554,23 @@ void print_sem (int semid)
 		return;
 	}
 
-	bb_printf ("\nSemaphore Array semid=%d\n", semid);
-	bb_printf ("uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n",
-		ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid);
-	bb_printf ("mode=%#o, access_perms=%#o\n",
-		ipcp->mode, ipcp->mode & 0777);
-	bb_printf ("nsems = %ld\n", (long) semds.sem_nsems);
-	bb_printf ("otime = %-26.24s\n",
-		semds.sem_otime ? ctime (&semds.sem_otime) : "Not set");
-	bb_printf ("ctime = %-26.24s\n", ctime (&semds.sem_ctime));
-
-	bb_printf ("%-10s %-10s %-10s %-10s %-10s\n",
+	bb_printf ("\nSemaphore Array semid=%d\n"
+		"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+		"mode=%#o, access_perms=%#o\n"
+		"nsems = %ld\n"
+		"otime = %-26.24s\n"
+		"ctime = %-26.24s\n"
+		"%-10s %-10s %-10s %-10s %-10s\n",
+		semid,
+		ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid,
+		ipcp->mode, ipcp->mode & 0777,
+		(long) semds.sem_nsems,
+		semds.sem_otime ? ctime (&semds.sem_otime) : "Not set",
+		ctime (&semds.sem_ctime),
 		"semnum","value","ncount","zcount","pid");
 
 	arg.val = 0;
-	for (i=0; i< semds.sem_nsems; i++) {
+	for (i=0; i < semds.sem_nsems; i++) {
 		int val, ncnt, zcnt, pid;
 		val = semctl (semid, i, GETVAL, arg);
 		ncnt = semctl (semid, i, GETNCNT, arg);
@@ -684,3 +586,85 @@ void print_sem (int semid)
 	bb_printf ("\n");
 	return;
 }
+
+int ipcs_main (int argc, char **argv) {
+	int opt, msg = 0, sem = 0, shm = 0, id=0, print=0;
+	char format = 0;
+	char options[] = "atclupsmqi:ih?";
+
+	while ((opt = getopt (argc, argv, options)) != -1) {
+		switch (opt) {
+		case 'i':
+			id = atoi (optarg);
+			print = 1;
+			break;
+		case 'a':
+			msg = shm = sem = 1;
+			break;
+		case 'q':
+			msg = 1;
+			break;
+		case 's':
+			sem = 1;
+			break;
+		case 'm':
+			shm = 1;
+			break;
+		case 't':
+			format = TIME;
+			break;
+		case 'c':
+			format = CREATOR;
+			break;
+		case 'p':
+			format = PID;
+			break;
+		case 'l':
+			format = LIMITS;
+			break;
+		case 'u':
+			format = STATUS;
+			break;
+		case 'h':
+		case '?':
+			bb_show_usage();
+			bb_fflush_stdout_and_exit (0);
+		}
+	}
+
+	if  (print) {
+		if (shm) {
+			print_shm (id);
+			bb_fflush_stdout_and_exit (0);
+		}
+		if (sem) {
+			print_sem (id);
+			bb_fflush_stdout_and_exit (0);
+		}
+		if (msg) {
+			print_msg (id);
+			bb_fflush_stdout_and_exit (0);
+		}
+		bb_show_usage();
+		bb_fflush_stdout_and_exit (0);
+	}
+
+	if ( !shm && !msg && !sem)
+		msg = sem = shm = 1;
+	bb_printf ("\n");
+
+	if (shm) {
+		do_shm (format);
+		bb_printf ("\n");
+	}
+	if (sem) {
+		do_sem (format);
+		bb_printf ("\n");
+	}
+	if (msg) {
+		do_msg (format);
+		bb_printf ("\n");
+	}
+	return 0;
+}
+