Implemented readline in IDevice::Shell.

include/Common.h

@@ -24,4 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <readline/readline.h>
+#include <readline/history.h>
+
 #endif /* COMMON_H_ */

include/Hooks.h

@@ -0,0 +1,25 @@
+/***
+ * iRecovery++ libusb based usb interface for iBoot and iBSS
+ * Copyright (C) 2010  GreySyntax
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef HOOKS_H_
+
+#define HOOKS_H_
+
+int set_deftext();
+
+#endif /* HOOKS_H_ */

include/IDevice.h

@@ -20,9 +20,11 @@
 
 #include "LazyUSB.h"
 #include "Common.h"
+///#include "Hooks.h"
 
 #define IDEVICE_H_
-#define APPLE_VENDOR_ID 0x05AC
+#define APPLE_VENDOR_ID		0x05AC
+#define LOG_FILE			".irecovery_history"
 
 class IDevice {
 

src/Hooks.cpp

@@ -0,0 +1,39 @@
+/***
+ * iRecovery++ libusb based usb interface for iBoot and iBSS
+ * Copyright (C) 2010  GreySyntax
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Common.h"
+#include "Hooks.h"
+
+char *deftext;
+
+int set_deftext() {
+
+	if (deftext) {
+
+		rl_insert_text(deftext);
+		deftext = (char *) NULL;
+		rl_startup_hook = (rl_hook_func_t *)NULL;
+	}
+
+	return 0; 
+}
+
+void set_deftext(char *txt) {
+
+	deftext = txt;
+}

src/IDevice.cpp

@@ -18,8 +18,6 @@
 
 #include "IDevice.h"
 
-#define APPLE_VENDOR_ID 0x05AC
-
 using namespace std;
 
 enum {
@@ -30,9 +28,23 @@ enum {
 	kBufferSize		= 0x10000,
 	kCommandMaxLen	= 0x200,
 	kCommandTimeout = 500,
-	kUploadTimeout	= 1000
+	kUploadTimeout	= 1000,
 };
 
+static char *deftext;
+
+static int set_deftext() {
+
+	if (deftext) {
+
+		rl_insert_text(deftext);
+		deftext = (char *) NULL;
+		rl_startup_hook = (rl_hook_func_t *)NULL;
+	}
+
+	return 0; 
+}
+
 IDevice::IDevice() {
 
 	//Stub
@@ -137,6 +149,8 @@ bool IDevice::SendCommand(const char* argv) {
 		return false;
 	}
 
+	//add_history(LOG_FILE);
+
 	char* action = strtok(strdup(argv), " ");
 
 	if (! strcmp(action, "getenv")) {
@@ -155,6 +169,11 @@ bool IDevice::SendBuffer(char* data, int length, int* actual_length) {
 		Connect();
 	}
 
+	if (! USB.IsConnected() || ! USB.Configure(1) || ! USB.ClaimAltInterface(1, 1)) {
+
+		return false;
+	}
+
 	if (USB.Write(0x04, data, length, actual_length, kUploadTimeout) != 0) {
 
 		return false;
@@ -185,6 +204,17 @@ void IDevice::Shell() {
 
     bool runShell = true;
 	int available = 0, pos = 0;
+	char *prompt, *temp;
+
+	deftext = (char *)0;
+	//prompt = "IDevice$: ";
+
+	if (deftext && *deftext) {
+
+		rl_startup_hook = set_deftext;
+	}
+
+	read_history(LOG_FILE);
 
     while (runShell) {
 
@@ -203,6 +233,25 @@ void IDevice::Shell() {
             free(buffer);
             buffer = (char*)malloc(kBufferSize);
         }
+
+		temp = readline("IDevice$ ");
+
+		if (temp != 0 && temp && *temp) {
+
+			//TODO Log
+
+			if (temp[0] == '/' && strlen(temp) > 1 && temp[1] != ' ') {
+
+				//TODO Handle command
+
+			} else {
+
+				SendCommand(temp);
+			}
+
+			//Ciao bitch!
+			free(temp);
+		}
     }
 }
 

src/LazyUSB.cpp

@@ -170,6 +170,7 @@ bool LazyUSB::ClaimInterface(int interface) {
 #else
 
 			libusb_init(NULL);
+			//libusb_set_debug(NULL, 2);
 
 			if ((handle = libusb_open_device_with_vid_pid(NULL, vendorID, productID)) == NULL) {
 #endif

src/Makefile

@@ -1,6 +1,6 @@
 CXXFLAGS =	-O2 -g -Wall -fmessage-length=0 -I./include
 CXXALL =	-lreadline
-CXXCSS =	-I"../include" -I"/usr/local/include" -I"/opt/local/include" -L"/usr/local/lib" -L"/opt/local/lib"
+CXXCSS =	-I"../include" -I"/usr/local/include" -L"/usr/local/lib"
 CXXWIN =	-lusb -I"C:\MinGW\include" -L"C:\MinGW\lib"
 CXXNIX =	-lusb-1.0
 CXXOSX =	-lusb-1.0 -framework CoreFoundation -framework IOKit
@@ -33,7 +33,7 @@ win:	start $(SOURCE)
 	@mkdir ../bin;
 	$(CXX) -o $(TARGET) $(SOURCE) $(CXXALL) $(CXXWIN)
 
-backup:
-	@if [ ! -e ../backup ]; then mkdir ../backup; fi;
+backup: $(SOURCE) $(HEADERS) $(EXTRA_FILES)
+	@if [ ! -e ../backup ]; then; mkdir ../backup; fi;
 	@zip ../backup/`date +%d-%m-%y_%H.%M`.zip $(SOURCE) $(HEADERS) $(EXTRA_FILES)
 

src/Program.cpp

@@ -33,6 +33,7 @@ int main(int argc, char *argv[]) {
 	if (Device.Connect()) {
 
 		Device.Shell();
+		//Device.Upload("../crap");
 		Device.Disconnect();
 	}