fixed iso14443b snoop, plus compiling issue of redefined parameter, please take care...

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 561132bf16113a15a10a2eb01588172e2dad54ce..5d012199f14867ec4adaf7ba72b741b0124db9bf 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1,3 +1,13 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Data and Graph commands
+//-----------------------------------------------------------------------------
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -476,9 +486,9 @@ int CmdSamples(const char *Cmd)
 
 int CmdLoad(const char *Cmd)
 {
-  FILE *f = fopen(Cmd + 1, "r");
+  FILE *f = fopen(Cmd, "r");
   if (!f) {
-    PrintAndLog("couldn't open '%s'", Cmd + 1);
+    PrintAndLog("couldn't open '%s'", Cmd);
     return 0;
   }
 
@@ -524,7 +534,7 @@ int CmdManchesterDemod(const char *Cmd)
   int i, j, invert= 0;
   int bit;
   int clock;
-  int lastval;
+  int lastval = 0;
   int low = 0;
   int high = 0;
   int hithigh, hitlow, first;
@@ -534,7 +544,7 @@ int CmdManchesterDemod(const char *Cmd)
   int warnings = 0;
 
   /* check if we're inverting output */
-  if (*(Cmd + 1) == 'i')
+  if (*Cmd == 'i')
   {
     PrintAndLog("Inverting output");
     invert = 1;
@@ -551,7 +561,7 @@ int CmdManchesterDemod(const char *Cmd)
 
   /* But it does not work if compiling on WIndows: therefore we just allocate a */
   /* large array */
-  int BitStream[MAX_GRAPH_TRACE_LEN];
+  uint8_t BitStream[MAX_GRAPH_TRACE_LEN];
 
   /* Detect high and lows */
   for (i = 0; i < GraphTraceLen; i++)