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.

3 files changed, 5 insertions, 5 deletions

diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 677c9e607..e629bec5d 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -45,10 +45,10 @@ int klogd_main(int argc, char **argv)
 
 
         {
-                unsigned long opt;
+                unsigned opt;
 
                 /* do normal option parsing */
-                opt = bb_getopt_ulflags(argc, argv, "c:n", &start);
+                opt = getopt32(argc, argv, "c:n", &start);
 
                 if (opt & OPT_LEVEL) {
                         /* Valid levels are between 1 and 8 */
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index a78cf77b9..15a4bfb82 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -89,7 +89,7 @@ static int pencode(char *s)
 
 int logger_main(int argc, char **argv)
 {
-        unsigned long opt;
+        unsigned opt;
         char *opt_p, *opt_t;
         int pri = LOG_USER | LOG_NOTICE;
         int option = 0;
@@ -100,7 +100,7 @@ int logger_main(int argc, char **argv)
         bb_getpwuid(name, geteuid(), sizeof(name));
 
         /* Parse any options */
-        opt = bb_getopt_ulflags(argc, argv, "p:st:", &opt_p, &opt_t);
+        opt = getopt32(argc, argv, "p:st:", &opt_p, &opt_t);
         if (opt & 0x1) pri = pencode(opt_p); // -p
         if (opt & 0x2) option |= LOG_PERROR; // -s
         if (opt & 0x4) safe_strncpy(name, opt_t, sizeof(name)); // -t
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 888082924..40b98c1cb 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -575,7 +575,7 @@ int syslogd_main(int argc, char **argv)
         char *p;
 
         /* do normal option parsing */
-        option_mask = bb_getopt_ulflags(argc, argv, OPTION_STR, OPTION_PARAM);
+        option_mask = getopt32(argc, argv, OPTION_STR, OPTION_PARAM);
         if (option_mask & OPT_mark) MarkInterval = atoi(opt_m) * 60; // -m
         //if (option_mask & OPT_nofork) // -n
         //if (option_mask & OPT_outfile) // -O