From 67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Tue, 3 Oct 2006 21:00:06 +0000
Subject: getopt_ulflags -> getopt32. It is impossible to formulate sane ABI
 based on size of ulong because it can be 32-bit or 64-bit. Basically it means
 that you cannot portably use more that 32 option chars in one call anyway...
 Make it explicit.

---
 procps/pidof.c | 4 ++--
 procps/ps.c    | 8 ++++----
 procps/top.c   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'procps')

diff --git a/procps/pidof.c b/procps/pidof.c
index c686245..e6c9548 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -39,11 +39,11 @@ int pidof_main(int argc, char **argv)
 	unsigned long int opt;
 #if ENABLE_FEATURE_PIDOF_OMIT
 	llist_t *omits = NULL; /* list of pids to omit */
-	bb_opt_complementally = _OMIT_COMPL("o::");
+	opt_complementary = _OMIT_COMPL("o::");
 #endif
 
 	/* do unconditional option parsing */
-	opt = bb_getopt_ulflags(argc, argv,
+	opt = getopt32(argc, argv,
 					_SINGLE_COMPL("s") _OMIT_COMPL("o:")
 					_OMIT(&omits));
 
diff --git a/procps/ps.c b/procps/ps.c
index 95502b2..0452a50 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -23,7 +23,7 @@ int ps_main(int argc, char **argv)
 	int terminal_width;
 	int w_count = 0;
 
-	bb_opt_complementally = "-:ww";
+	opt_complementary = "-:ww";
 #else
 # define terminal_width 79
 #endif
@@ -31,11 +31,11 @@ int ps_main(int argc, char **argv)
 #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
 	/* handle arguments */
 #if ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX
-	i = bb_getopt_ulflags(argc, argv, "wc", &w_count);
+	i = getopt32(argc, argv, "wc", &w_count);
 #elif ENABLE_FEATURE_PS_WIDE && !ENABLE_SELINUX
-	bb_getopt_ulflags(argc, argv, "w", &w_count);
+	getopt32(argc, argv, "w", &w_count);
 #else /* !ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX */
-	i = bb_getopt_ulflags(argc, argv, "c");
+	i = getopt32(argc, argv, "c");
 #endif
 #if ENABLE_FEATURE_PS_WIDE
 	/* if w is given once, GNU ps sets the width to 132,
diff --git a/procps/top.c b/procps/top.c
index be8ac19..ebfbcb8 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -397,8 +397,8 @@ int top_main(int argc, char **argv)
 
 	/* do normal option parsing */
 	interval = 5;
-	bb_opt_complementally = "-";
-	option_mask = bb_getopt_ulflags(argc, argv, "d:n:b", 
+	opt_complementary = "-";
+	option_mask = getopt32(argc, argv, "d:n:b", 
 		&sinterval, &siterations);
 	if (option_mask & 0x1) interval = atoi(sinterval); // -d
 	if (option_mask & 0x2) iterations = atoi(siterations); // -n
-- 
cgit v1.1