#include "libbb.h"
enum {
- USE_FEATURE_PIDOF_SINGLE(OPTBIT_SINGLE,)
- USE_FEATURE_PIDOF_OMIT( OPTBIT_OMIT ,)
- OPT_SINGLE = USE_FEATURE_PIDOF_SINGLE((1<<OPTBIT_SINGLE)) + 0,
- OPT_OMIT = USE_FEATURE_PIDOF_OMIT( (1<<OPTBIT_OMIT )) + 0,
+ IF_FEATURE_PIDOF_SINGLE(OPTBIT_SINGLE,)
+ IF_FEATURE_PIDOF_OMIT( OPTBIT_OMIT ,)
+ OPT_SINGLE = IF_FEATURE_PIDOF_SINGLE((1<<OPTBIT_SINGLE)) + 0,
+ OPT_OMIT = IF_FEATURE_PIDOF_OMIT( (1<<OPTBIT_OMIT )) + 0,
};
-int pidof_main(int argc, char **argv);
-int pidof_main(int argc, char **argv)
+int pidof_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int pidof_main(int argc UNUSED_PARAM, char **argv)
{
unsigned first = 1;
unsigned opt;
#if ENABLE_FEATURE_PIDOF_OMIT
- char ppid_str[sizeof(int)*3 + 1];
llist_t *omits = NULL; /* list of pids to omit */
opt_complementary = "o::";
#endif
/* do unconditional option parsing */
opt = getopt32(argv, ""
- USE_FEATURE_PIDOF_SINGLE ("s")
- USE_FEATURE_PIDOF_OMIT("o:", &omits));
+ IF_FEATURE_PIDOF_SINGLE ("s")
+ IF_FEATURE_PIDOF_OMIT("o:", &omits));
#if ENABLE_FEATURE_PIDOF_OMIT
/* fill omit list. */
{
llist_t *omits_p = omits;
- while (omits_p) {
+ while (1) {
+ omits_p = llist_find_str(omits_p, "%PPID");
+ if (!omits_p)
+ break;
/* are we asked to exclude the parent's process ID? */
- if (strcmp(omits_p->data, "%PPID") == 0) {
- sprintf(ppid_str, "%u", (unsigned)getppid());
- omits_p->data = ppid_str;
- }
- omits_p = omits_p->link;
+ omits_p->data = utoa((unsigned)getppid());
}
}
#endif
/* Looks like everything is set to go. */
- while (optind < argc) {
+ argv += optind;
+ while (*argv) {
pid_t *pidList;
pid_t *pl;
/* reverse the pidlist like GNU pidof does. */
- pidList = pidlist_reverse(find_pid_by_name(argv[optind]));
+ pidList = pidlist_reverse(find_pid_by_name(*argv));
for (pl = pidList; *pl; pl++) {
#if ENABLE_FEATURE_PIDOF_OMIT
if (opt & OPT_OMIT) {
llist_t *omits_p = omits;
while (omits_p) {
- if (xatoul(omits_p->data) == *pl) {
+ if (xatoul(omits_p->data) == (unsigned long)(*pl)) {
goto omitting;
}
omits_p = omits_p->link;
#endif
}
free(pidList);
- optind++;
+ argv++;
}
- putchar('\n');
+ if (!first)
+ bb_putchar('\n');
#if ENABLE_FEATURE_PIDOF_OMIT
if (ENABLE_FEATURE_CLEAN_UP)