emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ubi_tools: a bit smaller applet resolution code

Browse Source 
function                                             old     new   delta
ubi_tools_main                                      1241    1235      -6

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-07 02:55:33 +02:00
parent 4dea1edd08
commit 115e0a7199
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NOFORK_NOEXEC.lst
View File

@ -55,7 +55,6 @@ blockdev - noexec. leaks fd
bootchartd - daemon bootchartd - daemon
brctl - noexec brctl - noexec
bunzip2 - runner bunzip2 - runner
busybox
bzcat - runner bzcat - runner
bzip2 - runner bzip2 - runner
cal - runner: cal -n9999 cal - runner: cal -n9999

21
miscutils/ubi_tools.c
View File

@ -67,12 +67,21 @@
#endif #endif
#include <mtd/ubi-user.h> #include <mtd/ubi-user.h>
#define do_attach (ENABLE_UBIATTACH && applet_name[3] == 'a') #define UBI_APPLET_CNT (0 \
#define do_detach (ENABLE_UBIDETACH && applet_name[3] == 'd') + ENABLE_UBIATTACH \
#define do_mkvol (ENABLE_UBIMKVOL && applet_name[3] == 'm') + ENABLE_UBIDETACH \
#define do_rmvol (ENABLE_UBIRMVOL && applet_name[4] == 'm') + ENABLE_UBIMKVOL \
#define do_rsvol (ENABLE_UBIRSVOL && applet_name[4] == 's') + ENABLE_UBIRMVOL \
#define do_update (ENABLE_UBIUPDATEVOL && applet_name[3] == 'u') + ENABLE_UBIRSVOL \
+ ENABLE_UBIUPDATEVOL \
)
#define do_attach (ENABLE_UBIATTACH && (UBI_APPLET_CNT == 1 || applet_name[4] == 't'))
#define do_detach (ENABLE_UBIDETACH && (UBI_APPLET_CNT == 1 || applet_name[4] == 'e'))
#define do_mkvol (ENABLE_UBIMKVOL && (UBI_APPLET_CNT == 1 || applet_name[4] == 'k'))
#define do_rmvol (ENABLE_UBIRMVOL && (UBI_APPLET_CNT == 1 || applet_name[4] == 'm'))
#define do_rsvol (ENABLE_UBIRSVOL && (UBI_APPLET_CNT == 1 || applet_name[4] == 's'))
#define do_update (ENABLE_UBIUPDATEVOL && (UBI_APPLET_CNT == 1 || applet_name[4] == 'p'))
static unsigned get_num_from_file(const char *path, unsigned max, const char *errmsg) static unsigned get_num_from_file(const char *path, unsigned max, const char *errmsg)
{ {