Merge commit 'linux-user/linux-user-for-upstream' into tmp-staging

This commit is contained in:
Anthony Liguori 2009-07-09 15:09:27 -05:00
commit 2152390dca
4 changed files with 116 additions and 92 deletions

View file

@ -2432,6 +2432,7 @@ int main(int argc, char **argv, char **envp)
envlist_t *envlist = NULL;
const char *argv0 = NULL;
int i;
int ret;
if (argc <= 1)
usage();
@ -2636,9 +2637,10 @@ int main(int argc, char **argv, char **envp)
env->opaque = ts;
task_settid(ts);
if (loader_exec(filename, target_argv, target_environ, regs,
info, &bprm) != 0) {
printf("Error loading %s\n", filename);
ret = loader_exec(filename, target_argv, target_environ, regs,
info, &bprm);
if (ret != 0) {
printf("Error %d while loading %s\n", ret, filename);
_exit(1);
}