- updated for 2.2

Changed files:
    vice-home_etc.patch -> 1.5

diff --git a/vice-home_etc.patch b/vice-home_etc.patch
index b649e55d865ba86b129ab10f1b98c2bf68cea91b..bbe431e2432604c2a3676a90970b7a633b10bf1a 100644 (file)
--- a/vice-home_etc.patch
+++ b/vice-home_etc.patch
@@ -1,21 +1,21 @@
---- vice-2.0/src/arch/unix/archdep.c.old       2008-11-26 15:14:36.000000000 +0100
-+++ vice-2.0/src/arch/unix/archdep.c   2008-11-26 15:16:33.000000000 +0100
-@@ -131,6 +131,14 @@
- #endif
+--- vice-2.2/src/arch/unix/archdep.c~  2009-10-21 18:46:46.000000000 +0200
++++ vice-2.2/src/arch/unix/archdep.c   2010-03-11 11:50:24.756830676 +0100
+@@ -135,6 +135,14 @@
+     return home;
  }
  
 +extern const char *archdep_home_etc_path(void)
 +{
-+      char *home_etc = getenv("HOME_ETC");
++       char *home_etc = getenv("HOME_ETC");
 +
-+      if (home_etc) return home_etc;
-+              return archdep_home_path();
++       if (home_etc) return home_etc;
++               return archdep_home_path();
 +}
 +
  char *archdep_default_sysfile_pathlist(const char *emu_id)
  {
      static char *default_path;
-@@ -144,7 +152,7 @@
+@@ -148,7 +156,7 @@
          const char *home_path;
  
          boot_path = archdep_boot_path();
@@ -24,61 +24,70 @@
  
          /* First search in the `LIBDIR' then the $HOME/.vice/ dir (home_path)
             and then in the `boot_path'.  */
-@@ -237,7 +245,7 @@
-     if(archdep_pref_path==NULL) {
-       const char *home;
+@@ -214,7 +222,7 @@
+     if (archdep_pref_path == NULL) {
+         const char *home;
        
--      home = archdep_home_path();
-+      home = archdep_home_etc_path();
-       return util_concat(home, "/.vice/vicerc", NULL);
+-        home = archdep_home_path();
++        home = archdep_home_etc_path();
+         return util_concat(home, "/.vice/vicerc", NULL);
+     } else {
+         return util_concat(archdep_pref_path, "/vicerc", NULL);
+@@ -226,7 +234,7 @@
+     if (archdep_pref_path == NULL) {
+         const char *home;
+ 
+-        home = archdep_home_path();
++        home = archdep_home_etc_path();
+         return util_concat(home, "/.vice/fliplist-", machine_name, ".vfl", NULL);
      } else {
-       return util_concat(archdep_pref_path, "/vicerc", NULL);
-@@ -249,7 +257,7 @@
-     if(archdep_pref_path==NULL) {
-       const char *home;
+         return util_concat(archdep_pref_path, "/fliplist-", machine_name, ".vfl", NULL);
+@@ -238,7 +246,7 @@
+     if (archdep_pref_path == NULL) {
+         const char *home;
  
--      home = archdep_home_path();
-+      home = archdep_home_etc_path();
-       return util_concat(home, "/.vice/fliplist-", machine_name, ".vfl", NULL);
+-        home = archdep_home_path();
++        home = archdep_home_etc_path();
+         return util_concat(home, "/.vice/autostart-", machine_name, ".d64", NULL);
      } else {
-       return util_concat(archdep_pref_path, "/fliplist-", machine_name, ".vfl", NULL);
-@@ -263,7 +271,7 @@
+         return util_concat(archdep_pref_path, "/autostart-", machine_name, ".d64", NULL);
+@@ -252,7 +260,7 @@
      const char *viceuserdir;
  
-     if(archdep_pref_path==NULL) {
--      home = archdep_home_path();
-+      home = archdep_home_etc_path();
-       viceuserdir = util_concat(home, "/.vice", NULL);
+     if (archdep_pref_path == NULL) {
+-        home = archdep_home_path();
++        home = archdep_home_etc_path();
+         viceuserdir = util_concat(home, "/.vice", NULL);
      } else {
-       viceuserdir = archdep_pref_path;
---- vice-2.0/src/arch/unix/archdep.h~  2008-07-07 20:23:10.000000000 +0200
-+++ vice-2.0/src/arch/unix/archdep.h   2008-11-26 15:18:28.000000000 +0100
-@@ -103,7 +103,7 @@
- /* No key symcode.  */
+         viceuserdir = archdep_pref_path;
+--- vice-2.2/src/arch/unix/archdep.h~  2009-10-21 18:46:46.000000000 +0200
++++ vice-2.2/src/arch/unix/archdep.h   2010-03-11 11:51:47.773489033 +0100
+@@ -114,7 +114,7 @@
  #define ARCHDEP_KEYBOARD_SYM_NONE 0
+ #endif
  
 -extern const char *archdep_home_path(void);
 +extern const char *archdep_home_etc_path(void);
  
  /* set this path to customize the preference storage */ 
  extern const char *archdep_pref_path;
---- vice-2.0/src/arch/unix/gui/uicommands.c~   2008-07-07 20:22:35.000000000 +0200
-+++ vice-2.0/src/arch/unix/gui/uicommands.c    2008-11-26 15:20:21.000000000 +0100
-@@ -295,7 +295,7 @@
+--- vice-2.2/src/arch/unix/gui/uicommands.c~   2009-10-21 18:46:40.000000000 +0200
++++ vice-2.2/src/arch/unix/gui/uicommands.c    2010-03-11 11:53:07.350154527 +0100
+@@ -296,7 +296,7 @@
  
  static UI_CALLBACK(load_quicksnap)
  {
--    char *fname = util_concat(archdep_home_path(), "/", VICEUSERDIR, "/",
-+    char *fname = util_concat(archdep_home_etc_path(), "/", VICEUSERDIR, "/",
-         machine_name, ".vsf", NULL);
+-    char *fname = util_concat(archdep_home_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
++    char *fname = util_concat(archdep_home_etc_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
  
-     if (!ui_emulation_is_paused())
-@@ -327,7 +327,7 @@
+     if (!ui_emulation_is_paused()) {
+         interrupt_maincpu_trigger_trap(load_snapshot_trap, (void *)fname);
+@@ -328,7 +328,7 @@
  
  static UI_CALLBACK(save_quicksnap)
  {
--    char *fname = util_concat(archdep_home_path(), "/", VICEUSERDIR, "/",
-+    char *fname = util_concat(archdep_home_etc_path(), "/", VICEUSERDIR, "/",
-         machine_name, ".vsf", NULL);
+-    char *fname = util_concat(archdep_home_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
++    char *fname = util_concat(archdep_home_etc_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
  
      interrupt_maincpu_trigger_trap(save_snapshot_trap, (void *)fname);
+ }