Showing the changes to src/core/util_string.cpp (1 of 20 files). Show all
Unified · Split
| @@ -239,7 +239,7 @@ t_CKBOOL extract_args( const string & token, · 238 unmodified lines | |||
| 239 | // ignore second character as arg separator if its : on Windows | 239 | // ignore second character as arg separator if its : on Windows |
| 240 | t_CKBOOL ignoreSecond = FALSE; | 240 | t_CKBOOL ignoreSecond = FALSE; |
| 241 | #ifdef __PLATFORM_WIN32__ | 241 | #ifdef __PLATFORM_WIN32__ |
| 242 | ignoreSecond = TRUE; | 242 | ignoreSecond = TRUE; |
| 243 | #endif // __PLATFORM_WIN32__ | 243 | #endif // __PLATFORM_WIN32__ |
| 244 | 244 | ||
| 245 | // detect | 245 | // detect |
| @@ -482,17 +482,17 @@ std::string get_full_path( const std::string & fp ) · 236 unmodified lines | |||
| 482 | 482 | ||
| 483 | #else // | 483 | #else // |
| 484 | 484 | ||
| 485 | char buf[MAX_PATH]; | 485 | char buf[MAX_PATH]; |
| 486 | DWORD result = GetFullPathName(fp.c_str(), MAX_PATH, buf, NULL); | 486 | DWORD result = GetFullPathName(fp.c_str(), MAX_PATH, buf, NULL); |
| 487 | 487 | ||
| 488 | // try with .ck extension | 488 | // try with .ck extension |
| 489 | if(result == 0 && !str_endsin(fp.c_str(), ".ck")) | 489 | if(result == 0 && !str_endsin(fp.c_str(), ".ck")) |
| 490 | result = GetFullPathName((fp + ".ck").c_str(), MAX_PATH, buf, NULL); | 490 | result = GetFullPathName((fp + ".ck").c_str(), MAX_PATH, buf, NULL); |
| 491 | 491 | ||
| 492 | if(result == 0) | 492 | if(result == 0) |
| 493 | return fp; | 493 | return fp; |
| 494 | else | 494 | else |
| 495 | return normalize_directory_separator(buf); | 495 | return normalize_directory_separator(buf); |
| 496 | 496 | ||
| 497 | #endif // __PLATFORM_WIN32__ | 497 | #endif // __PLATFORM_WIN32__ |
| 498 | } | 498 | } |