hosted: sanitize handling of HOME_DIR

 * HOME_DIR is now either "/" or special "<HOME>"
   * target-specific "home dir path" is defined solely by PIVOT_ROOT
 * PIVOT_ROOT path is now defined in toplevel config files
 * Make Samsung YP-R0/R1 and SONY_NWZ use PIVOT_ROOT too
 * Do not prepend PIVOT_ROOT path if the path already has it!
 * Do not play these games for __PCTOOL__ builds

Change-Id: I3d51ad902a5f9cafe45ba15ba654f30f1ec6113a

11 files changed, 22 insertions, 22 deletions

diff --git a/firmware/export/config/agptekrocker.h b/firmware/export/config/agptekrocker.h
index 230dc6cac4..f0e98d4db2 100644
--- a/firmware/export/config/agptekrocker.h
+++ b/firmware/export/config/agptekrocker.h
@@ -15,6 +15,7 @@
 
 #ifndef SIMULATOR
 #define CONFIG_PLATFORM (PLATFORM_HOSTED)
+#define PIVOT_ROOT "/mnt/sd_0"
 #endif
 
 #define HIBY_LINUX
diff --git a/firmware/export/config/aigoerosq.h b/firmware/export/config/aigoerosq.h
index 9207b5548f..6129557726 100644
--- a/firmware/export/config/aigoerosq.h
+++ b/firmware/export/config/aigoerosq.h
@@ -15,6 +15,7 @@
 
 #ifndef SIMULATOR
 #define CONFIG_PLATFORM (PLATFORM_HOSTED)
+#define PIVOT_ROOT "/mnt/sd_0"
 #endif
 
 #define HIBY_LINUX
diff --git a/firmware/export/config/fiiom3k.h b/firmware/export/config/fiiom3k.h
index 88652b633f..933e85dab9 100644
--- a/firmware/export/config/fiiom3k.h
+++ b/firmware/export/config/fiiom3k.h
@@ -15,6 +15,7 @@
 
 #ifndef SIMULATOR
 #define CONFIG_PLATFORM (PLATFORM_HOSTED)
+#define PIVOT_ROOT "/mnt"
 #endif
 
 #define HAVE_FPU
diff --git a/firmware/export/config/ibassodx50.h b/firmware/export/config/ibassodx50.h
index 4107fd496f..22215ef9e4 100644
--- a/firmware/export/config/ibassodx50.h
+++ b/firmware/export/config/ibassodx50.h
@@ -24,7 +24,10 @@
 /* This config file is for Rockbox as an application on Android without JVM. */
 
 /* We don't run on hardware directly */
+#ifndef SIMULATOR
 #define CONFIG_PLATFORM PLATFORM_HOSTED
+#define PIVOT_ROOT "/mnt/sdcard"
+#endif
 #define HAVE_FPU
 
 /* For Rolo and boot loader */
diff --git a/firmware/export/config/ibassodx90.h b/firmware/export/config/ibassodx90.h
index ae5a446aa3..b0cff1a8d0 100644
--- a/firmware/export/config/ibassodx90.h
+++ b/firmware/export/config/ibassodx90.h
@@ -24,7 +24,10 @@
 /* This config file is for Rockbox as an application on Android without JVM. */
 
 /* We don't run on hardware directly */
+#ifndef SIMULATOR
 #define CONFIG_PLATFORM PLATFORM_HOSTED
+#define PIVOT_ROOT "/mnt/sdcard"
+#endif
 #define HAVE_FPU
 
 /* For Rolo and boot loader */
diff --git a/firmware/export/config/samsungypr0.h b/firmware/export/config/samsungypr0.h
index 414ba39517..655ed811b7 100644
--- a/firmware/export/config/samsungypr0.h
+++ b/firmware/export/config/samsungypr0.h
@@ -7,6 +7,7 @@
 /* YP-R0 need it too of course */
 #ifndef SIMULATOR
 #define CONFIG_PLATFORM (PLATFORM_HOSTED)
+#define PIVOT_ROOT "/mnt/media0"
 #endif
 
 /* For Rolo and boot loader */
diff --git a/firmware/export/config/samsungypr1.h b/firmware/export/config/samsungypr1.h
index 4d5c4a88f9..6f9904614c 100644
--- a/firmware/export/config/samsungypr1.h
+++ b/firmware/export/config/samsungypr1.h
@@ -7,6 +7,7 @@
 /* YP-R1 need it too of course */
 #ifndef SIMULATOR
 #define CONFIG_PLATFORM (PLATFORM_HOSTED)
+#define PIVOT_ROOT "/mnt/media0"
 #endif
 
 /* For Rolo and boot loader */
