From 93a7109873b7050a1b347972711982eac1ad7fbc Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Sun, 7 Nov 2010 21:27:46 +0000
Subject: [PATCH] minor refactoring (lprintf)

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@900 be3aeb3a-fb24-0410-a615-afba39da0efa
---
 platform/gp2x/940ctl.c  |  2 --
 platform/gp2x/plat.c    | 10 ----------
 platform/linux/io.c     | 11 -----------
 platform/linux/plat.c   | 32 ++++++++++++++++++++++++--------
 platform/pandora/plat.c | 11 -----------
 5 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c
index 76986a5d..4bfd043c 100644
--- a/platform/gp2x/940ctl.c
+++ b/platform/gp2x/940ctl.c
@@ -275,8 +275,6 @@ void sharedmem940_finish(void)
 }
 
 
-extern char **g_argv;
-
 void YM2612Init_940(int baseclock, int rate)
 {
 	printf("YM2612Init_940()\n");
diff --git a/platform/gp2x/plat.c b/platform/gp2x/plat.c
index d20fc221..23a155ed 100644
--- a/platform/gp2x/plat.c
+++ b/platform/gp2x/plat.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 
 #include "plat_gp2x.h"
 #include "soc.h"
@@ -209,12 +208,3 @@ void plat_finish(void)
 	sndout_oss_exit();
 }
 
-void lprintf(const char *fmt, ...)
-{
-	va_list vl;
-
-	va_start(vl, fmt);
-	vprintf(fmt, vl);
-	va_end(vl);
-}
-
diff --git a/platform/linux/io.c b/platform/linux/io.c
index efd476e2..1122e8a7 100644
--- a/platform/linux/io.c
+++ b/platform/linux/io.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 
 #include "../common/emu.h"
 #include "../common/menu.h"
@@ -364,13 +363,3 @@ void mp3_update(int *buffer, int length, int stereo)
 {
 }
 
-/* lprintf */
-void lprintf(const char *fmt, ...)
-{
-	va_list vl;
-
-	va_start(vl, fmt);
-	vprintf(fmt, vl);
-	va_end(vl);
-}
-
diff --git a/platform/linux/plat.c b/platform/linux/plat.c
index f5742b92..5788d1d5 100644
--- a/platform/linux/plat.c
+++ b/platform/linux/plat.c
@@ -1,6 +1,7 @@
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
+#include <stdarg.h>
 #include <dirent.h>
 #include <sys/time.h>
 #include <time.h>
@@ -22,17 +23,22 @@ int plat_is_dir(const char *path)
 
 int plat_get_root_dir(char *dst, int len)
 {
-	extern char **g_argv;
-	int j;
+	int j, ret;
+
+	ret = readlink("/proc/self/exe", dst, len - 1);
+	if (ret < 0) {
+		perror("readlink");
+		ret = 0;
+	}
+	dst[ret] = 0;
 
-	strncpy(dst, g_argv[0], len);
-	len -= 32; // reserve
-	if (len < 0) len = 0;
-	dst[len] = 0;
 	for (j = strlen(dst); j > 0; j--)
-		if (dst[j] == '/') { dst[j+1] = 0; break; }
+		if (dst[j] == '/') {
+			dst[++j] = 0;
+			break;
+		}
 
-	return j + 1;
+	return 0;
 }
 
 #ifdef __GP2X__
@@ -142,3 +148,13 @@ void plat_munmap(void *ptr, size_t size)
 	munmap(ptr, size);
 }
 
+/* lprintf */
+void lprintf(const char *fmt, ...)
+{
+	va_list vl;
+
+	va_start(vl, fmt);
+	vprintf(fmt, vl);
+	va_end(vl);
+}
+
diff --git a/platform/pandora/plat.c b/platform/pandora/plat.c
index b95334da..f1ae107a 100644
--- a/platform/pandora/plat.c
+++ b/platform/pandora/plat.c
@@ -5,7 +5,6 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <stdarg.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -627,13 +626,3 @@ void plat_finish(void)
 	printf("all done\n");
 }
 
-/* lprintf */
-void lprintf(const char *fmt, ...)
-{
-	va_list vl;
-
-	va_start(vl, fmt);
-	vprintf(fmt, vl);
-	va_end(vl);
-}
-
-- 
2.39.5