X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Ffile-path.cc;h=65cd517e5a07247fc798277631be1857601679e0;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=7b38191d1bb5d4c2f723f4cb682a6277ef19a506;hpb=3b2376c6828136cdbc078015c0b9bee26bffb448;p=lilypond.git diff --git a/flower/file-path.cc b/flower/file-path.cc index 7b38191d1b..65cd517e5a 100644 --- a/flower/file-path.cc +++ b/flower/file-path.cc @@ -1,10 +1,21 @@ /* - file-path.cc - implement File_path - - source file of the Flower Library - - (c) 1997--2004 Han-Wen Nienhuys - Jan Nieuwenhuizen + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1997--2015 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-path.hh" @@ -13,7 +24,7 @@ #include #include "config.hh" -#if HAVE_SYS_STAT_H +#if HAVE_SYS_STAT_H #include #endif @@ -22,148 +33,176 @@ #endif #include "file-name.hh" +#include "warn.hh" #ifndef PATHSEP #define PATHSEP ':' #endif +#include + +vector +File_path::directories () const +{ + return dirs_; +} + void -File_path::parse_path (String p) +File_path::parse_path (const string &p) { - int len; - while ((len = p.length ()) ) + concat (dirs_, string_split (p, PATHSEP)); +} + +bool +is_file (const string &file_name) +{ +#if !STAT_MACROS_BROKEN + struct stat sbuf; + if (stat (file_name.c_str (), &sbuf) != 0) + return false; + + return !S_ISDIR (sbuf.st_mode); +#endif + + if (FILE *f = fopen (file_name.c_str (), "r")) { - int i = p.index (PATHSEP); - if (i <0) - i = len; - append (p.left_string (i)); - p = p.right_string (len - i - 1); + fclose (f); + return true; } + + return false; +} + +bool +is_dir (string file_name) +{ + /* + canonicalize; in particular, trailing slashes should disappear. + */ + file_name = File_name (file_name).to_string (); + +#if !STAT_MACROS_BROKEN + struct stat sbuf; + if (stat (file_name.c_str (), &sbuf) != 0) + return false; + + return S_ISDIR (sbuf.st_mode); +#endif + + if (FILE *f = fopen (file_name.c_str (), "r")) + { + fclose (f); + return true; + } + return false; } /** Find a file. - - Check absolute file name, search in the current dir (DUH! FIXME!), - in the construction-arg (what's that?), and in any other appended - directory, in this order. - @return - The file name if found, or empty string if not found. */ +Check absolute file name, search in the current dir (DUH! FIXME!), +in the construction-arg (what's that?), and in any other appended +directory, in this order. + +@return +The file name if found, or empty string if not found. */ -String -File_path::find (String name) const +string +File_path::find (const string &name) const { - if (!name.length () || (name == "-") ) + if (!name.length () || (name == "-")) return name; - /* Handle absolute file name. */ - if (name[0] == DIRSEP) - { - if (FILE *f = fopen (name.to_str0 (), "r")) - { - fclose (f); - return name; - } - } - - for (int i = 0; i < size (); i++) - { - String file_name = elem (i); - String sep = ::to_string (DIRSEP); - String right (file_name.right_string (1)); - if (file_name.length () && right != sep) - file_name += ::to_string (DIRSEP); - - file_name += name; - -#if 0 /* Check if directory. TODO: encapsulate for autoconf */ - struct stat sbuf; - if (stat (file_name.to_str0 (), &sbuf) != 0) - continue; - - if (! (sbuf.st_mode & __S_IFREG)) - continue; -#endif -#if !STAT_MACROS_BROKEN - - struct stat sbuf; - if (stat (file_name.to_str0 (), &sbuf) != 0) - continue; +#ifdef __MINGW32__ + if (name.find ('\\') != NPOS) + programming_error ("file name not normalized: " + name); +#endif /* __MINGW32__ */ - if (S_ISDIR (sbuf.st_mode)) - continue; -#endif + /* Handle absolute file name. */ + File_name file_name (name); + if (file_name.dir_[0] == DIRSEP && is_file (file_name.to_string ())) + return file_name.to_string (); - /* ugh */ - FILE *f = fopen (file_name.to_str0 (), "r"); - if (f) - { - fclose (f); - return file_name; - } + for (vsize i = 0; i < dirs_.size (); i++) + { + File_name file_name (name); + File_name dir = (string) dirs_[i]; + file_name.root_ = dir.root_; + dir.root_ = ""; + if (file_name.dir_.empty ()) + file_name.dir_ = dir.to_string (); + else if (!dir.to_string ().empty ()) + file_name.dir_ = dir.to_string () + + ::to_string (DIRSEP) + file_name.dir_; + if (is_file (file_name.to_string ())) + return file_name.to_string (); } return ""; } -/** Find a file. - - Seach in the current dir (DUH! FIXME?), in the construction-arg - (what's that?, and in any other appended directory, in this order. +/* + Try to find - Search for NAME, or name without extension, or name with any of - EXTENSIONS, in that order. + file.EXT, - @return - The file name if found, or empty string if not found. */ -String -File_path::find (String name, char const *extensions[]) + where EXT is from EXTENSIONS. +*/ +string +File_path::find (const string &name, char const *extensions[]) { + if (name.empty () || name == "-") + return name; + File_name file_name (name); - if (name.is_empty () || name == "-") - file_name.base_ = "-"; - else + string orig_ext = file_name.ext_; + for (int i = 0; extensions[i]; i++) { - String orig_ext = file_name.ext_; - for (int i = 0; extensions[i]; i++) - { - file_name.ext_ = orig_ext; - if (*extensions[i] && !file_name.ext_.is_empty ()) - file_name.ext_ += "."; - file_name.ext_ += extensions[i]; - if (!find (file_name.to_string ()).is_empty ()) - break; - } - /* Reshuffle extension */ - file_name = File_name (file_name.to_string ()); + file_name.ext_ = orig_ext; + if (*extensions[i] && !file_name.ext_.empty ()) + file_name.ext_ += "."; + file_name.ext_ += extensions[i]; + string found = find (file_name.to_string ()); + if (!found.empty ()) + return found; } - return file_name.to_string (); + + return ""; } /** Append a directory, return false if failed. */ bool -File_path::try_append (String s) +File_path::try_append (string s) { if (s == "") - s = "."; - if (FILE *f = fopen (s.to_str0 (), "r")) + s = "."; + if (is_dir (s)) { - fclose (f); append (s); return true; } return false; } -String +string File_path::to_string () const { - String s; - int n = size (); - for (int i = 0; i < n; i++) + string s; + for (vsize i = 0; i < dirs_.size (); i++) { - s = s + elem (i); - if (i < n - 1) - s += ":"; + s = s + dirs_[i]; + if (i < dirs_.size () - 1) + s += ::to_string (PATHSEP); } return s; } + +void +File_path::append (const string &str) +{ + dirs_.push_back (str); +} + +void +File_path::prepend (const string &str) +{ + dirs_.insert (dirs_.begin (), str); +}