vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move include, reject bom as well

Browse source
This commit is contained in:
Jan Boon 2024-04-06 00:59:34 +08:00
parent f2a4777d4a
commit 4a4f3993e7
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/common.cpp
View file

@ -16,6 +16,7 @@
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>
#include <cinttypes> #include <cinttypes>
#include <codecvt>
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
#include <sys/types.h> #include <sys/types.h>
@ -27,7 +28,6 @@
#ifndef NOMINMAX #ifndef NOMINMAX
# define NOMINMAX # define NOMINMAX
#endif #endif
#include <codecvt>
#include <locale> #include <locale>
#include <windows.h> #include <windows.h>
#include <fcntl.h> #include <fcntl.h>
@ -1528,6 +1528,7 @@ bool validate_file_name(const std::string & filename) {
// - Unicode equivalents of illegal characters // - Unicode equivalents of illegal characters
// - UTF-16 surrogate pairs // - UTF-16 surrogate pairs
// - UTF-8 replacement character // - UTF-8 replacement character
// - Byte order mark (BOM)
// - Illegal characters: / \ : * ? " < > | // - Illegal characters: / \ : * ? " < > |
for (char32_t c : filename_utf32) { for (char32_t c : filename_utf32) {
if (c <= 0x1F // Control characters (C0) if (c <= 0x1F // Control characters (C0)
@ -1538,6 +1539,7 @@ bool validate_file_name(const std::string & filename) {
|| c == 0x2216 // Set Minus (backslash equivalent) || c == 0x2216 // Set Minus (backslash equivalent)
|| (c >= 0xD800 && c <= 0xDFFF) // UTF-16 surrogate pairs || (c >= 0xD800 && c <= 0xDFFF) // UTF-16 surrogate pairs
|| c == 0xFFFD // Replacement Character (UTF-8) || c == 0xFFFD // Replacement Character (UTF-8)
|| c == 0xFEFF // Byte Order Mark (BOM)
|| c == '/' || c == '\\' || c == ':' || c == '*' // Illegal characters || c == '/' || c == '\\' || c == ':' || c == '*' // Illegal characters
|| c == '?' || c == '"' || c == '<' || c == '>' || c == '|') { || c == '?' || c == '"' || c == '<' || c == '>' || c == '|') {
return false; return false;