Support user break; tidy up exit

Author: chris-y

tzx2tap.c

@@ -5,6 +5,7 @@
 //
 
 #include <errno.h>
+#include <input.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,11 +26,22 @@
 
 static unsigned char old_cpu_speed;
 static bool browser = false;
+static unsigned char fhi,fho = 0;
+static char *mem = NULL;
 
 static uint32_t Get2(char *mem) { return(mem[0]+(mem[1]*256UL)); }
 static uint32_t Get3(char *mem) { return(mem[0]+(mem[1]*256UL)+(mem[2]*256UL*256UL)); }
 static uint32_t Get4(char *mem) { return(mem[0]+(mem[1]*256UL)+(mem[2]*256UL*256UL)+(mem[3]*256UL*256UL*256UL)); }
 
+static unsigned char err_break[] = "D BREAK - no repea" "\xf4";
+
+static void user_break(void)
+{
+   if (in_key_pressed(IN_KEY_SCANCODE_SPACE | 0x8000))  // CAPS+SPACE
+      exit((int)err_break);
+}
+
+
 // exits with an error message *errstr
 static int Err(char *errstr, bool browser)
 {
@@ -110,11 +122,17 @@ static int convert_data(unsigned char fhi, unsigned char fho, uint32_t posn, uin
   return 0;
 }
 
+static void cleanup(void)
+{
+    if(fhi) esx_f_close(fhi);
+    if(fho) esx_f_close(fho);
+    if(mem) free(mem);
+    ZXN_NEXTREGA(REG_TURBO_MODE, old_cpu_speed);
+}
+
 int main(int argc, char *argv[])
 {
-  unsigned char fhi,fho = 0;
   uint32_t flen;
-  char *mem = NULL;
   char buf[256];
   uint32_t pos = 10, p, oldpos = 0;
   uint32_t len;
@@ -191,12 +209,13 @@ int main(int argc, char *argv[])
   old_cpu_speed = ZXN_READ_REG(REG_TURBO_MODE);
   ZXN_NEXTREG(REG_TURBO_MODE, RTM_28MHZ);
 
+  atexit(cleanup);
+
   errno = 0;
   fhi = esx_f_open(src, ESX_MODE_READ);
 
   if(errno) {
-    err = errno;
-    goto end;
+    exit(errno);
   }
 
   if(!list) {
@@ -207,40 +226,37 @@ int main(int argc, char *argv[])
       if(errno == ESX_EEXIST) {
         if(!browser) printf("\nFile already converted?");
         err = Err("File exists", browser); //ERRB_4_OUT_OF_MEMORY
-        goto end;
+        exit(ERRB_4_OUT_OF_MEMORY);
       } else {
-        err = errno;
-        goto end;
+        exit(errno);
       }
     }
   }
 
   flen=FileLength(fhi);
   if(flen==0) {
-    err=errno;
-    goto end;
+    exit(errno);
   }
 
   mem=(char *) malloc(MAX_HEADER_SIZE);
 
   if(mem==NULL) {
     err = Err("Out of memory", browser); //ERRB_4_OUT_OF_MEMORY
-    goto end;
+    exit(ERRB_4_OUT_OF_MEMORY);
   }
 
   esx_f_read(fhi,mem,10); mem[7]=0;
 
   if(strcmp(mem,"ZXTape!")) { 
-    err = ESX_EWRTYPE;
-    goto end;
+    exit(ESX_EWRTYPE);
+    
   }
 
   if(!browser) printf("\nZXTape file revision %d.%02d\n",mem[8],mem[9]);
 
   if(!mem[8]) {
     if(!browser) printf("Error: TZX dev ver not supported\n");
-    err = ESX_EWRTYPE;
-    goto end;
+    exit(ESX_EWRTYPE);
   }
 
   if(mem[8]>MAJREV) 
@@ -258,6 +274,7 @@ int main(int argc, char *argv[])
   }
 
   while(pos<flen) {
+    user_break();
     start = read_file(fhi, mem, pos);
     pos++;
     p = pos - start;
@@ -279,13 +296,11 @@ int main(int argc, char *argv[])
                  if(!list) {
                    err = convert_data(fhi, fho, pos+0x02, 2);
                    if(err) {
-                     err=0;
-                     goto end;
+                     exit(0);
                    }
                    err = convert_data(fhi, fho, pos+0x04, len);
                    if(err) {
-                     err=0;
-                     goto end;
+                     exit(0);
                    }
                  }
                  if(verbose) {
@@ -304,13 +319,11 @@ int main(int argc, char *argv[])
                    if(!list) {
                      err = convert_data(fhi, fho, pos+0x0F, 2);
                      if(err) {
-                       err=0;
-                       goto end;
+                       exit(0);
                      }
                      err = convert_data(fhi, fho, pos+0x12, len);
                      if(err) {
-                       err=0;
-                       goto end;
+                       exit(0);
                      }
                    }
                    if(verbose) converted = 2;
@@ -337,13 +350,11 @@ int main(int argc, char *argv[])
                    if(!list) {
                      err = convert_data(fhi, fho, pos+0x07, 2);
                      if(err) {
-                       err=0;
-                       goto end;
+                       exit(0);
                      }
                      err = convert_data(fhi, fho, pos+0x0A, len);
                      if(err) {
-                       err=0;
-                       goto end;
+                       exit(0);
                      }
                    }
                    if(verbose) converted = 2;
@@ -501,10 +512,5 @@ int main(int argc, char *argv[])
     }
   }
 
-  end:
-    if(fhi) esx_f_close(fhi);
-    if(fho) esx_f_close(fho);
-    if(mem) free(mem);
-    ZXN_NEXTREGA(REG_TURBO_MODE, old_cpu_speed);
-    return err;
+  exit(0);
 }