summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--applets/applets.c10
-rw-r--r--include/libbb.h2
2 files changed, 7 insertions, 5 deletions
diff --git a/applets/applets.c b/applets/applets.c
index 9218b40..66f2b82 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -52,7 +52,7 @@ const unsigned short NUM_APPLETS = sizeof(applets) / sizeof(struct BB_applet) -
const struct BB_applet *current_applet;
const char *applet_name ATTRIBUTE_EXTERNALLY_VISIBLE;
#ifdef BB_NOMMU
-smallint re_execed;
+bool re_execed;
#endif
@@ -68,7 +68,7 @@ static struct BB_suid_config {
struct BB_suid_config *m_next;
} *suid_config;
-static smallint suid_cfg_readable;
+static bool suid_cfg_readable;
/* check if u is member of group g */
static int ingroup(uid_t u, gid_t g)
@@ -135,7 +135,9 @@ static void parse_config_file(void)
const char *errmsg;
char *s;
char *e;
- int i, lc, section;
+ int i;
+ unsigned lc;
+ smallint section;
char buffer[256];
struct stat st;
@@ -371,7 +373,7 @@ static void check_suid(const struct BB_applet *applet)
}
#if !ENABLE_FEATURE_SUID_CONFIG_QUIET
{
- static smallint onetime = 0;
+ static bool onetime = 0;
if (!onetime) {
onetime = 1;
diff --git a/include/libbb.h b/include/libbb.h
index 2cb914e..3919524 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -570,7 +570,7 @@ enum {
# define bb_daemonize(flags) bb_daemonize_or_rexec(flags, bogus)
#else
void forkexit_or_rexec(char **argv);
- extern smallint re_execed;
+ extern bool re_execed;
# define fork() BUG_fork_is_unavailable_on_nommu()
# define daemon(a,b) BUG_daemon_is_unavailable_on_nommu()
# define bb_daemonize(a) BUG_bb_daemonize_is_unavailable_on_nommu()