5483de1cb
Rob Landley
2006-06-20
Subject
Cleanup patch from Shaun Jackman converting %m to perror.
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/hush.c+1 -1
| @@ -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 { | |
shell/lash.c+4 -4
| @@ -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); | |
| } | |