Roxen.git/ server/ font_handlers/ imagedir.pike

2012-02-08

2012-02-08 00:56:23 by Jonas Wallden <jonasw@roxen.com>

• c74c05efaaca5ffed39493240ac98a2b730b8bd6 (17 lines) (+10/-7) ^{[ Show | Annotate ]}
  Branch: 5.2

Fix Windows breakage following introduction of roxen_path() in a lot of
places. This call strips trailing slash so callers must adjust when
recursing in directories.

Rev: server/base_server/module_support.pike:1.149
Rev: server/font_handlers/compactimgfile.pike:1.11
Rev: server/font_handlers/imagedir.pike:1.18
Rev: server/font_handlers/imagetar.pike:1.13

3:      #include <config.h>   #include <stat.h> - constant cvs_version = "$Id: imagedir.pike,v 1.17 2011/12/28 18:29:37 mast Exp $"; + constant cvs_version = "$Id: imagedir.pike,v 1.18 2012/02/08 00:56:23 jonasw Exp $";      constant name = "Image directory fonts";   constant doc = ("Handles a directory with images (in almost any format), each "
182:    font_list = ([]);    foreach(roxen->query("font_dirs"), string dir) {    dir = roxen_path (dir); -  foreach( (get_dir( dir )||({})), string d ) -  if( Stdio.is_dir( dir+d ) ) { -  if( file_stat( dir+d+"/fontinfo" ) ) -  font_list[font_name(Stdio.read_bytes(dir+d+"/fontinfo"))]=dir+d+"/"; -  else if( file_stat( dir+d+"/fontname" ) ) -  font_list[font_name(Stdio.read_bytes(dir+d+"/fontname"))]=dir+d+"/"; +  foreach( (get_dir( dir )||({})), string d ) { +  string fpath = combine_path(dir, d); +  if( Stdio.is_dir( fpath ) ) { +  if( file_stat( fpath + "/fontinfo" ) ) +  font_list[font_name(Stdio.read_bytes(fpath+"/fontinfo"))]=fpath+"/"; +  else if( file_stat( fpath+"/fontname" ) ) +  font_list[font_name(Stdio.read_bytes(fpath+"/fontname"))]=fpath+"/";    }    }    } -  + }      array available_fonts()   {