mirror of
https://github.com/ksherlock/mpw-shell.git
synced 2024-09-24 13:57:32 +00:00
fix control-c
This commit is contained in:
parent
0dfecbd520
commit
41e1424644
@ -108,7 +108,7 @@ void control_c_handler(int signal, siginfo_t *sinfo, void *context) {
|
|||||||
//fprintf(stderr, "interrupt!\n");
|
//fprintf(stderr, "interrupt!\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
int interactive(phase1 &p, phase2& p2) {
|
int interactive(Environment &env, phase1 &p, phase2& p2) {
|
||||||
|
|
||||||
std::string history_file = root();
|
std::string history_file = root();
|
||||||
history_file += ".history";
|
history_file += ".history";
|
||||||
@ -135,7 +135,7 @@ int interactive(phase1 &p, phase2& p2) {
|
|||||||
fprintf(stdout, "\n");
|
fprintf(stdout, "\n");
|
||||||
p.abort();
|
p.abort();
|
||||||
p2.abort();
|
p2.abort();
|
||||||
e.status(-9, false);
|
env.status(-9, false);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -272,7 +272,7 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isatty(STDIN_FILENO))
|
if (isatty(STDIN_FILENO))
|
||||||
interactive(p1, p2);
|
interactive(e, p1, p2);
|
||||||
else
|
else
|
||||||
read_fd(p1, STDIN_FILENO);
|
read_fd(p1, STDIN_FILENO);
|
||||||
p2.finish();
|
p2.finish();
|
||||||
|
Loading…
Reference in New Issue
Block a user