Roxen.git/ server/ modules/ filesystems/ filesystem.pike

2016-04-05

2016-04-05 10:04:52 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 5d1634876fe66a31cdbf795861ae1e01b758233f (14 lines) (+6/-8) ^{[ Show | Annotate ]}
  Branch: 5d1634876fe66a31cdbf795861ae1e01b758233f

Filesystem: Improved path normalization.

Make sure that the cached search path ends with a directory separator.

Fixes errors on NT (where roxen_path() strips the separator).

273:    stat_cache = query("stat_cache");    internal_files = map(query("internal_files"), encode_path);    +  if (sizeof(path) && !has_suffix(path, "/")) path += "/";    -  +    #if constant(System.normalize_path)    if (catch { -  if ((<'/','\\'>)[path[-1]]) { +     normalized_path = System.normalize_path(path + "."); -  } else { -  normalized_path = System.normalize_path(path); -  } +     }) { -  report_error(LOCALE(1, "Path verification of %s failed.\n"), mountpoint); +  report_error(LOCALE(1, "Path normalization of %s: %s failed.\n"), +  path, mountpoint);    normalized_path = path;    }   #else /* !constant(System.normalize_path) */    normalized_path = path;   #endif /* constant(System.normalize_path) */ -  if ((normalized_path == "") || !(<'/','\\'>)[normalized_path[-1]]) { +  if ((normalized_path != "") && !(<'/','\\'>)[normalized_path[-1]]) {   #ifdef __NT__    normalized_path += "\\";   #else /* !__NT__ */