GothenburgBitFactory/taskshell
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskshell.git synced 2025-06-26 10:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tasksh

Browse source 
- Added mechanism to allow a clean exit ('quit', 'exit', Ctrl-D) to exit with
  status 0.
This commit is contained in:
Paul Beckingham 2014-06-25 17:29:02 -04:00
parent ec652880e3
commit 62849238bc
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main.cpp
View file

@ -61,7 +61,7 @@ static int commandLoop ()
if (! line_read)
{
std::cout << "\n";
return 1;
return -1;
}
// Save history.
@ -77,14 +77,14 @@ static int commandLoop ()
if (std::cin.eof () == 1)
{
std::cout << "\n";
return 4;
return -1;
}
#endif
// Dispatch command
int status = 0;
if (closeEnough ("exit", command, 3)) status = 1;
else if (closeEnough ("quit", command, 3)) status = 1;
if (closeEnough ("exit", command, 3)) status = -1;
else if (closeEnough ("quit", command, 3)) status = -1;
else if (closeEnough ("help", command, 3)) status = cmdHelp ();
else if (closeEnough ("diagnostics", command, 3)) status = cmdDiagnostics ();
else if (command != "")
@ -131,7 +131,9 @@ int main (int argc, const char** argv)
}
}
return status;
// Returning -1 drops out of the command loop, but gets translated to 0 here,
// so that there is a clean way to exit.
return status == -1 ? 0 : status;
}
////////////////////////////////////////////////////////////////////////////////