PWN-Hunter/android_external_toybox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

id.c #ifdefectomy. (ifdefs belong in headers, not in C code.)

Browse Source
This commit is contained in:
Rob Landley 2015-01-16 13:43:09 -06:00
parent 7e2af1c748
commit 3b915991f8
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/portability.h
View File

@ -239,4 +239,7 @@ pid_t xfork(void);
#if CFG_TOYBOX_SELINUX
#include <selinux/selinux.h>
#else
#define is_selinux_enabled() 0
int getcon(void* con);
#endif

21
toys/posix/id.c
View File

@ -146,17 +146,18 @@ void do_id(char *username)
}
}
#if CFG_TOYBOX_SELINUX
char *context = NULL;
if (is_selinux_enabled() < 1) {
if (TT.do_Z)
error_exit("SELinux disabled");
} else if (getcon(&context) == 0) {
if (!TT.do_Z) xputc(' ');
printf("context=%s", context);
if (CFG_TOYBOX_SELINUX) {
char *context = NULL;
if (is_selinux_enabled() < 1) {
if (TT.do_Z)
error_exit("SELinux disabled");
} else if (getcon(&context) == 0) {
if (!TT.do_Z) xputc(' ');
printf("context=%s", context);
}
if (CFG_TOYBOX_FREE) free(context);
}
if (CFG_TOYBOX_FREE) free(context);
#endif
xputc('\n');
}