Quellcode durchsuchen

* Ported [2775] to 1.2.10
* Expand symbolic links when searching for tempdirs. (fixes #210)


svn: 2776

Bryan Drewery vor 20 Jahren
Ursprung
Commit
70bf55918f
2 geänderte Dateien mit 5 neuen und 1 gelöschten Zeilen
  1. 1 0
      doc/UPDATES
  2. 4 1
      src/misc_file.c

+ 1 - 0
doc/UPDATES

@@ -21,6 +21,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fixed leaf bots sending color to hub bots still. (fixes #161)
 * Fixed cmd_trace to use 2 decimal places in display for seconds. (fixes #207)
 * Fixed cmd_trace not displaying hops correctly.
+* Expand symbolic links when searching for tempdirs. (fixes #210)
 
 1.2.9
 * Fixed cmd_[un]stick not properly using numbers for channel masks. (#160)

+ 4 - 1
src/misc_file.c

@@ -294,7 +294,10 @@ bool Tempfile::FindDir()
   };
 
   for (int i = 0; dirs[i]; i++) {
-    strlcpy(tempdir, dirs[i], DIRMAX);
+    realpath(dirs[i], tempdir);
+    size_t len = strlen(tempdir);
+    tempdir[len] = '/';
+    tempdir[len + 1] = '\0';
     if (check_tempdir(0)) {
       looking = 0;
       return OK;