Changeset 21404 for main/trunk/greenstone2/common-src/src/lib/fileutil.h

Timestamp:

2010-01-04T17:43:22+13:00 (14 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

File:

• main/trunk/greenstone2/common-src/src/lib/fileutil.h (modified) (2 diffs)

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);