aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-10 14:16:19 +0000
committeraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-10 14:16:19 +0000
commitb2ea681ba78e9de8abaabfd51e876aaf4c5198a9 (patch)
treee62f88322f87006480624f0cf8f68ee6687e4d85
parent5e4f447825c090406a3f51e748bac308bea96591 (diff)
downloadbusybox-w32-b2ea681ba78e9de8abaabfd51e876aaf4c5198a9.tar.gz
busybox-w32-b2ea681ba78e9de8abaabfd51e876aaf4c5198a9.tar.bz2
busybox-w32-b2ea681ba78e9de8abaabfd51e876aaf4c5198a9.zip
- very minor shrinkage (-3b)
git-svn-id: svn://busybox.net/trunk/busybox@18380 69ca8d6d-28ef-0310-b511-8ec308f3f277
-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 9218b40e4..66f2b821d 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -52,7 +52,7 @@ const unsigned short NUM_APPLETS = sizeof(applets) / sizeof(struct BB_applet) -
52const struct BB_applet *current_applet; 52const struct BB_applet *current_applet;
53const char *applet_name ATTRIBUTE_EXTERNALLY_VISIBLE; 53const char *applet_name ATTRIBUTE_EXTERNALLY_VISIBLE;
54#ifdef BB_NOMMU 54#ifdef BB_NOMMU
55smallint re_execed; 55bool re_execed;
56#endif 56#endif
57 57
58 58
@@ -68,7 +68,7 @@ static struct BB_suid_config {
68 struct BB_suid_config *m_next; 68 struct BB_suid_config *m_next;
69} *suid_config; 69} *suid_config;
70 70
71static smallint suid_cfg_readable; 71static bool suid_cfg_readable;
72 72
73/* check if u is member of group g */ 73/* check if u is member of group g */
74static int ingroup(uid_t u, gid_t g) 74static int ingroup(uid_t u, gid_t g)
@@ -135,7 +135,9 @@ static void parse_config_file(void)
135 const char *errmsg; 135 const char *errmsg;
136 char *s; 136 char *s;
137 char *e; 137 char *e;
138 int i, lc, section; 138 int i;
139 unsigned lc;
140 smallint section;
139 char buffer[256]; 141 char buffer[256];
140 struct stat st; 142 struct stat st;
141 143
@@ -371,7 +373,7 @@ static void check_suid(const struct BB_applet *applet)
371 } 373 }
372#if !ENABLE_FEATURE_SUID_CONFIG_QUIET 374#if !ENABLE_FEATURE_SUID_CONFIG_QUIET
373 { 375 {
374 static smallint onetime = 0; 376 static bool onetime = 0;
375 377
376 if (!onetime) { 378 if (!onetime) {
377 onetime = 1; 379 onetime = 1;
diff --git a/include/libbb.h b/include/libbb.h
index 2cb914eda..3919524bc 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -570,7 +570,7 @@ enum {
570# define bb_daemonize(flags) bb_daemonize_or_rexec(flags, bogus) 570# define bb_daemonize(flags) bb_daemonize_or_rexec(flags, bogus)
571#else 571#else
572 void forkexit_or_rexec(char **argv); 572 void forkexit_or_rexec(char **argv);
573 extern smallint re_execed; 573 extern bool re_execed;
574# define fork() BUG_fork_is_unavailable_on_nommu() 574# define fork() BUG_fork_is_unavailable_on_nommu()
575# define daemon(a,b) BUG_daemon_is_unavailable_on_nommu() 575# define daemon(a,b) BUG_daemon_is_unavailable_on_nommu()
576# define bb_daemonize(a) BUG_bb_daemonize_is_unavailable_on_nommu() 576# define bb_daemonize(a) BUG_bb_daemonize_is_unavailable_on_nommu()