X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Ffile-path.hh;h=1c039cf4ab0dd51efdcf0966d8edc424338b66ea;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=971ab4f3e80a8a5d8070ab635081d06cd267aec5;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh
index 971ab4f3e8..1c039cf4ab 100644
--- a/flower/include/file-path.hh
+++ b/flower/include/file-path.hh
@@ -1,51 +1,53 @@
 /*
-  file-path.hh -- declare Path and File_path
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #ifndef FILE_PATH_HH
 #define FILE_PATH_HH
 
-#include "string.hh"
-#include "array.hh"
+#include "std-vector.hh"
+#include "std-string.hh"
 
-
-/**    
-  search in directories for a file.
+/**
+   search in directories for a file.
 
    Abstraction of PATH variable. An interface for searching input files.
    Search a number of dirs for a file.
 
-   TODO: add a unix style PATH interface 
+   TODO: add a unix style PATH interface
 */
 
-class Path
+class File_path
 {
-public:
-  String root;
-  String dir;
-  String base;
-  String ext;
+  vector<string> dirs_;
 
-  String to_string () const;
-};
-
-class File_path : private Array<String>
-{
 public:
-  String find (String nm) const;
-
-  Array<String>::push;
-  void prepend (String str) { Array<String>::insert (str, 0); }
-  String to_string ()const;
-  bool try_add (String str);
-  void add (String);
-  void parse_path (String);
+  vector<string> directories () const;
+  string find (const string &name) const;
+  string find (const string &name, char const *extensions[]);
+  string to_string () const;
+  bool try_append (string str);
+  void append (const string&);
+  void parse_path (const string&);
+  void prepend (const string&);
 };
 
-Path split_path (String path);
+bool is_file (const string &file_name);
+bool is_dir (string file_name);
 
 #endif /* FILE_PATH */