- Turned the exit codes into enum types, making it more generic.

This commit is contained in:
ccremers 2004-08-24 13:09:39 +00:00
parent 7d0be35658
commit 6c38253559

View File

@ -37,6 +37,9 @@
* be done for any style using the GNU indent program. * be done for any style using the GNU indent program.
*/ */
enum exittypes
{ EXIT_NOATTACK = 0, EXIT_ERROR = 1, EXIT_NOCLAIM = 2, EXIT_ATTACK = 3 };
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
@ -200,14 +203,14 @@ main (int argc, char **argv)
end end
}; };
int nerrors; int nerrors;
int exitcode = 0; int exitcode = EXIT_NOATTACK;
/* verify the argtable[] entries were allocated sucessfully */ /* verify the argtable[] entries were allocated sucessfully */
if (arg_nullcheck (argtable) != 0) if (arg_nullcheck (argtable) != 0)
{ {
/* NULL entries were detected, some allocations must have failed */ /* NULL entries were detected, some allocations must have failed */
fprintf (stderr, "%s: insufficient memory\n", progname); fprintf (stderr, "%s: insufficient memory\n", progname);
exitcode = 1; exitcode = EXIT_ERROR;
goto exit; goto exit;
} }
@ -262,7 +265,7 @@ main (int argc, char **argv)
/* Display the error details contained in the arg_end struct. */ /* Display the error details contained in the arg_end struct. */
arg_print_errors (stdout, end, progname); arg_print_errors (stdout, end, progname);
printf ("Try '%s --help' for more information.\n", progname); printf ("Try '%s --help' for more information.\n", progname);
exitcode = 1; exitcode = EXIT_ERROR;
goto exit; goto exit;
} }
@ -610,7 +613,7 @@ main (int argc, char **argv)
attackDisplay (sys); attackDisplay (sys);
} }
/* mark exit code */ /* mark exit code */
exitcode = 3; exitcode = EXIT_ATTACK;
} }
else else
{ {
@ -623,7 +626,7 @@ main (int argc, char **argv)
if (cl_scan->failed == STATES0) if (cl_scan->failed == STATES0)
{ {
/* mark exit code */ /* mark exit code */
exitcode = 2; exitcode = EXIT_NOCLAIM;
} }
cl_scan = cl_scan->next; cl_scan = cl_scan->next;
} }
@ -636,7 +639,7 @@ main (int argc, char **argv)
/* Transfer any scenario counting to the exit code, /* Transfer any scenario counting to the exit code,
* assuming that there is no error. */ * assuming that there is no error. */
if (exitcode != 1 && sys->switchScenario < 0) if (exitcode != EXIT_ERROR && sys->switchScenario < 0)
{ {
exitcode = sys->countScenario; exitcode = sys->countScenario;
} }