X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Ffile-path.cc;h=727ea046caa07bb32a09f7bb0a7c0eb4a4fcdccd;hb=926731e9bd8aa223a800c2c54742cc2a3c6ca3e0;hp=7b38191d1bb5d4c2f723f4cb682a6277ef19a506;hpb=3b2376c6828136cdbc078015c0b9bee26bffb448;p=lilypond.git diff --git a/flower/file-path.cc b/flower/file-path.cc index 7b38191d1b..727ea046ca 100644 --- a/flower/file-path.cc +++ b/flower/file-path.cc @@ -1,10 +1,10 @@ /* file-path.cc - implement File_path - + source file of the Flower Library - - (c) 1997--2004 Han-Wen Nienhuys - Jan Nieuwenhuizen + + (c) 1997--2005 Han-Wen Nienhuys + Jan Nieuwenhuizen */ #include "file-path.hh" @@ -13,7 +13,7 @@ #include #include "config.hh" -#if HAVE_SYS_STAT_H +#if HAVE_SYS_STAT_H #include #endif @@ -22,11 +22,18 @@ #endif #include "file-name.hh" +#include "warn.hh" #ifndef PATHSEP #define PATHSEP ':' #endif +Array +File_path::directories () const +{ + return dirs_; +} + void File_path::parse_path (String p) { @@ -34,87 +41,112 @@ File_path::parse_path (String p) while ((len = p.length ()) ) { int i = p.index (PATHSEP); - if (i <0) + if (i < 0) i = len; append (p.left_string (i)); p = p.right_string (len - i - 1); } } -/** 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. +bool +is_file (String file_name) +{ +#if 0 /* Check if directory. TODO: encapsulate for autoconf */ + struct stat sbuf; + if (stat (file_name.to_str0 (), &sbuf) != 0) + return false; + + if (!(sbuf.st_mode & __S_IFREG)) + return false; +#endif - @return - The file name if found, or empty string if not found. */ +#if !STAT_MACROS_BROKEN + struct stat sbuf; + if (stat (file_name.to_str0 (), &sbuf) != 0) + return false; + + return !S_ISDIR (sbuf.st_mode); +#endif -String -File_path::find (String name) const -{ - if (!name.length () || (name == "-") ) - return name; - /* Handle absolute file name. */ - if (name[0] == DIRSEP) + if (FILE *f = fopen (file_name.to_str0 (), "r")) { - if (FILE *f = fopen (name.to_str0 (), "r")) - { - fclose (f); - return name; - } + fclose (f); + return true; } - - 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; + + return false; +} -#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 +bool +is_dir (String file_name) +{ #if !STAT_MACROS_BROKEN - - struct stat sbuf; - if (stat (file_name.to_str0 (), &sbuf) != 0) - continue; - - if (S_ISDIR (sbuf.st_mode)) - continue; + struct stat sbuf; + if (stat (file_name.to_str0 (), &sbuf) != 0) + return false; + + return S_ISDIR (sbuf.st_mode); #endif - /* ugh */ - FILE *f = fopen (file_name.to_str0 (), "r"); - if (f) - { - fclose (f); - return file_name; - } + if (FILE *f = fopen (file_name.to_str0 (), "r")) + { + fclose (f); + return true; } - return ""; + return false; } /** 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. - Search for NAME, or name without extension, or name with any of - EXTENSIONS, in that order. +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 +{ + if (!name.length () || (name == "-")) + return name; + +#ifdef __MINGW32__ + if (name.index ('\\') >= 0) + programming_error ("file name not normalized: " + name); +#endif /* __MINGW32__ */ + + /* 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 (); + + for (int i = 0; i < dirs_.size (); i++) + { + File_name file_name (name); + File_name dir = dirs_[i]; + file_name.root_ = dir.root_; + dir.root_ = ""; + if (file_name.dir_.is_empty ()) + file_name.dir_ = dir.to_string (); + else if (!dir.to_string ().is_empty()) + file_name.dir_ += ::to_string (DIRSEP) + dir.to_string (); + + if (is_file (file_name.to_string ())) + return file_name.to_string (); + } + return ""; +} + +/* + Try to find + + file.EXT, - @return - The file name if found, or empty string if not found. */ + where EXT is from EXTENSIONS. +*/ String File_path::find (String name, char const *extensions[]) { @@ -133,6 +165,7 @@ File_path::find (String name, char const *extensions[]) if (!find (file_name.to_string ()).is_empty ()) break; } + /* Reshuffle extension */ file_name = File_name (file_name.to_string ()); } @@ -144,10 +177,9 @@ bool 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; } @@ -158,12 +190,23 @@ String File_path::to_string () const { String s; - int n = size (); - for (int i = 0; i < n; i++) + for (int 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 (String str) +{ + dirs_.push (str); +} + +void +File_path::prepend (String str) +{ + dirs_.insert (str, 0); +}