Crashecho support added, few Mappath fixes, one more range check in editor fixed

This commit is contained in:
Alexander S. Aganichev
2001-05-05 21:41:41 +00:00
parent a7b00c4dc0
commit cf69e9116e
48 changed files with 226 additions and 198 deletions

View File

@@ -28,7 +28,11 @@
#include <gtimall.h>
#include <gstrall.h>
#include <gfilutil.h>
#if defined(__MINGW32__)
#include <sys/utime.h>
#else
#include <utime.h>
#endif
#if defined(__OS2__)
#define INCL_BASE
@@ -207,28 +211,29 @@ const char* AddPath(const char* path, const char* file) {
void MakePathname(char* pathname, const char* path, const char* name) {
char newpath[GMAXPATH];
Path tmpname;
Path tmppath;
strcpy(tmpname, name);
strcpy(tmppath, path);
if(strblank(tmpname)) {
*pathname = NUL;
return;
}
strbtrim(tmppath);
strchg(tmppath, GOLD_WRONG_SLASH_CHR, GOLD_SLASH_CHR);
strchg(tmpname, GOLD_WRONG_SLASH_CHR, GOLD_SLASH_CHR);
if(strpbrk(tmpname, GOLD_SLASH_STR))
strschg_environ(strxcpy(pathname, tmpname, sizeof(Path)));
else {
strcpy(newpath, tmppath);
if(*newpath)
AddBackslash(newpath);
strxmerge(pathname, sizeof(Path), newpath, tmpname, NULL);
if(strpbrk(tmpname, GOLD_SLASH_STR)) {
strxcpy(pathname, tmpname, sizeof(Path));
}
else {
Path tmppath;
strcpy(tmppath, path);
strbtrim(tmppath);
strchg(tmppath, GOLD_WRONG_SLASH_CHR, GOLD_SLASH_CHR);
if(*tmppath)
AddBackslash(tmppath);
strxmerge(pathname, sizeof(Path), tmppath, tmpname, NULL);
}
strschg_environ(pathname);
}

View File

@@ -53,7 +53,6 @@ string& AddBackslash(string& p) {
void MakePathname(string& pathname, const string& path, const string& name) {
Path pn;
strcpy(pn, pathname.c_str());
MakePathname(pn, path.c_str(), name.c_str());
pathname = pn;
}