valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-08 02:18:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1847 from theopolis/end_shell

Browse Source 
Exit shell with CTRL+C
This commit is contained in:
Teddy Reed 2016-02-11 22:29:04 -08:00
commit 1bd518ec09
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osquery/devtools/shell.cpp
View File

@ -663,8 +663,10 @@ static void output_csv(struct callback_data *p, const char *z, int bSep) {
/* /*
** This routine runs when the user presses Ctrl-C ** This routine runs when the user presses Ctrl-C
*/ */
static void interrupt_handler(int NotUsed) { static void interrupt_handler(int signal) {
UNUSED_PARAMETER(NotUsed); if (signal == SIGINT) {
osquery::shutdown(130);
}
seenInterrupt = 1; seenInterrupt = 1;
} }
#endif #endif
@ -1145,16 +1147,16 @@ static sqlite3_int64 integerValue(const char *zArg) {
char *zSuffix; char *zSuffix;
int iMult; int iMult;
} aMult[] = { } aMult[] = {
{(char *)"KiB", 1024}, {(char *)"KiB", 1024},
{(char *)"MiB", 1024 * 1024}, {(char *)"MiB", 1024 * 1024},
{(char *)"GiB", 1024 * 1024 * 1024}, {(char *)"GiB", 1024 * 1024 * 1024},
{(char *)"KB", 1000}, {(char *)"KB", 1000},
{(char *)"MB", 1000000}, {(char *)"MB", 1000000},
{(char *)"GB", 1000000000}, {(char *)"GB", 1000000000},
{(char *)"K", 1000}, {(char *)"K", 1000},
{(char *)"M", 1000000}, {(char *)"M", 1000000},
{(char *)"G", 1000000000}, {(char *)"G", 1000000000},
}; };
int i; int i;
int isNeg = 0; int isNeg = 0;
if (zArg[0] == '-') { if (zArg[0] == '-') {