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.

---
 editors/awk.c   |  4 ++--
 editors/patch.c |  2 +-
 editors/sed.c   | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'editors')

diff --git a/editors/awk.c b/editors/awk.c
index b46f25c..c1b56d9 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2634,7 +2634,7 @@ static rstream *next_input_file(void)
 
 int awk_main(int argc, char **argv)
 {
-	unsigned long opt;
+	unsigned opt;
 	char *opt_F, *opt_v, *opt_W;
 	char *s, *s1;
 	int i, j, c, flen;
@@ -2691,7 +2691,7 @@ keep_going:
 		free(s);
 	}
 
-	opt = bb_getopt_ulflags(argc, argv, "F:v:f:W:", &opt_F, &opt_v, &programname, &opt_W);
+	opt = getopt32(argc, argv, "F:v:f:W:", &opt_F, &opt_v, &programname, &opt_W);
 	if (opt & 0x1) setvar_s(V[FS], opt_F); // -F
 	if (opt & 0x2) if (!is_assignment(opt_v)) bb_show_usage(); // -v
 	if (opt & 0x4) { // -f
diff --git a/editors/patch.c b/editors/patch.c
index a710d82..c18659e 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -85,7 +85,7 @@ int patch_main(int argc, char **argv)
 
 	{
 		char *p, *i;
-		ret = bb_getopt_ulflags(argc, argv, "p:i:", &p, &i);
+		ret = getopt32(argc, argv, "p:i:", &p, &i);
 		if (ret & 1)
 			patch_level = bb_xgetlarg(p, 10, -1, USHRT_MAX);
 		if (ret & 2) {
diff --git a/editors/sed.c b/editors/sed.c
index 2016652..7dba8b4 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1109,7 +1109,7 @@ static void add_files_link(llist_t *opt_f)
 
 int sed_main(int argc, char **argv)
 {
-	unsigned long opt;
+	unsigned opt;
 	llist_t *opt_e, *opt_f;
 	int status = EXIT_SUCCESS;
 
@@ -1126,8 +1126,8 @@ int sed_main(int argc, char **argv)
 
 	/* do normal option parsing */
 	opt_e = opt_f = NULL;
-	bb_opt_complementally = "e::f::"; /* can occur multiple times */
-	opt = bb_getopt_ulflags(argc, argv, "irne:f:", &opt_e, &opt_f);
+	opt_complementary = "e::f::"; /* can occur multiple times */
+	opt = getopt32(argc, argv, "irne:f:", &opt_e, &opt_f);
 	if (opt & 0x1) { // -i
 		bbg.in_place++;
 		atexit(cleanup_outname);
@@ -1135,11 +1135,11 @@ int sed_main(int argc, char **argv)
 	if (opt & 0x2) bbg.regex_type|=REG_EXTENDED; // -r
 	if (opt & 0x4) bbg.be_quiet++; // -n
 	if (opt & 0x8) { // -e
-		/* getopt_ulflags reverses order of arguments, handle it */
+		/* getopt32 reverses order of arguments, handle it */
 		add_cmds_link(opt_e);
 	}
 	if (opt & 0x10) { // -f
-		/* getopt_ulflags reverses order of arguments, handle it */
+		/* getopt32 reverses order of arguments, handle it */
 		add_files_link(opt_f);
 	}
 	/* if we didn't get a pattern from -e or -f, use argv[optind] */
-- 
cgit v1.1