فهرست منبع

* No longer replacing '~' with homedir in config, only done internally now.

svn: 1700
Bryan Drewery 21 سال پیش
والد
کامیت
26fb8a746c
3فایلهای تغییر یافته به همراه6 افزوده شده و 4 حذف شده
  1. 1 0
      doc/UPDATES
  2. 0 3
      src/conf.c
  3. 5 1
      src/shell.c

+ 1 - 0
doc/UPDATES

@@ -52,6 +52,7 @@ Lines prefixxed with '-' were disabled before release and are not finishsed.
 * +m no longer implies +j.
 * Fixed irc authing only working on +c bots (should be like this, but isnt needed soon)
 * Fixed chanset limit not being set every 2 minutes.
+* '~' replacement is now internal for paths in config.
 
 1.2
 * No longer displaying SALTS on ./bin -v

+ 0 - 3
src/conf.c

@@ -238,7 +238,6 @@ confedit()
     fatal("Error reading new config file", 0);
   readconf((const char *) tmpconf.file, 0);               /* read cleartext conf tmp into &settings */
   unlink(tmpconf.file);
-  fix_tilde(&conffile.binpath);
   conf_to_bin(&conffile);       /* will exit */
   exit(0);                      /* never reached */
 
@@ -492,8 +491,6 @@ parseconf(bool error)
     conffile.homedir = strdup(homedir());
   }
 
-  fix_tilde(&conffile.binpath);
-
 #endif /* !CYGWIN_HACKS */
   return 0;
 }

+ 5 - 1
src/shell.c

@@ -904,8 +904,12 @@ char *my_uname()
 }
 
 #ifndef CYGWIN_HACKS
-char *move_bin(const char *path, const char *file, bool run)
+char *move_bin(const char *ipath, const char *file, bool run)
 {
+  char *path = strdup(ipath);
+
+  fix_tilde(&path);
+
   /* move the binary to the correct place */
   static char newbin[DIRMAX] = "";
   char real[DIRMAX] = "";