Xserver almost runs

project/jni/application/xserver/main.c

@@ -1,21 +1,90 @@
 #include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/stat.h>
 #include <SDL/SDL.h>
+#include <android/log.h>
 
-extern int android_main(int argc, char *argv[], char *envp[]);
+extern int android_main( int argc, char *argv[], char *envp[] );
+static int unpack_files();
 
-int main(int argc, char* argv[])
+int main( int argc, char* argv[] )
 {
 	char screenres[64] = "640x480x24";
 	char* args[] = {
 		"XSDL",
 		":1111",
-		"-3button",
+		"-nolock",
 		"-screen",
 		screenres
 	};
 	char * envp[] = { NULL };
 	
-	sprintf("%sx%sx%d", getenv("DISPLAY_RESOLUTION_WIDTH"), getenv("DISPLAY_RESOLUTION_HEIGHT"), 24);
+	sprintf( screenres, "%sx%sx%d", getenv("DISPLAY_RESOLUTION_WIDTH"), getenv("DISPLAY_RESOLUTION_HEIGHT"), 24 );
+
+	if( !unpack_files() )
+	{
+		__android_log_print(ANDROID_LOG_INFO, "XSDL", "Error while unpacking files, try to reinstall the app");
+		return 1;
+	}
 	
-	return android_main(5, args, envp);
+	return android_main( 5, args, envp );
+}
+
+int unpack_files()
+{
+	char fname[PATH_MAX*2];
+	strcpy( fname, getenv("SECURE_STORAGE_DIR") );
+	strcat( fname, "/usr/bin/xkbcomp" );
+	struct stat st;
+	if( stat( fname, &st ) == 0 )
+		return 1;
+
+	strcpy( fname, getenv("SECURE_STORAGE_DIR") );
+	strcat( fname, "/busybox" );
+	FILE * ff = fopen("busybox", "rb");
+	FILE * fo = fopen(fname, "wb");
+	if( !ff || !fo )
+		return 0;
+
+	for(;;)
+	{
+		char buf[2048];
+		int cnt = fread( buf, 1, sizeof(buf), ff );
+		if( cnt < 0 )
+			return 1;
+		fwrite( buf, 1, cnt, fo );
+		if( cnt < sizeof(buf) )
+			break;
+	}
+
+	fclose(ff);
+	fclose(fo);
+
+	if( chmod(fname, 0755) != 0 )
+		return 0;
+
+	ff = fopen("data.tar.gz", "rb");
+	strcat(fname, " tar xz -C ");
+	strcat(fname, getenv("SECURE_STORAGE_DIR"));
+	fo = popen(fname, "w");
+	if( !ff || !fo )
+		return 0;
+
+	for(;;)
+	{
+		char buf[2048];
+		int cnt = fread( buf, 1, sizeof(buf), ff );
+		if( cnt < 0 )
+			return 1;
+		fwrite( buf, 1, cnt, fo );
+		if( cnt < sizeof(buf) )
+			break;
+	}
+
+	fclose(ff);
+	if( pclose(fo) != 0 )
+		return 0;
+
+	return 1;
 }