Merge pull request #32 from marshmellow42/master

[proxmark3-svn] / client / cmdlfhitag.c

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index ab279dcb32e30b94b75ea88f5708db46b1d317bf..32d38aebef926dff73284e5ea3688dbe9a651462 100644 (file)
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -41,9 +41,6 @@ int CmdLFHitagList(const char *Cmd)
   int i = 0;
   int prev = -1;
 
-  char filename[256];
-  FILE* pf = NULL;
-  
   for (;;) {
     if(i >= 1900) {
       break;
@@ -107,23 +104,19 @@ int CmdLFHitagList(const char *Cmd)
       line);
 
 
-   if (pf) {
-      fprintf(pf," +%7d:  %3d: %s %s\n",
-                                       (prev < 0 ? 0 : (timestamp - prev)),
-                                       bits,
-                                       (isResponse ? "TAG" : "   "),
-                                       line);
-    }
+//   if (pf) {
+//      fprintf(pf," +%7d:  %3d: %s %s\n",
+//                                     (prev < 0 ? 0 : (timestamp - prev)),
+//                                     bits,
+//                                     (isResponse ? "TAG" : "   "),
+//                                     line);
+//    }
        
     prev = timestamp;
     i += (len + 9);
   }
   
-  if (pf) {
-         PrintAndLog("Recorded activity succesfully written to file: %s", filename);
-    fclose(pf);
-  }
-       
+
   return 0;
 }
 
@@ -147,7 +140,11 @@ int CmdLFHitagSim(const char *Cmd) {
                        return 1;
                }
                tag_mem_supplied = true;
-               fread(c.d.asBytes,48,1,pf);
+               if (fread(c.d.asBytes,48,1,pf) == 0) {
+      PrintAndLog("Error: File reading error");
+      fclose(pf);
+                       return 1;
+    }
                fclose(pf);
        } else {
                tag_mem_supplied = false;