Remove the function filemanip.cc:base()

This was called only on plain filenames, not full pathnames, so it was not
needed.  Moreover, it wasn't correctly handling filenames containing colons.

diff --git a/filemanip.cc b/filemanip.cc
index d1d27be8caa3f0a3dd620ff089ea6421ffc7058e..265a2a7830d4297c851d7a560b64797843306b2d 100644 (file)
--- a/filemanip.cc
+++ b/filemanip.cc
@@ -43,22 +43,6 @@ get_file_size (const std::string& name)
   return rv;
 }
 
-std::string 
-base (const std::string& aString)
-{
-  if (!aString.size())
-    return "";
-  const char *s = aString.c_str();
-  std::string rv = s;
-  while (*s)
-    {
-      if ((*s == '/' || *s == ':' || *s == '\\') && s[1])
-       rv = s + 1;
-      s++;
-    }
-  return rv;
-}
-
 /* returns the number of characters of path that
  * precede the extension
  */
@@ -89,7 +73,7 @@ parse_filename (const string &fn, fileparse & f)
 
   f.tail = fn.substr (n, string::npos);
 
-  p = new_cstr_char_array (base (fn.substr (0, n)));
+  p = new_cstr_char_array (fn.substr (0, n));
   char const *ext;
   /* TODO: make const and non-const trail variant. */
   if ((ext = trail (p, "-src")))

diff --git a/filemanip.h b/filemanip.h
index 559451935e88571264c5cfbf895a8ffafa35b66d..451211f0458a4a5b9a6de98ff43dc9710ac9f6d0 100644 (file)
--- a/filemanip.h
+++ b/filemanip.h
@@ -30,7 +30,6 @@ struct fileparse
 };
 
 int parse_filename (const std::string& fn, fileparse & f);
-std::string base (const std::string& );
 size_t get_file_size (const std::string& );
 std::string backslash (const std::string& s);
 const char * trail (const char *, const char *);