projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compile error, the indenting really needs to be fixed here
[oweals/busybox.git]
/
shell
/
ash.c
diff --git
a/shell/ash.c
b/shell/ash.c
index 8adf581b6d6314fccbef0175e7e6db3590a7ddad..fe99b02cb4605c1fd9a237b6ae743bd997012fdf 100644
(file)
--- a/
shell/ash.c
+++ b/
shell/ash.c
@@
-6682,25
+6682,28
@@
sprint_status(char *s, int status, int sigonly)
int st;
col = 0;
int st;
col = 0;
- st = WEXITSTATUS(status);
if (!WIFEXITED(status)) {
if (!WIFEXITED(status)) {
- st = WTERMSIG(status);
#if JOBS
if (WIFSTOPPED(status))
st = WSTOPSIG(status);
#if JOBS
if (WIFSTOPPED(status))
st = WSTOPSIG(status);
+ else
#endif
#endif
+ st = WTERMSIG(status);
if (sigonly) {
if (st == SIGINT || st == SIGPIPE)
goto out;
if (sigonly) {
if (st == SIGINT || st == SIGPIPE)
goto out;
+#if JOBS
if (WIFSTOPPED(status))
goto out;
if (WIFSTOPPED(status))
goto out;
+#endif
}
st &= 0x7f;
}
st &= 0x7f;
- col = fmtstr(s, 32,
u_signal_names(NULL, &st, 0
));
+ col = fmtstr(s, 32,
strsignal(st
));
if (WCOREDUMP(status)) {
col += fmtstr(s + col, 16, " (core dumped)");
}
} else if (!sigonly) {
if (WCOREDUMP(status)) {
col += fmtstr(s + col, 16, " (core dumped)");
}
} else if (!sigonly) {
+ st = WEXITSTATUS(status);
if (st)
col = fmtstr(s, 16, "Done(%d)", st);
else
if (st)
col = fmtstr(s, 16, "Done(%d)", st);
else
@@
-9036,18
+9039,19
@@
getopts(char *optstr, char *optvar, char **optfirst, int *param_optind, int *opt
char c = '?';
int done = 0;
int err = 0;
char c = '?';
int done = 0;
int err = 0;
- char s[10];
- char **optnext = optfirst + *param_optind - 1;
+ char s[12];
+ char **optnext;
+
+ if(*param_optind < 1)
+ return 1;
+ optnext = optfirst + *param_optind - 1;
- if (*param_optind <= 1 || *optoff < 0 || !(*(optnext - 1)) ||
- strlen(*(optnext - 1)) < *optoff)
+ if (*param_optind <= 1 || *optoff < 0 || strlen(optnext[-1]) < *optoff)
p = NULL;
else
p = NULL;
else
- p =
*(optnext - 1)
+ *optoff;
+ p =
optnext[-1]
+ *optoff;
if (p == NULL || *p == '\0') {
/* Current word is done, advance */
if (p == NULL || *p == '\0') {
/* Current word is done, advance */
- if (optnext == NULL)
- return 1;
p = *optnext;
if (p == NULL || *p != '-' || *++p == '\0') {
atend:
p = *optnext;
if (p == NULL || *p != '-' || *++p == '\0') {
atend: