summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-07-15 08:18:46 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-07-15 08:18:46 +0200
commit8fa1f5d543266816967949812b65790fbe7cdcd4 (patch)
tree0a721a6d9b53677ec3e0e5c4a8177a428759957d /include
parent889550b36b057fb8ad5c825c7a17e46fde4ebbf6 (diff)
downloadbusybox-w32-8fa1f5d543266816967949812b65790fbe7cdcd4.tar.gz
busybox-w32-8fa1f5d543266816967949812b65790fbe7cdcd4.tar.bz2
busybox-w32-8fa1f5d543266816967949812b65790fbe7cdcd4.zip
hush: fix faloout from previous commit
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r--include/busybox.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/include/busybox.h b/include/busybox.h
index 48ce856ea..48fc0b4c8 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -35,18 +35,21 @@ extern const uint16_t applet_nameofs[];
35extern const uint8_t applet_install_loc[]; 35extern const uint8_t applet_install_loc[];
36 36
37#if ENABLE_FEATURE_SUID || ENABLE_FEATURE_PREFER_APPLETS 37#if ENABLE_FEATURE_SUID || ENABLE_FEATURE_PREFER_APPLETS
38#define APPLET_NAME(i) (applet_names + (applet_nameofs[i] & 0x0fff)) 38# define APPLET_NAME(i) (applet_names + (applet_nameofs[i] & 0x0fff))
39#else 39#else
40#define APPLET_NAME(i) (applet_names + applet_nameofs[i]) 40# define APPLET_NAME(i) (applet_names + applet_nameofs[i])
41#endif 41#endif
42 42
43#if ENABLE_FEATURE_PREFER_APPLETS 43#if ENABLE_FEATURE_PREFER_APPLETS
44#define APPLET_IS_NOFORK(i) (applet_nameofs[i] & (1 << 12)) 44# define APPLET_IS_NOFORK(i) (applet_nameofs[i] & (1 << 12))
45#define APPLET_IS_NOEXEC(i) (applet_nameofs[i] & (1 << 13)) 45# define APPLET_IS_NOEXEC(i) (applet_nameofs[i] & (1 << 13))
46#else
47# define APPLET_IS_NOFORK(i) 0
48# define APPLET_IS_NOEXEC(i) 0
46#endif 49#endif
47 50
48#if ENABLE_FEATURE_SUID 51#if ENABLE_FEATURE_SUID
49#define APPLET_SUID(i) ((applet_nameofs[i] >> 14) & 0x3) 52# define APPLET_SUID(i) ((applet_nameofs[i] >> 14) & 0x3)
50#endif 53#endif
51 54
52#if ENABLE_FEATURE_INSTALLER 55#if ENABLE_FEATURE_INSTALLER