X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Ffile-name.cc;h=ccb923355f09077024e8fbc3b2bc6d49d3faea35;hb=refs%2Fheads%2Fbugs%2F567849;hp=bf645df23d78ecdd3fccb67d90978214765477f7;hpb=84dfa31321b6f0c3224ed8c586b64ec97e88402f;p=lilypond.git diff --git a/flower/file-name.cc b/flower/file-name.cc index bf645df23d..ccb923355f 100644 --- a/flower/file-name.cc +++ b/flower/file-name.cc @@ -1,10 +1,21 @@ /* - file-name.cc - implement File_name + This file is part of LilyPond, the GNU music typesetter. - source file of the Flower Library - - (c) 1997--2007 Han-Wen Nienhuys + Copyright (C) 1997--2011 Han-Wen Nienhuys Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "file-name.hh" @@ -61,8 +72,8 @@ static /* avoid warning */ string slashify (string file_name) { - replace_all (file_name, '\\', '/'); - replace_all (file_name, string ("//"), "/"); + replace_all (&file_name, '\\', '/'); + replace_all (&file_name, string ("//"), "/"); return file_name; } @@ -185,7 +196,7 @@ File_name::canonicalized () const { File_name c = *this; - replace_all (c.dir_, string ("//"), string ("/")); + replace_all (&c.dir_, string ("//"), string ("/")); vector components = string_split (c.dir_, '/'); vector new_components;