Do not overwrite quit status when user forced it with keypress

[hashcat.git] / src / shared.c

diff --git a/src/shared.c b/src/shared.c
index 12d7706..4aedad7 100644 (file)
--- a/src/shared.c
+++ b/src/shared.c
@@ -9206,39 +9206,60 @@ void stop_at_checkpoint ()
 
 void myabort ()
 {
-  if (data.devices_status == STATUS_INIT)     return;
-  if (data.devices_status == STATUS_STARTING) return;
+  //if (data.devices_status == STATUS_INIT)     return;
+  //if (data.devices_status == STATUS_STARTING) return;
 
   data.devices_status = STATUS_ABORTED;
 }
 
 void myquit ()
 {
-  if (data.devices_status == STATUS_INIT)     return;
-  if (data.devices_status == STATUS_STARTING) return;
+  //if (data.devices_status == STATUS_INIT)     return;
+  //if (data.devices_status == STATUS_STARTING) return;
 
   data.devices_status = STATUS_QUIT;
 }
 
-void naive_escape (const char *cpath_real, char *cpath_escaped, const size_t cpath_escaped_len)
+void naive_replace (char *s, const u8 key_char, const u8 replace_char)
 {
-  const size_t len = strlen (cpath_real);
+  const size_t len = strlen (s);
+
+  for (size_t in = 0; in < len; in++)
+  {
+    const u8 c = s[in];
+
+    if (c == key_char)
+    {
+      s[in] = replace_char;
+    }
+  }
+}
+
+void naive_escape (char *s, size_t s_max, const u8 key_char, const u8 escape_char)
+{
+  char s_escaped[1024] = { 0 };
+
+  size_t s_escaped_max = sizeof (s_escaped);
+
+  const size_t len = strlen (s);
 
   for (size_t in = 0, out = 0; in < len; in++, out++)
   {
-    const u8 c = cpath_real[in];
+    const u8 c = s[in];
 
-    if (c == ' ')
+    if (c == key_char)
     {
-      cpath_escaped[out] = '\\';
+      s_escaped[out] = escape_char;
 
       out++;
     }
 
-    if (out == cpath_escaped_len) break;
+    if (out == s_escaped_max - 2) break;
 
-    cpath_escaped[out] = c;
+    s_escaped[out] = c;
   }
+
+  strncpy (s, s_escaped, s_max - 1);
 }
 
 void load_kernel (const char *kernel_file, int num_devices, size_t *kernel_lengths, const u8 **kernel_sources)
@@ -20748,8 +20769,6 @@ void status_display ();
 
 void *thread_keypress (void *p)
 {
-  int benchmark = *((int *) p);
-
   uint quiet = data.quiet;
 
   tty_break();
@@ -20831,8 +20850,6 @@ void *thread_keypress (void *p)
 
         log_info ("");
 
-        if (benchmark == 1) break;
-
         stop_at_checkpoint ();
 
         log_info ("");
@@ -20846,14 +20863,7 @@ void *thread_keypress (void *p)
 
         log_info ("");
 
-        if (benchmark == 1)
-        {
-          myquit ();
-        }
-        else
-        {
-          myabort ();
-        }
+        myabort ();
 
         break;
     }