X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothur.h;h=8065dd4cc74284f11dbca4808eb2c8893a74b7c8;hb=c3f0a9c8f932b923f3a6fbbf143e8f4b85fd6f5f;hp=6381e51d626246244b5ce077b9b077337cfc42d8;hpb=315e38cf393c82be238da5b32574f225a020d25c;p=mothur.git diff --git a/mothur.h b/mothur.h index 6381e51..8065dd4 100644 --- a/mothur.h +++ b/mothur.h @@ -489,7 +489,7 @@ inline bool isBlank(string fileName){ inline string getFullPathName(string fileName){ string path = hasPath(fileName); - string newFileName = getSimpleName(fileName); + string newFileName; int pos; if (path == "") { return fileName; } //its a simple name @@ -501,6 +501,7 @@ inline string getFullPathName(string fileName){ //get current working directory #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) if (path.rfind("./") == -1) { return fileName; } //already complete name + else { newFileName = fileName.substr(fileName.rfind("./")+2); } //save the complete part of the name char* cwdpath; size_t size; @@ -543,6 +544,7 @@ inline string getFullPathName(string fileName){ #else if (path.rfind(".\\") == -1) { return fileName; } //already complete name + else { newFileName = fileName.substr(fileName.rfind(".\\")+2); } //save the complete part of the name char *cwdpath = NULL; cwdpath = getcwd(NULL, 0); // or _getcwd