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

run_shell.c: style fix

Browse Source
This commit is contained in:
Denis Vlasenko
2006-09-05 09:45:30 +00:00
parent d25a2645f5
commit 797b4d210d
1 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libbb/run_shell.c
View File

@@ -41,27 +41,21 @@
#endif #endif
#ifdef CONFIG_SELINUX #ifdef CONFIG_SELINUX
static security_context_t current_sid=NULL; static security_context_t current_sid;
void void
renew_current_security_context(void) renew_current_security_context(void)
{ {
if (current_sid) if (current_sid)
freecon(current_sid); /* Release old context */ freecon(current_sid); /* Release old context */
getcon(&current_sid); /* update */ getcon(&current_sid); /* update */
return;
} }
void void
set_current_security_context(security_context_t sid) set_current_security_context(security_context_t sid)
{ {
if (current_sid) if (current_sid)
freecon(current_sid); /* Release old context */ freecon(current_sid); /* Release old context */
current_sid = sid; current_sid = sid;
return;
} }
#endif #endif
@@ -80,7 +74,7 @@ void run_shell ( const char *shell, int loginshell, const char *command, const c
for (args = additional_args; args && *args; args++) for (args = additional_args; args && *args; args++)
additional_args_cnt++; additional_args_cnt++;
args = (const char **) xmalloc (sizeof (char *) * ( 4 + additional_args_cnt )); args = xmalloc(sizeof(char*) * (4 + additional_args_cnt));
args[0] = bb_get_last_path_component(xstrdup(shell)); args[0] = bb_get_last_path_component(xstrdup(shell));
@@ -95,9 +89,9 @@ void run_shell ( const char *shell, int loginshell, const char *command, const c
for (; *additional_args; ++additional_args) for (; *additional_args; ++additional_args)
args[argno++] = *additional_args; args[argno++] = *additional_args;
} }
args [argno] = 0; args[argno] = NULL;
#ifdef CONFIG_SELINUX #ifdef CONFIG_SELINUX
if ( (current_sid) && (!setexeccon(current_sid)) ) { if (current_sid && !setexeccon(current_sid)) {
freecon(current_sid); freecon(current_sid);
execve(shell, (char **) args, environ); execve(shell, (char **) args, environ);
} else } else