mask blank as arg

src/lib.rs

@@ -12,9 +12,22 @@ const VERSION: &str = "2.0.0";
 
 extern "C" {
     fn nmseffect_set_clearscr(_: c_int) -> c_void;
-    fn nmseffect_exec(input: *const c_char, len: c_int, autodecrypt_c: c_int) -> c_char;
+    fn nmseffect_exec(
+        input: *const c_char,
+        len: c_int,
+        autodecrypt_c: c_int,
+        maskblank_c: c_int,
+    ) -> c_char;
     static mut foregroundColor: c_int;
-    static mut maskBlank: c_int;
+}
+
+///Sleep for the number of milliseconds indicated by argument
+#[no_mangle]
+pub extern "C" fn nmseffect_sleep(t: c_int) {
+    use std::time::Duration;
+
+    let dur = Duration::from_millis(t as u64);
+    std::thread::sleep(dur);
 }
 
 /// Return a random character from charTable[].
@@ -52,13 +65,7 @@ pub extern "C" fn rust_main() {
             foregroundColor = n;
         }
     }
-    unsafe {
+    let maskblank_c = if args.mask_blanks { 1 } else { 0 };
-        if args.mask_blanks {
-            maskBlank = 1;
-        } else {
-            maskBlank = 0;
-        }
-    }
 
     if args.clear_screen {
         unsafe {
@@ -76,7 +83,7 @@ pub extern "C" fn rust_main() {
     let output_cstring = CString::new(output).unwrap();
     let ptr = output_cstring.as_ptr();
     let len = output_cstring.as_bytes().len();
-    let _r = unsafe { nmseffect_exec(ptr, len as i32, autodecrypt_c) };
+    let _r = unsafe { nmseffect_exec(ptr, len as i32, autodecrypt_c, maskblank_c) };
 }
 
 fn get_input(prompt: &str) -> String {

src/nmseffect.c

@@ -32,7 +32,6 @@
 #define REVEAL_LOOP_SPEED    50    // miliseconds between each reveal loop
 
 // Behavior settings
-int maskBlank        = 0;            // Mask blank spaces
 const int colorOn          = 1;            // Terminal color flag - nothing actually sets this to be false ever
 
 // Character attribute structure, linked list. Keeps track of every
@@ -47,14 +46,14 @@ struct charAttr {
 };
 
 // Static function prototypes
-static void nmseffect_sleep(int);
+extern void nmseffect_sleep(int);
 
 /*
  * This function applies the data decryption effect to the character
  * string that is provided as an argument. It returns the last character
  * pressed by the user.
  */
-char nmseffect_exec(unsigned char *string, int string_len, int autoDecrypt) {
+char nmseffect_exec(unsigned char *string, int string_len, int autoDecrypt, int maskBlank) {
 	struct charAttr *list_pointer = NULL;
 	struct charAttr *list_head    = NULL;
 	struct charAttr *list_temp    = NULL;
@@ -298,15 +297,3 @@ char nmseffect_exec(unsigned char *string, int string_len, int autoDecrypt) {
 void nmseffect_set_clearscr(int setting) {
 	nmstermio_set_clearscr(setting);
 }
-
-/*
- * Sleep for the number of milliseconds indicated by argument 't'.
- */
-static void nmseffect_sleep(int t) {
-	struct timespec ts;
-	
-	ts.tv_sec = t / 1000;
-	ts.tv_nsec = (t % 1000) * 1000000;
-	
-	nanosleep(&ts, NULL);
-}

src/nmseffect.h

@@ -9,7 +9,7 @@
 #define NMSEFFECT_H 1
 
 // Function prototypes
-char nmseffect_exec(unsigned char *, int string_len, int autoDecrypt);
+char nmseffect_exec(unsigned char *, int string_len, int autoDecrypt, int maskblank);
 void nmseffect_set_returnopts(char *);
 void nmseffect_set_clearscr(int);
 void nmseffect_use_color(int);