diff --git a/firmware/export/config/sonynwzlinux.h b/firmware/export/config/sonynwzlinux.h
index 66f18724db..074ad1c417 100644
--- a/firmware/export/config/sonynwzlinux.h
+++ b/firmware/export/config/sonynwzlinux.h
@@ -4,11 +4,9 @@
 
 #ifndef SIMULATOR
 #define CONFIG_PLATFORM (PLATFORM_HOSTED)
+#define PIVOT_ROOT "/contents"
 #endif
 
-
-
-
 /* define this if you have a colour LCD */
 #define HAVE_LCD_COLOR
 
diff --git a/firmware/export/config/xduoox20.h b/firmware/export/config/xduoox20.h
index 70e6131cb7..e12346e1bc 100644
--- a/firmware/export/config/xduoox20.h
+++ b/firmware/export/config/xduoox20.h
@@ -15,6 +15,7 @@
 
 #ifndef SIMULATOR
 #define CONFIG_PLATFORM (PLATFORM_HOSTED)
+#define PIVOT_ROOT "/mnt/sd_0"
 #endif
 
 #define HIBY_LINUX
diff --git a/firmware/export/config/xduoox3ii.h b/firmware/export/config/xduoox3ii.h
index d19165114a..0b886e3af9 100644
--- a/firmware/export/config/xduoox3ii.h
+++ b/firmware/export/config/xduoox3ii.h
@@ -15,6 +15,7 @@
 
 #ifndef SIMULATOR
 #define CONFIG_PLATFORM (PLATFORM_HOSTED)
+#define PIVOT_ROOT "/mnt/sd_0"
 #endif
 
 #define HIBY_LINUX
diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h
index 215b4c0c4b..da5a2fb71c 100644
--- a/firmware/export/rbpaths.h
+++ b/firmware/export/rbpaths.h
@@ -40,24 +40,12 @@
 #define ROCKBOX_DIR_LEN (sizeof(ROCKBOX_DIR)-1)
 #endif /* def __PCTOOL__ */
 
+/* NOTE:  target-specific hosted HOME_DIR resides in filesystem-app.c */
 #if !defined(APPLICATION) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \
     defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || \
     defined(HIBY_LINUX) || defined(FIIO_M3K)
 
-#if defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1)
-#define HOME_DIR "/mnt/media0"
-#elif defined(SONY_NWZ_LINUX)
-#define HOME_DIR "/contents"
-#elif defined(DX50) || defined(DX90)
-/* Where to put save files like recordings, playlists, screen dumps ...*/
-#define HOME_DIR "/mnt/sdcard"
-#elif defined(HIBY_LINUX)
-#define HOME_DIR "/mnt/sd_0"
-#elif defined(FIIO_M3K)
-#define HOME_DIR "/mnt"
-#else
 #define HOME_DIR "/"
-#endif
 
 /* make sure both are the same for native builds */
 #undef ROCKBOX_LIBRARY_PATH
@@ -69,6 +57,7 @@
 #else /* APPLICATION */
 
 #define HOME_DIR "<HOME>" /* replaced at runtime */
+#define HAVE_SPECIAL_DIRS
 
 #define PLUGIN_DIR          ROCKBOX_LIBRARY_PATH "/rockbox/rocks"
 #if (CONFIG_PLATFORM & PLATFORM_ANDROID)
@@ -79,10 +68,8 @@
 
 #endif /* !APPLICATION || SAMSUNG_YPR0 */
 
-#define HOME_DIR_LEN (sizeof(HOME_DIR)-1)
-
-#define REC_BASE_DIR        "/Recordings"
-#define PLAYLIST_CATALOG_DEFAULT_DIR "/Playlists"
+#define REC_BASE_DIR        HOME_DIR "/Recordings"
+#define PLAYLIST_CATALOG_DEFAULT_DIR HOME_DIR "/Playlists"
 
 #define LANG_DIR            ROCKBOX_DIR "/langs"
 
@@ -91,8 +78,10 @@
 #define PLUGIN_DEMOS_DIR    PLUGIN_DIR "/demos"
 #define VIEWERS_DIR         PLUGIN_DIR "/viewers"
 
-#if defined(APPLICATION) && !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \
-    defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX))
+#if defined(APPLICATION) && \
+        !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \
+          defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K))
+
 #define PLUGIN_DATA_DIR          ROCKBOX_DIR "/rocks.data"
 #define PLUGIN_GAMES_DATA_DIR    PLUGIN_DATA_DIR
 #define PLUGIN_APPS_DATA_DIR     PLUGIN_DATA_DIR