source file of the Flower Library
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#define PATHSEP ':'
#endif
-Array<String>
+vector<string>
File_path::directories () const
{
return dirs_;
}
+#include <algorithm>
void
-File_path::parse_path (String p)
+File_path::parse_path (string p)
{
- int len;
- while ((len = p.length ()))
- {
- int i = p.index (PATHSEP);
- if (i < 0)
- i = len;
- append (p.left_string (i));
- p = p.right_string (len - i - 1);
- }
+ concat (dirs_, string_split (p, PATHSEP));
}
bool
-is_file (String file_name)
+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
-
#if !STAT_MACROS_BROKEN
struct stat sbuf;
- if (stat (file_name.to_str0 (), &sbuf) != 0)
+ if (stat (file_name.c_str (), &sbuf) != 0)
return false;
return !S_ISDIR (sbuf.st_mode);
#endif
- if (FILE *f = fopen (file_name.to_str0 (), "r"))
+ if (FILE *f = fopen (file_name.c_str (), "r"))
{
fclose (f);
return true;
}
bool
-is_dir (String file_name)
+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.to_str0 (), &sbuf) != 0)
+ if (stat (file_name.c_str (), &sbuf) != 0)
return false;
return S_ISDIR (sbuf.st_mode);
#endif
- if (FILE *f = fopen (file_name.to_str0 (), "r"))
+ if (FILE *f = fopen (file_name.c_str (), "r"))
{
fclose (f);
return true;
@return
The file name if found, or empty string if not found. */
-String
-File_path::find (String name) const
+string
+File_path::find (string name) const
{
if (!name.length () || (name == "-"))
return name;
#ifdef __MINGW32__
- if (name.index ('\\') >= 0)
+ if (name.find ('\\') != NPOS)
programming_error ("file name not normalized: " + name);
#endif /* __MINGW32__ */
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++)
+ for (vsize i = 0; i < dirs_.size (); i++)
{
File_name file_name (name);
- File_name dir = dirs_[i];
+ File_name dir = (string) dirs_[i];
file_name.root_ = dir.root_;
dir.root_ = "";
- if (file_name.dir_.is_empty ())
+ if (file_name.dir_.empty ())
file_name.dir_ = dir.to_string ();
- else if (!dir.to_string ().is_empty ())
+ 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 ()))
where EXT is from EXTENSIONS.
*/
-String
-File_path::find (String name, char const *extensions[])
+string
+File_path::find (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 = ".";
return false;
}
-String
+string
File_path::to_string () const
{
- String s;
- for (int i = 0; i < dirs_.size (); i++)
+ string s;
+ for (vsize i = 0; i < dirs_.size (); i++)
{
s = s + dirs_[i];
if (i < dirs_.size () - 1)
}
void
-File_path::append (String str)
+File_path::append (string str)
{
- dirs_.push (str);
+ dirs_.push_back (str);
}
void
-File_path::prepend (String str)
+File_path::prepend (string str)
{
- dirs_.insert (str, 0);
+ dirs_.insert (dirs_.begin (), str);
}