Macintosh-SW/mpw-shell
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw-shell.git synced 2024-06-07 19:29:42 +00:00
Code Issues Projects Releases Wiki Activity

use atomic variable for the control-c flag.

Browse Source
This commit is contained in:
Kelvin Sherlock 2016-02-22 12:03:58 -05:00
parent fafb08b90a
commit 6ff7b50a7d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command.cpp
View File

@ -18,8 +18,9 @@
#include <unistd.h> #include <unistd.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sysexits.h> #include <sysexits.h>
#include <atomic>
extern volatile int control_c; extern std::atomic<int> control_c;
namespace fs = filesystem; namespace fs = filesystem;
extern fs::path mpw_path(); extern fs::path mpw_path();

7
mpw-shell.cpp
View File

@ -29,6 +29,7 @@
#include <pwd.h> #include <pwd.h>
#include <sysexits.h> #include <sysexits.h>
#include <paths.h> #include <paths.h>
#include <atomic>
namespace fs = filesystem; namespace fs = filesystem;
@ -168,13 +169,13 @@ int read_make(phase1 &p1, phase2 &p2, Environment &env, const std::vector<std::s
return env.status(); return env.status();
} }
volatile int control_c = 0; std::atomic<int> control_c{0};
void control_c_handler(int signal, siginfo_t *sinfo, void *context) { void control_c_handler(int signal, siginfo_t *sinfo, void *context) {
// libedit gobbles up the first control-C and doesn't return until the second. // libedit gobbles up the first control-C and doesn't return until the second.
// GNU's readline may return no the first. // GNU's readline may return on the first.
if (control_c > 3) abort(); if (control_c > 3) abort();
control_c++; ++control_c;
//fprintf(stderr, "interrupt!\n"); //fprintf(stderr, "interrupt!\n");
} }