Changeset 21404

Timestamp:

2010-01-04T17:43:22+13:00 (13 years ago)

Author:

davidb

Message:

Introduction of pathname_cat which concatenates values for path variables such as CLASSPATH and PATH. Uses ':' for Unix, ';' for Windows

Location:

main/trunk/greenstone2/common-src/src/lib

Files:

• fileutil.cpp (modified) (2 diffs)
• fileutil.h (modified) (2 diffs)

main/trunk/greenstone2/common-src/src/lib/fileutil.cpp

@@ -38 +38 @@
 
 
-// returns the proper concatenation of the two paths
+// returns the proper concatenation of directory + directory/filename
 text_t filename_cat (text_t path1, text_t path2) {
   text_t::iterator here;
@@ -108 +108 @@
 }
 
+
+
+// returns the proper concatenation of the two paths, as in
+// /usr/bin:/usr/local/bin (for Unix) and c:\usr\bin;c:\usr\local\bin (for windows)
+
+text_t pathname_cat (text_t path1, text_t path2) {
+  text_t::iterator here;
+  text_t::iterator begin;
+  text_t::iterator end;
+
+  // make sure there are no slashes at the end of path1
+
+  if (!path1.empty()) {
+    // remove all trailing slashes
+    here = path1.end();
+    --here;
+    begin = path1.begin();
+    while (here != begin && (*here == '/' || *here == '\\')) {
+      --here;
+    }
+    ++here;
+    path1.erase(here,path1.end());
+    
+    // add one final slash
+#ifdef __WIN32__
+    path1 += ";";
+#else
+    path1 += ":";
+#endif 
+  }
+
+  // make sure there are no slashes at the end of path2
+  here = path2.end();
+  --here;
+  begin = path2.begin();
+  while (here != begin && (*here == '/' || *here == '\\')) {
+    --here;
+  }
+  ++here;
+  path2.erase (here, path2.end());
+  
+  text_t fullpath = path1 + path2;
+  
+  // make sure all the right slashes are used
+  here = fullpath.begin();
+  end = fullpath.end();
+  while (here != end) {
+#ifdef __WIN32__
+    if (*here == '/') *here = '\\';
+#else
+    if (*here == '\\') *here = '/';
+#endif
+    ++here ;
+  }
+  return fullpath;
+}
+
+text_t pathname_cat (text_t path1, text_t path2, text_t path3) {
+  return pathname_cat(pathname_cat(path1,path2),path3);
+}
+
+text_t pathname_cat (text_t path1, text_t path2, text_t path3, text_t path4) {
+  return pathname_cat(pathname_cat(pathname_cat(path1,path2),path3),path4);
+}
+
+text_t pathname_cat (text_t path1, text_t path2, text_t path3, text_t path4, 
+             text_t path5) {
+  return pathname_cat(pathname_cat(pathname_cat(pathname_cat(path1,path2),path3),
+                   path4),path5);
+}
+
+text_t pathname_cat (text_t path1, text_t path2, text_t path3, text_t path4, 
+             text_t path5, text_t path6) {
+  return pathname_cat(pathname_cat(path1,path2,path3,path4,path5),path6);
+}
+
+
+
+
+
 // returns true if filename can be opened
 bool file_exists (const text_t &filename) {

main/trunk/greenstone2/common-src/src/lib/fileutil.h

@@ -31 +31 @@
 
 
-// returns the proper concatenation of the two paths
+// returns the proper concatenation of directory + directory/filename
 text_t filename_cat (text_t path1, text_t path2);
 text_t filename_cat (text_t path1, text_t path2, text_t path3);
@@ -38 +38 @@
              text_t path5);
 text_t filename_cat (text_t path1, text_t path2, text_t path3, text_t path4, 
+             text_t path5, text_t path6);
+
+
+// returns the proper concatenation of the two paths, as in
+// /usr/bin:/usr/local/bin (for Unix) and c:\usr\bin;c:\usr\local\bin (for windows)
+text_t pathname_cat (text_t path1, text_t path2);
+text_t pathname_cat (text_t path1, text_t path2, text_t path3);
+text_t pathname_cat (text_t path1, text_t path2, text_t path3, text_t path4);
+text_t pathname_cat (text_t path1, text_t path2, text_t path3, text_t path4, 
+             text_t path5);
+text_t pathhname_cat (text_t path1, text_t path2, text_t path3, text_t path4, 
              text_t path5, text_t path6);