X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=flower%2Fpath.cc;h=bd6a6660d2c6bce301bffb25ed247365ee4e5d6d;hb=04f01c7e890bd4f1b358378e5911fb7c117c3802;hp=3a2e5dfbc0abf56648f251c70ffe53af1f57c49b;hpb=ce5315498fcaaf17d5eb1b320014e96defbb7dfb;p=lilypond.git diff --git a/flower/path.cc b/flower/path.cc index 3a2e5dfbc0..bd6a6660d2 100644 --- a/flower/path.cc +++ b/flower/path.cc @@ -49,13 +49,6 @@ split_path(String path, } } -File_path::File_path(String pref) -{ - add("."); - add(pref); -} - - /** find a file. It will search in the current dir, in the construction-arg, and in any other added path, in this order. @@ -64,13 +57,13 @@ String File_path::find(String nm)const { - fdebug << "looking for " << nm ; + fdebug << "looking for " << nm << ": "; if ( !nm.length_i() || ( nm == "-" ) ) return nm; for (int i=0; i < size(); i++) { String path = (*this)[i]; - path+= "/"+nm; + path+= String(path.length_i()? "/":"")+nm; fdebug << path << "? "; FILE *f = fopen(path, "r"); // ugh!