X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=procps%2Fpidof.c;h=d9c8dca420a720c543b350be467e0f44f9163aa6;hb=5929edc1fac4340f99ed84e92bf3a2bedd4177c2;hp=8cd1a91c86f151fb6da2784aa4936a914078a6f9;hpb=bb2e9d47f3c7c8172836b589292612e5f155f054;p=oweals%2Fbusybox.git

diff --git a/procps/pidof.c b/procps/pidof.c
index 8cd1a91c8..d9c8dca42 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -2,26 +2,12 @@
 /*
  * pidof implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 1999-2002 by Erik Andersen <andersee@debian.org>
- *
- * 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
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
+ * Licensed under the GPL v2, see the file LICENSE in this tarball.
  */
 
-
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -29,44 +15,103 @@
 #include <signal.h>
 #include <ctype.h>
 #include <string.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include "busybox.h"
 
+#if ENABLE_FEATURE_PIDOF_SINGLE
+#define _SINGLE_COMPL(a) a
+#define SINGLE (1<<0)
+#else
+#define _SINGLE_COMPL(a)
+#define SINGLE (0)
+#endif
 
-extern int pidof_main(int argc, char **argv)
+#if ENABLE_FEATURE_PIDOF_OMIT
+#define _OMIT_COMPL(a) a
+#define _OMIT(a) ,a
+#if ENABLE_FEATURE_PIDOF_SINGLE
+#define OMIT (1<<1)
+#else
+#define OMIT (1<<0)
+#endif
+#else
+#define _OMIT_COMPL(a) ""
+#define _OMIT(a)
+#define OMIT (0)
+#define omitted (0)
+#endif
+
+int pidof_main(int argc, char **argv)
 {
-	int opt, n = 0;
-	int single_flag = 0;
-	int fail = 1;
+	unsigned n = 0;
+	unsigned fail = 1;
+	unsigned long int opt;
+#if ENABLE_FEATURE_PIDOF_OMIT
+	llist_t *omits = NULL; /* list of pids to omit */
+	bb_opt_complementally = _OMIT_COMPL("o::");
+#endif
 
-	/* do normal option parsing */
-	while ((opt = getopt(argc, argv, "s")) > 0) {
-		switch (opt) {
-			case 's':
-				single_flag = 1;
-				break;
-			default:
-				show_usage();
+	/* do unconditional option parsing */
+	opt = bb_getopt_ulflags(argc, argv,
+					_SINGLE_COMPL("s") _OMIT_COMPL("o:")
+					_OMIT(&omits));
+
+#if ENABLE_FEATURE_PIDOF_OMIT
+	/* fill omit list.  */
+	{
+		char getppid_str[32];
+		llist_t * omits_p = omits;
+		while (omits_p) {
+			/* are we asked to exclude the parent's process ID?  */
+			if (!strncmp(omits_p->data, "%PPID", 5)) {
+				llist_pop(&omits_p);
+				snprintf(getppid_str, sizeof(getppid_str), "%d", getppid());
+				llist_add_to(&omits_p, getppid_str);
+			}
+			omits_p = omits_p->link;
 		}
 	}
-
-	/* Looks like everything is set to go. */
+#endif
+	/* Looks like everything is set to go.  */
 	while(optind < argc) {
 		long *pidList;
 		long *pl;
 
-		pidList = find_pid_by_name(argv[optind]);
+		/* reverse the pidlist like GNU pidof does.  */
+		pidList = pidlist_reverse(find_pid_by_name(argv[optind]));
 		for(pl = pidList; *pl > 0; pl++) {
-			printf("%s%ld", (n++ ? " " : ""), *pl);
-			fail = 0;
-			if (single_flag)
+#if ENABLE_FEATURE_PIDOF_OMIT
+			unsigned omitted = 0;
+			if (opt & OMIT) {
+				llist_t *omits_p = omits;
+				while (omits_p)
+					if (strtol(omits_p->data, NULL, 10) == *pl) {
+						omitted = 1; break;
+					} else
+						omits_p = omits_p->link;
+			}
+#endif
+			if (!omitted) {
+				if (n) {
+					putchar(' ');
+				} else {
+					n = 1;
+				}
+				printf("%ld", *pl);
+			}
+			fail = (!ENABLE_FEATURE_PIDOF_OMIT && omitted);
+
+			if (ENABLE_FEATURE_PIDOF_SINGLE && (opt & SINGLE))
 				break;
 		}
 		free(pidList);
 		optind++;
-
 	}
-	printf("\n");
+	putchar('\n');
 
+#if ENABLE_FEATURE_PIDOF_OMIT
+	if (ENABLE_FEATURE_CLEAN_UP)
+		llist_free(omits, NULL);
+#endif
 	return fail ? EXIT_FAILURE : EXIT_SUCCESS;
 }