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

Cleanup patch from Shaun Jackman converting %m to perror.

Browse Source
This commit is contained in:
Rob Landley 2006-06-20 21:35:26 +00:00
parent 9fe801e0d2
commit 5483de1cb7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/hush.c
View File

@ -665,7 +665,7 @@ static int builtin_read(struct child_prog *child)
} else
res = -1;
if (res)
fprintf(stderr, "read: %m\n");
bb_perror_msg("read");
free(var); /* So not move up to avoid breaking errno */
return res;
} else {

8
shell/lash.c
View File

@ -228,7 +228,7 @@ static int builtin_cd(struct child_prog *child)
else
newdir = child->argv[1];
if (chdir(newdir)) {
printf("cd: %s: %m\n", newdir);
bb_perror_msg("cd: %s", newdir);
return EXIT_FAILURE;
}
cwd = xgetcwd((char *)cwd);
@ -378,7 +378,7 @@ static int builtin_export(struct child_prog *child)
}
res = putenv(v);
if (res)
fprintf(stderr, "export: %m\n");
bb_perror_msg("export");
#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
if (strncmp(v, "PS1=", 4)==0)
PS1 = getenv("PS1");
@ -420,7 +420,7 @@ static int builtin_read(struct child_prog *child)
if((s = strdup(string)))
res = putenv(s);
if (res)
fprintf(stderr, "read: %m\n");
bb_perror_msg("read");
}
else
fgets(string, sizeof(string), stdin);
@ -1231,7 +1231,7 @@ static int pseudo_exec(struct child_prog *child)
/* Do not use bb_perror_msg_and_die() here, since we must not
* call exit() but should call _exit() instead */
fprintf(stderr, "%s: %m\n", child->argv[0]);
bb_perror_msg("%s", child->argv[0]);
_exit(EXIT_FAILURE);
}