- up to 2.7

diff --git a/links2-config-dirs.patch b/links2-config-dirs.patch
index 704eb899953e1518828095b3979b38986bd968e7..7e8c952e0689deaf30464a0d26596f5ff5aacf30 100644 (file)
--- a/links2-config-dirs.patch
+++ b/links2-config-dirs.patch
@@ -1,36 +1,3 @@
---- links-2.1pre16/default.c.orig      2005-01-22 21:51:53.000000000 +0100
-+++ links-2.1pre16/default.c   2005-01-28 20:47:14.138719472 +0100
-@@ -312,10 +312,10 @@
-                       sleep(3);
-                       mem_free(home_links);
-                       home_links = stracpy(home);
--                      add_to_strn(&home_links, ".links");             
-+                      add_to_strn(&home_links, ".links2");            
-               }
-               mem_free(config_dir);
--      } else add_to_strn(&home_links, ".links");
-+      } else add_to_strn(&home_links, ".links2");
-       if (stat(home_links, &st)) {
- #ifdef HAVE_MKDIR
-               if (!mkdir(home_links, 0777)) goto home_creat;
-@@ -327,7 +327,7 @@
-       first_failed:
-       mem_free(home_links);
-       home_links = stracpy(home);
--      add_to_strn(&home_links, "links");
-+      add_to_strn(&home_links, "links2");
-       if (stat(home_links, &st)) {
- #ifdef HAVE_MKDIR
-               if (!mkdir(home_links, 0777)) goto home_creat;
-@@ -390,7 +390,7 @@
- void load_config(void)
- {
- #ifdef SHARED_CONFIG_DIR
--      load_config_file(SHARED_CONFIG_DIR, "links.cfg");
-+      load_config_file(SHARED_CONFIG_DIR, "links2/links.cfg");
- #endif
-       load_config_file(links_home, "links.cfg");
-       load_config_file(links_home, "html.cfg");
 --- links-2.1pre16/links.1.orig        2005-01-22 21:51:55.000000000 +0100
 +++ links-2.1pre16/links.1     2005-01-28 20:47:50.217234704 +0100
 @@ -303,7 +303,7 @@
@@ -42,3 +9,34 @@
  Per-user configfile, automatically created by
  .B links.
  .SH PLATFORMS
+--- links-2.7/default.c.old    2013-04-06 20:36:00.496447136 +0200
++++ links-2.7/default.c        2013-04-06 20:38:36.712196281 +0200
+@@ -666,16 +666,16 @@ skip_path_conv:;
+               while (home_links[0] && dir_sep(home_links[strlen(cast_const_char home_links) - 1])) home_links[strlen(cast_const_char home_links) - 1] = 0;
+               EINTRLOOP(rs, stat(cast_const_char home_links, &st));
+               if (!rs && S_ISDIR(st.st_mode)) {
+-                      add_to_strn(&home_links, cast_uchar "/links");
++                      add_to_strn(&home_links, cast_uchar "/links2");
+               } else {
+                       fprintf(stderr, "CONFIG_DIR set to %s. But directory %s doesn't exist.\n\007", config_dir, home_links);
+                       sleep(3);
+                       mem_free(home_links);
+                       home_links = stracpy(home);
+-                      add_to_strn(&home_links, cast_uchar ".links");
++                      add_to_strn(&home_links, cast_uchar ".links2");
+               }
+               mem_free(config_dir);
+-      } else add_to_strn(&home_links, cast_uchar ".links");
++      } else add_to_strn(&home_links, cast_uchar ".links2");
+       EINTRLOOP(rs, stat(cast_const_char home_links, &st));
+       if (rs) {
+ #ifdef HAVE_MKDIR
+@@ -696,7 +696,7 @@ skip_path_conv:;
+       first_failed:
+       mem_free(home_links);
+       home_links = stracpy(home);
+-      add_to_strn(&home_links, cast_uchar "links");
++      add_to_strn(&home_links, cast_uchar "links2");
+       EINTRLOOP(rs, stat(cast_const_char home_links, &st));
+       if (rs) {
+ #ifdef HAVE_MKDIR