[Cmake-commits] [cmake-commits] hoffman committed SystemTools.cxx 1.222.2.6 1.222.2.7 SystemTools.hxx.in 1.72.2.3 1.72.2.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Mar 23 13:58:52 EDT 2009
Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv2063/Source/kwsys
Modified Files:
Tag: CMake-2-6
SystemTools.cxx SystemTools.hxx.in
Log Message:
ENH: check in changes to branch, most importantly the header file do not compile fix
Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.222.2.6
retrieving revision 1.222.2.7
diff -C 2 -d -r1.222.2.6 -r1.222.2.7
*** SystemTools.cxx 13 Jan 2009 18:03:54 -0000 1.222.2.6
--- SystemTools.cxx 23 Mar 2009 17:58:49 -0000 1.222.2.7
***************
*** 206,209 ****
--- 206,213 ----
KWSYS_NAMESPACE::SystemTools::ConvertToUnixSlashes(resolved_path);
}
+ else
+ {
+ resolved_path = path;
+ }
}
#else
***************
*** 238,243 ****
char resolved_name[KWSYS_SYSTEMTOOLS_MAXPATH];
! realpath(path, resolved_name);
! resolved_path = resolved_name;
}
#endif
--- 242,255 ----
char resolved_name[KWSYS_SYSTEMTOOLS_MAXPATH];
! char *ret = realpath(path, resolved_name);
! if(ret)
! {
! resolved_path = ret;
! }
! else
! {
! // if path resolution fails, return what was passed in
! resolved_path = path;
! }
}
#endif
***************
*** 3047,3050 ****
--- 3059,3067 ----
return p;
}
+ // Use original path if conversion back to a long path failed.
+ if(longPath == shortPath)
+ {
+ longPath = p;
+ }
// make sure drive letter is always upper case
if(longPath.size() > 1 && longPath[1] == ':')
Index: SystemTools.hxx.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.hxx.in,v
retrieving revision 1.72.2.3
retrieving revision 1.72.2.4
diff -C 2 -d -r1.72.2.3 -r1.72.2.4
*** SystemTools.hxx.in 13 Jan 2009 18:03:54 -0000 1.72.2.3
--- SystemTools.hxx.in 23 Mar 2009 17:58:49 -0000 1.72.2.4
***************
*** 352,356 ****
/**
! * Get the real path for a given path, removing all symlinks.
*/
static kwsys_stl::string GetRealPath(const char* path);
--- 352,358 ----
/**
! * Get the real path for a given path, removing all symlinks. In
! * the event of an error (non-existent path, permissions issue,
! * etc.) the original path is returned.
*/
static kwsys_stl::string GetRealPath(const char* path);
More information about the Cmake-commits
mailing list