X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6ff6ade2f5f24ffb52a9f90238ee7b8c77edc89c..0a966150a0bf41466c3c3e0e39672892bf6bdd01:/client/cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 70db0575..8257a5b3 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -571,31 +571,46 @@ int CmdVchDemod(const char *Cmd)
 //by marshmellow
 int CmdLFfind(const char *Cmd)
 {
-  int ans=0;
-  if (!offline){
-    ans=CmdLFRead("");
-    //ans=CmdSamples("20000");
-  }
-  if (GraphTraceLen<1000) return 0;
-  PrintAndLog("Checking for known tags:");
-  
-  ans=Cmdaskmandemod("");
-  PrintAndLog("ASK_MAN: %s", (ans)?"YES":"NO" );
-  
-  ans=CmdFSKdemodHID("");
-  PrintAndLog("HID: %s", (ans)?"YES":"NO" );
-  
-  ans=CmdFSKdemodIO("");
-  PrintAndLog("IO prox: %s", (ans)?"YES":"NO" );
-
-  ans=CmdIndalaDemod("");
-  PrintAndLog("Indala (64): %s", (ans)?"YES":"NO" );
+	int ans = 0;
+	char cmdp = param_getchar(Cmd, 0);
 	
-  ans=CmdIndalaDemod("224");
-  PrintAndLog("Indala (224): %s", (ans)?"YES":"NO" );
-	
-  //PrintAndLog("No Known Tags Found!\n");
-  return 0;
+	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {
+		PrintAndLog("Usage:  lf search [use data from Graphbuffer]");
+		PrintAndLog("     [use data from Graphbuffer], if not set, try reading data from tag.");
+		PrintAndLog("");
+		PrintAndLog("    sample: lf search");
+		PrintAndLog("          : lf search 1");
+		return 0;
+	}
+
+	if (!offline || (cmdp != '1') ){
+		ans = CmdLFRead("");
+	} else if (GraphTraceLen<1000) {
+		PrintAndLog("Data in Graphbuffer was too small.");
+		return 0;
+	}
+
+	PrintAndLog("Checking for known tags:");
+
+	ans=Cmdaskmandemod("");
+	PrintAndLog("ASK_MAN: %s", (ans)?"YES":"NO" );
+
+	ans=CmdFSKdemodHID("");
+	PrintAndLog("HID: %s", (ans)?"YES":"NO" );
+
+	ans=CmdFSKdemodIO("");
+	PrintAndLog("IO prox: %s", (ans)?"YES":"NO" );
+
+	ans=CmdIndalaDemod("");
+	PrintAndLog("Indala (64): %s", (ans)?"YES":"NO" );
+
+	ans=CmdIndalaDemod("224");
+	PrintAndLog("Indala (224): %s", (ans)?"YES":"NO" );
+
+	if (!ans)
+		PrintAndLog("No Known Tags Found!\n");
+		
+	return 0;
 }
 
 static command_t CommandTable[] =