#include "support/os.h"
#include "support/os_win32.h"
+
#include "support/debug.h"
+#include "support/FileName.h"
#include "support/gettext.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include "support/ExceptionMessage.h"
-#include <boost/assert.hpp>
+#include "support/lassert.h"
#include <cstdlib>
#include <vector>
(LPBYTE) buf, &bufSize);
RegCloseKey(regKey);
if ((retVal == ERROR_SUCCESS) && (bufSize <= MAX_PATH))
- cygdrive = buf;
+ cygdrive = rtrim(string(buf), "/");
}
}
long_path.resize(result);
result = GetLongPathName(short_path.c_str(),
&long_path[0], long_path.size());
- BOOST_ASSERT(result <= long_path.size());
+ LASSERT(result <= long_path.size(), /**/);
}
return (result == 0) ? short_path : to_utf8(from_filesystem8bit(&long_path[0]));
// on windows_style_tex_paths_), but we use always forward slashes,
// since it gets written into a .tex file.
- if (!windows_style_tex_paths_ && is_absolute_path(p)) {
+ FileName path(p);
+ if (!windows_style_tex_paths_ && path.isAbsolute()) {
string const drive = p.substr(0, 2);
string const cygprefix = cygdrive + "/" + drive.substr(0, 1);
string const cygpath = subst(subst(p, '\\', '/'), drive, cygprefix);
}
-// (Claus H.) On Win32 both Unix and Win32/DOS pathnames are used.
-// Therefore an absolute path could be either a pathname starting
-// with a slash (Unix) or a pathname starting with a drive letter
-// followed by a colon. Because a colon is not valid in pathes in Unix
-// and at another location in Win32 testing just for the existance
-// of the colon in the 2nd position seems to be enough!
-bool is_absolute_path(string const & p)
-{
- if (p.empty())
- return false;
-
- bool isDosPath = (p.length() > 1 && p[1] == ':');
- bool isUnixPath = (p[0] == '/');
-
- return isDosPath || isUnixPath;
-}
-
-
// returns a string suitable to be passed to popen when
// reading a pipe
char const * popen_read_mode()
id = CSIDL_APPDATA;
break;
default:
- BOOST_ASSERT(false);
+ LASSERT(false, /**/);
}
HRESULT const result = (folder_path_func_)(0, id, 0,
SHGFP_TYPE_CURRENT,