Add more RC_FINAL_ enum types

flaggx1 · Sep 12, 2022 · 8973f2b · 8973f2b
1 parent 7a5ea7e
commit 8973f2b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/docs/status_codes.txt b/docs/status_codes.txt
@@ -17,3 +17,4 @@ status codes on exit:
   2 = aborted
   3 = aborted by checkpoint
   4 = aborted by runtime
+  5 = aborted by finish
diff --git a/include/types.h b/include/types.h
@@ -226,8 +226,13 @@ typedef enum status_rc
 
 typedef enum rc_final
 {
-  RC_FINAL_OK          = 0,
-  RC_FINAL_EXHAUSTED   = 1
+  RC_FINAL_ERROR            = -1,
+  RC_FINAL_OK               = 0,
+  RC_FINAL_EXHAUSTED        = 1,
+  RC_FINAL_ABORT            = 2,
+  RC_FINAL_ABORT_CHECKPOINT = 3,
+  RC_FINAL_ABORT_RUNTIME    = 4,
+  RC_FINAL_ABORT_FINISH     = 5,
 
 } rc_final_t;
 

diff --git a/src/hashcat.c b/src/hashcat.c
@@ -1807,14 +1807,14 @@ int hashcat_session_execute (hashcat_ctx_t *hashcat_ctx)
 
   if (rc_final == 0)
   {
-    if (status_ctx->devices_status == STATUS_ABORTED_FINISH)      rc_final =  5;
-    if (status_ctx->devices_status == STATUS_ABORTED_RUNTIME)     rc_final =  4;
-    if (status_ctx->devices_status == STATUS_ABORTED_CHECKPOINT)  rc_final =  3;
-    if (status_ctx->devices_status == STATUS_ABORTED)             rc_final =  2;
-    if (status_ctx->devices_status == STATUS_QUIT)                rc_final =  2;
+    if (status_ctx->devices_status == STATUS_ABORTED_FINISH)      rc_final = RC_FINAL_ABORT_FINISH;
+    if (status_ctx->devices_status == STATUS_ABORTED_RUNTIME)     rc_final = RC_FINAL_ABORT_RUNTIME;
+    if (status_ctx->devices_status == STATUS_ABORTED_CHECKPOINT)  rc_final = RC_FINAL_ABORT_CHECKPOINT;
+    if (status_ctx->devices_status == STATUS_ABORTED)             rc_final = RC_FINAL_ABORT;
+    if (status_ctx->devices_status == STATUS_QUIT)                rc_final = RC_FINAL_ABORT;
     if (status_ctx->devices_status == STATUS_EXHAUSTED)           rc_final = RC_FINAL_EXHAUSTED;
     if (status_ctx->devices_status == STATUS_CRACKED)             rc_final = RC_FINAL_OK;
-    if (status_ctx->devices_status == STATUS_ERROR)               rc_final = -1;
+    if (status_ctx->devices_status == STATUS_ERROR)               rc_final = RC_FINAL_ERROR;
   }
   else if (rc_final == -1)
   {