8000 options, refactor: update string helper function to handle paths corr… · fibjs/fibjs@48ea014 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 48ea014

Browse files
xicilionxicilion
committed
options, refactor: update string helper function to handle paths correctly.
1 parent 188b2a4 commit 48ea014

File tree

2 files changed

+29
-19
lines changed

2 files changed

+29
-19
lines changed

‎fibjs/scripts/internal/helpers/string.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
exports.find_least_common_str = function (str1 = '', str2 = '') {
2-
let idx = 0;
3-
while (str1[idx] === str2[idx]) idx++;
2+
var idx = 0;
3+
var str1_parts = str1.split('/');
4+
var str2_parts = str2.split('/');
45

5-
return str1.slice(0, idx);
6+
while (idx < str1_parts.length - 1 && str1_parts[idx] === str2_parts[idx])
7+
idx++;
8+
9+
if (idx === 0)
10+
return '';
11+
12+
return str1_parts.slice(0, idx).join('/') + '/';
613
}
714

815
exports.ensure_prefix = function (base = '', prefix = '/') {

‎fibjs/src/base/opt_tools.cpp

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2123,21 +2123,24 @@ static const unsigned char dat_11[] = {
21232123
0xb9, 0x72, 0xad, 0xf7, 0xbf, 0x01, 0xff, 0xb9, 0xad, 0xb6, 0};
21242124

21252125
static const unsigned char dat_12[] = {
2126-
0x78, 0x9c, 0x95, 0x92, 0x4d, 0x4e, 0xc3, 0x30, 0x10, 0x85, 0xf7, 0x3e, 0x85, 0x59, 0x25, 0x56, 0x4a, 0x68, 0xd9, 0x46,
2127-
0x39, 0x00, 0x2b, 0x0e, 0x80, 0x50, 0x54, 0x92, 0x31, 0xb5, 0x94, 0x8e, 0x2b, 0xff, 0x88, 0x48, 0x88, 0xbb, 0x33, 0xfe,
2128-
0x21, 0x6a, 0xaa, 0x54, 0xb4, 0x5e, 0xd9, 0x6f, 0xde, 0x4c, 0x3e, 0xbf, 0x18, 0xa6, 0x93, 0x36, 0xce, 0xd6, 0x52, 0xe1,
2129-
0xd0, 0x8d, 0xb0, 0xb7, 0xae, 0xeb, 0xf5, 0xf1, 0xa8, 0xb1, 0xb3, 0xce, 0xf0, 0x96, 0x4b, 0x8f, 0xbd, 0x53, 0x1a, 0x79,
2130-
0x49, 0xe7, 0x1d, 0x09, 0x45, 0xb1, 0xe1, 0xb4, 0x7d, 0x8e, 0x5b, 0xc1, 0xbf, 0x19, 0xa7, 0x35, 0x82, 0xe3, 0x6a, 0x98,
2131-
0x48, 0xdb, 0x36, 0x51, 0xf8, 0x3a, 0xa8, 0x11, 0x52, 0xcf, 0x1b, 0x15, 0xde, 0x79, 0xdb, 0xb6, 0xb1, 0x2d, 0x9e, 0x44,
2132-
0x30, 0x57, 0x55, 0xc3, 0xa2, 0xd7, 0x80, 0xf3, 0x06, 0x43, 0x75, 0x57, 0xdb, 0x51, 0xf5, 0x50, 0x6e, 0x37, 0xc1, 0x20,
2133-
0x1a, 0xf6, 0xc3, 0x18, 0x64, 0x40, 0x40, 0xeb, 0x0d, 0x74, 0x27, 0x03, 0x52, 0x4d, 0x0b, 0xb0, 0x8f, 0xbd, 0x85, 0x0c,
2134-
0x36, 0x57, 0x8b, 0xa7, 0x99, 0x4d, 0xc9, 0x64, 0xc9, 0xb3, 0x93, 0xa5, 0x1e, 0x01, 0x3f, 0xdd, 0x41, 0xf0, 0x07, 0xe2,
2135-
0x4a, 0x92, 0x88, 0xee, 0xb0, 0xf2, 0xc0, 0x3c, 0xac, 0x8a, 0xe7, 0x05, 0x6a, 0x10, 0xd6, 0xe0, 0x3c, 0xde, 0x8f, 0xd7,
2136-
0x6b, 0xb4, 0x8e, 0x02, 0xc4, 0xf9, 0x8b, 0x99, 0x6d, 0x0d, 0x9e, 0x82, 0xa1, 0xa2, 0x88, 0x69, 0x5e, 0xa1, 0x3e, 0x73,
2137-
0x07, 0xeb, 0x4d, 0xdc, 0xd6, 0x4b, 0x79, 0x15, 0x3a, 0x14, 0xff, 0xc9, 0x34, 0x6e, 0x13, 0x35, 0x7f, 0xcc, 0x0d, 0x8b,
2138-
0x84, 0x93, 0x74, 0xc1, 0x5a, 0xfd, 0xe9, 0x37, 0x66, 0x7b, 0x37, 0x65, 0x8e, 0x36, 0x3d, 0xcc, 0xc4, 0x48, 0xef, 0xfb,
2139-
0x05, 0x07, 0x98, 0x5e, 0x65, 0x79, 0xce, 0x74, 0x71, 0x9f, 0xd0, 0x92, 0x42, 0x5e, 0x05, 0x5f, 0x84, 0x1c, 0x7e, 0x49,
2140-
0xb0, 0xaf, 0x5f, 0xe2, 0x17, 0x36, 0xd4, 0x08, 0xc9, 0};
2126+
0x78, 0x9c, 0x95, 0x53, 0x41, 0x6e, 0x83, 0x30, 0x10, 0xbc, 0xf3, 0x8a, 0xed, 0x25, 0x80, 0x48, 0x69, 0x92, 0x6b, 0xca,
2127+
0x03, 0x7a, 0xea, 0x03, 0xaa, 0x0a, 0x51, 0x62, 0x37, 0x8e, 0x88, 0x41, 0xb6, 0x69, 0x91, 0xa2, 0xfe, 0xbd, 0xbb, 0xb6,
2128+
0x4b, 0x4c, 0x44, 0xd4, 0x84, 0x0b, 0xde, 0xf1, 0xec, 0x78, 0x76, 0xc0, 0x6c, 0xe8, 0x5a, 0x65, 0x74, 0xce, 0x85, 0xdc,
2129+
0x95, 0x0d, 0xab, 0xb4, 0x29, 0xeb, 0xf6, 0x78, 0x6c, 0x65, 0xa9, 0x8d, 0x82, 0x02, 0x78, 0x2f, 0x6b, 0x23, 0x5a, 0x09,
2130+
0x09, 0xd6, 0x6b, 0x04, 0xe2, 0x78, 0x09, 0xb8, 0xdc, 0xd8, 0x65, 0x0a, 0xa7, 0x08, 0xf0, 0xf9, 0xaa, 0x14, 0x88, 0xdd,
2131+
0x80, 0xd8, 0x6a, 0x3b, 0x02, 0xd4, 0x50, 0x76, 0x15, 0xaa, 0x23, 0x4e, 0x45, 0xae, 0xbb, 0x46, 0x98, 0x24, 0x7e, 0x8a,
2132+
0xd3, 0x09, 0x6b, 0x13, 0xb2, 0x36, 0x13, 0x96, 0xa5, 0x7d, 0xef, 0x45, 0xc3, 0x20, 0xa1, 0x03, 0x9e, 0x03, 0xd5, 0xbc,
2133+
0x61, 0xf2, 0xd3, 0xec, 0xe1, 0x11, 0xd6, 0xb0, 0x58, 0x04, 0x1b, 0x6f, 0xc8, 0x7c, 0x87, 0xa2, 0x28, 0x02, 0x71, 0x8b,
2134+
0xa5, 0x56, 0x8e, 0x1e, 0xac, 0xb2, 0xcc, 0xcb, 0x0b, 0xee, 0xb4, 0xa9, 0x61, 0x75, 0xa6, 0x28, 0x66, 0x7a, 0x25, 0x71,
2135+
0x48, 0x4f, 0xf3, 0x75, 0x70, 0xbe, 0x6e, 0x44, 0xcd, 0x92, 0xd5, 0x92, 0xd4, 0xd2, 0xfc, 0xd0, 0x0a, 0x69, 0x5d, 0x43,
2136+
0x06, 0xf8, 0xda, 0x46, 0x3f, 0x51, 0xc4, 0x7c, 0xba, 0x4c, 0xea, 0x5e, 0xb1, 0xb2, 0x53, 0x8c, 0x8b, 0x61, 0x92, 0xea,
2137+
0x47, 0xa5, 0x99, 0x4f, 0x75, 0xdc, 0xb5, 0x22, 0xa7, 0xd1, 0x1b, 0x51, 0xfc, 0x59, 0x8e, 0xe2, 0x07, 0x4f, 0xe1, 0x01,
2138+
0x1d, 0x3b, 0xe8, 0x6c, 0xdb, 0x0b, 0x7a, 0xb1, 0xcc, 0xd6, 0x93, 0x01, 0x08, 0x98, 0x33, 0xd7, 0xcb, 0xfb, 0xed, 0xd5,
2139+
0xad, 0xd4, 0x06, 0xd0, 0xce, 0x78, 0xa2, 0xf7, 0x36, 0x67, 0x1e, 0x83, 0xc2, 0xcd, 0xd4, 0xe6, 0x7c, 0xc5, 0x75, 0xc0,
2140+
0x26, 0xea, 0x4d, 0xbe, 0x75, 0xcf, 0xf9, 0x55, 0xd3, 0xb4, 0xf9, 0x4f, 0xa6, 0x76, 0x39, 0xfe, 0x4a, 0xae, 0x61, 0x92,
2141+
0xb0, 0x83, 0x2e, 0xbc, 0x66, 0x7f, 0xf8, 0x8d, 0xd9, 0xde, 0xed, 0xd2, 0x47, 0xeb, 0x6e, 0x95, 0xf3, 0x88, 0x97, 0xf3,
2142+
0x45, 0xee, 0xd8, 0xf0, 0xca, 0x93, 0xd0, 0xd3, 0xc5, 0x3c, 0xd4, 0xe2, 0x42, 0x9e, 0x35, 0x3e, 0x09, 0x99, 0x3e, 0x09,
2143+
0xd1, 0xe7, 0x87, 0xf8, 0x05, 0x6d, 0x62, 0x3e, 0x13, 0};
21412144

21422145
static const unsigned char dat_13[] = {
21432146
0x78, 0x9c, 0xcd, 0x59, 0x51, 0x73, 0xd3, 0x38, 0x10, 0x7e, 0xef, 0xaf, 0x10, 0x99, 0x39, 0x6a, 0x37, 0x89, 0xdb, 0xa4,
@@ -3995,7 +3998,7 @@ const OptData opt_tools[] = {
39953998
{"internal/helpers/napi", 1850, (const char*)dat_9},
39963999
{"internal/helpers/package", 1152, (const char*)dat_10},
39974000
{"internal/helpers/semver", 10070, (const char*)dat_11},
3998-
{"internal/helpers/string", 289, (const char*)dat_12},
4001+
{"internal/helpers/string", 349, (const char*)dat_12},
39994002
{"internal/helpers/untar", 2055, (const char*)dat_13},
40004003
{"internal/helpers/versioning", 4220, (const char*)dat_14},
40014004
{"internal/primordials", 4915, (const char*)dat_15},

0 commit comments

Comments
 (0)
0