formatting

SVN revision: 21882
This commit is contained in:
Carsten Haitzler 2006-04-05 23:45:59 +00:00
parent 02ab2a4df1
commit 0dc5cb5412
1 changed files with 13 additions and 13 deletions

View File

@ -1173,28 +1173,28 @@ _ecore_exe_exec_it(const char *exe_cmd, Ecore_Exe_Flags flags)
while (token) while (token)
{ {
if (token[0] == '~') if (token[0] == '~')
break; break;
if (pre_command) if (pre_command)
{ {
if (token[0] == '[') if (token[0] == '[')
break; break;
if (strchr(token, '=')) if (strchr(token, '='))
break; break;
else else
pre_command = 0; pre_command = 0;
} }
num_tokens++; num_tokens++;
token = strtok(NULL, " \t\n\v"); token = strtok(NULL, " \t\n\v");
} }
IF_FREE(buf); IF_FREE(buf);
if (!token && num_tokens) if ((!token) && (num_tokens))
{ {
int i = 0; int i = 0;
char *token; char *token;
if (!(buf = strdup(exe_cmd))) if (!(buf = strdup(exe_cmd)))
return; return;
token = strtok(buf, " \t\n\v"); token = strtok(buf, " \t\n\v");
use_sh = 0; use_sh = 0;
if (!(args = (char **)calloc(num_tokens + 1, sizeof(char *)))) if (!(args = (char **)calloc(num_tokens + 1, sizeof(char *))))
@ -1205,26 +1205,26 @@ _ecore_exe_exec_it(const char *exe_cmd, Ecore_Exe_Flags flags)
for (i = 0; i < num_tokens; i++) for (i = 0; i < num_tokens; i++)
{ {
if (token) if (token)
args[i] = token; args[i] = token;
token = strtok(NULL, " \t\n\v"); token = strtok(NULL, " \t\n\v");
} }
args[num_tokens] = NULL; args[num_tokens] = NULL;
} }
} }
setsid(); setsid();
if ((flags & ECORE_EXE_USE_SH)) if ((flags & ECORE_EXE_USE_SH))
{ {
errno = 0; errno = 0;
execl("/bin/sh", "/bin/sh", "-c", exe_cmd, (char *)NULL); execl("/bin/sh", "/bin/sh", "-c", exe_cmd, (char *)NULL);
} }
else if (use_sh) else if (use_sh)
{ /* We have to use a shell to run this. */ { /* We have to use a shell to run this. */
if (shell == NULL) if (shell == NULL)
{ /* Find users preferred shell. */ { /* Find users preferred shell. */
shell = getenv("SHELL"); shell = getenv("SHELL");
if (shell == 0) if (shell == 0)
shell = "/bin/sh"; shell = "/bin/sh";
} }
errno = 0; errno = 0;
execl(shell, shell, "-c", exe_cmd, (char *)NULL); execl(shell, shell, "-c", exe_cmd, (char *)NULL);