Merge branch 'master' into file-read-mode-fix

Conflicts:
	vlsv_reader.cpp

Author: sandroos

portable_file_io.cpp

@@ -2,7 +2,8 @@
 * for some of the functions defined in Linux header unistd.h. In Windows 
 * systems define preprocessor macro "WINDOWS".
 *
-*  Copyright 2015 Arto Sandroos
+*  Copyright 2015-2016 Arto Sandroos
+*  Copyright 2016 Finnish Meteorological Institute
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU Lesser General Public License as published by
@@ -16,37 +17,37 @@
 *
 *  You should have received a copy of the GNU Lesser General Public License
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <cstdlib>
-
-#ifdef WINDOWS
+*/
+
+#include <cstdlib>
+
+#ifdef WINDOWS
    #include <direct.h>
-   #include <io.h>
-#else
-   #include <unistd.h>
-#endif
-
-#include "portable_file_io.h"
-
-using namespace std;
-
-namespace fileio {
-
-	int chdir(const char* path) {
-		#ifdef WINDOWS
-			return _chdir(path);
-		#else
-			return chdir(path);
-		#endif
-	}
-
-	char* getcwd(char* buf, size_t size) {
-		#ifdef WINDOWS
-			return _getcwd(buf,size);
-		#else
-			return getcwd(buf,size);
-		#endif
-	}
-
-} // namespace fileio
+   #include <io.h>
+#else
+   #include <unistd.h>
+#endif
+
+#include "portable_file_io.h"
+
+using namespace std;
+
+namespace fileio {
+
+	int chdir(const char* path) {
+		#ifdef WINDOWS
+			return _chdir(path);
+		#else
+			return ::chdir(path);
+		#endif
+	}
+
+	char* getcwd(char* buf, size_t size) {
+		#ifdef WINDOWS
+			return _getcwd(buf,size);
+		#else
+			return ::getcwd(buf,size);
+		#endif
+	}
+
+} // namespace fileio

vlsv_reader.cpp

@@ -1,6 +1,7 @@
 /** This file is part of VLSV file format.
  * 
- *  Copyright 2011-2013 Finnish Meteorological Institute
+ *  Copyright 2011-2015 Finnish Meteorological Institute
+ *  Copyright 2016 Arto Sandroos
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -155,7 +156,7 @@ namespace vlsv {
          #endif
          return false;
       }
-   
+
       // If given filename includes path, chdir into that path:
       string fnameWithoutPath;
       string pathName;
@@ -168,13 +169,14 @@ namespace vlsv {
          } else {
             pathName = fname.substr(0,position);
             fnameWithoutPath = fname.substr(position+1);
+            // Chdir to path containing input file and attempt to open the file, 
+            // then chdir back to current working directory. 
+            // Chdir returns zero value if it succeeds
+            // Not done if the string is empty as chdir fials in that case.
+            if (fileio::chdir(pathName.c_str()) != 0) success = false;
          }
       }
 
-      // Chdir to path containing input file and attempt to open the file, 
-      // then chdir back to current working directory. 
-      // Chdir returns zero value if it succeeds
-      if (fileio::chdir(pathName.c_str()) != 0) success = false;
       filein.open(fnameWithoutPath.c_str(), fstream::in | fstream::binary);
       if (fileio::chdir(cwd) != 0) success = false;
 
@@ -185,6 +187,7 @@ namespace vlsv {
          filein.close();
          success = false;
       }
+
       if (success == false) {
          #ifndef NDEBUG
             cerr << "vlsv::Reader ERROR: File '" << fnameWithoutPath << "' could not be opened!" << endl;