From 37044678716d242bbe9d3f79b11f79f04dcc6fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sat, 6 Apr 2024 14:38:04 +0900 Subject: [PATCH 01/13] chore: optimize statements --- .github/workflows/test.yml | 2 +- base16384.c | 6 +++--- test/coder_test.c | 6 +++--- test/file_test.c | 16 +++------------- test/file_test.h | 10 ++++++++++ test/wrap_test.c | 16 +++------------- 6 files changed, 23 insertions(+), 33 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ced3f8f..849628b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,5 @@ name: test -on: [ push ] +on: [ push, pull_request ] jobs: test: diff --git a/base16384.c b/base16384.c index 05756b2..53bff16 100644 --- a/base16384.c +++ b/base16384.c @@ -27,11 +27,11 @@ #endif #include "base16384.h" -char encbuf[BASE16384_ENCBUFSZ]; -char decbuf[BASE16384_DECBUFSZ]; +static char encbuf[BASE16384_ENCBUFSZ]; +static char decbuf[BASE16384_DECBUFSZ]; #ifndef _WIN32 -unsigned long get_start_ms() { +static unsigned long get_start_ms() { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); return (ts.tv_sec * 1000 + ts.tv_nsec / 1000000); diff --git a/test/coder_test.c b/test/coder_test.c index d20674a..de160ea 100644 --- a/test/coder_test.c +++ b/test/coder_test.c @@ -26,9 +26,9 @@ #define TEST_SIZE (4096) -char encbuf[TEST_SIZE+16]; -char decbuf[TEST_SIZE/7*8+16]; -char tstbuf[TEST_SIZE+16]; +static char encbuf[TEST_SIZE+16]; +static char decbuf[TEST_SIZE/7*8+16]; +static char tstbuf[TEST_SIZE+16]; #define loop_diff(target) \ for(i = start; i < end; i++) { \ diff --git a/test/file_test.c b/test/file_test.c index 0e69266..8910277 100644 --- a/test/file_test.c +++ b/test/file_test.c @@ -39,19 +39,9 @@ #define TEST_OUTPUT_FILENAME "file_test_output.bin" #define TEST_VALIDATE_FILENAME "file_test_validate.bin" -char encbuf[BASE16384_ENCBUFSZ]; -char decbuf[BASE16384_DECBUFSZ]; -char tstbuf[BASE16384_ENCBUFSZ]; - -#define init_input_file() \ - for(i = 0; i < BASE16384_ENCBUFSZ; i += sizeof(int)) { \ - *(int*)(&encbuf[i]) = rand(); \ - } \ - fp = fopen(TEST_INPUT_FILENAME, "wb"); \ - ok(!fp, "fopen"); \ - ok(fwrite(encbuf, BASE16384_ENCBUFSZ, 1, fp) != 1, "fwrite"); \ - ok(fclose(fp), "fclose"); \ - fputs("input file created.\n", stderr); +static char encbuf[BASE16384_ENCBUFSZ]; +static char decbuf[BASE16384_DECBUFSZ]; +static char tstbuf[BASE16384_ENCBUFSZ]; #define test_file_detailed(flag) \ fputs("testing base16384_en/decode_file with flag "#flag"...\n", stderr); \ diff --git a/test/file_test.h b/test/file_test.h index fd97f4d..2109bd8 100644 --- a/test/file_test.h +++ b/test/file_test.h @@ -82,4 +82,14 @@ return 1; \ } +#define init_input_file() \ + for(i = 0; i < BASE16384_ENCBUFSZ; i += sizeof(int)) { \ + *(int*)(&encbuf[i]) = rand(); \ + } \ + fp = fopen(TEST_INPUT_FILENAME, "wb"); \ + ok(!fp, "fopen"); \ + ok(fwrite(encbuf, BASE16384_ENCBUFSZ, 1, fp) != 1, "fwrite"); \ + ok(fclose(fp), "fclose"); \ + fputs("input file created.\n", stderr); + #endif \ No newline at end of file diff --git a/test/wrap_test.c b/test/wrap_test.c index 2e87067..6cf84cd 100644 --- a/test/wrap_test.c +++ b/test/wrap_test.c @@ -39,19 +39,9 @@ #define TEST_OUTPUT_FILENAME "wrap_test_output.bin" #define TEST_VALIDATE_FILENAME "wrap_test_validate.bin" -char encbuf[BASE16384_ENCBUFSZ]; -char decbuf[BASE16384_DECBUFSZ]; -char tstbuf[BASE16384_ENCBUFSZ]; - -#define init_input_file() \ - for(i = 0; i < BASE16384_ENCBUFSZ; i += sizeof(int)) { \ - *(int*)(&encbuf[i]) = rand(); \ - } \ - fp = fopen(TEST_INPUT_FILENAME, "wb"); \ - ok(!fp, "fopen"); \ - ok(fwrite(encbuf, BASE16384_ENCBUFSZ, 1, fp) != 1, "fwrite"); \ - ok(fclose(fp), "fclose"); \ - fputs("input file created.\n", stderr); +static char encbuf[BASE16384_ENCBUFSZ]; +static char decbuf[BASE16384_DECBUFSZ]; +static char tstbuf[BASE16384_ENCBUFSZ]; int main() { srand(time(NULL)); From ea8740ed4ca46dcdb3a41d61166fa859a46cab56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sat, 6 Apr 2024 15:04:44 +0900 Subject: [PATCH 02/13] chore: optimize documents --- CMakeLists.txt | 2 +- README.md | 10 +++++----- base16384.1 | 4 ++-- base16384.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fdd0ff..6309b8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ endif (POLICY CMP0048) project(base16384 VERSION 2.3.0) add_definitions(-DBASE16384_VERSION="${PROJECT_VERSION}") -add_definitions(-DBASE16384_VERSION_DATE="April 5th 2024") +add_definitions(-DBASE16384_VERSION_DATE="April 6th 2024") message(STATUS "Testing endian...") include(TestBigEndian) diff --git a/README.md b/README.md index 32f9ee9..fbb46b7 100644 --- a/README.md +++ b/README.md @@ -75,13 +75,13 @@ Now you can encode/decode a file by commands below. 现在可以使用命令对文件进行编码/解码。 ```kotlin -Usage: -base16384 [-edtn] [inputfile] [outputfile] +base16384 -[ed][t][n][cC] [inputfile] [outputfile] -e encode (default) -d decode -t show spend time - -n don't write utf16be file header (0xFEFF) + -n donot write utf16be file header (0xFEFF) -c embed or validate checksum in remainder + -C do -c forcely inputfile pass - to read from stdin outputfile pass - to write to stdout ``` @@ -107,8 +107,8 @@ base16384 [-edtn] [inputfile] [outputfile] 3. Encode file > 编码文件 - The text below is the encoding of the base16384 itself on MacOS 12.6 arm64. It is clear to see the strucutre of the binary file. + The text below is the encoding of the base16384 itself (v2.2.0) on MacOS 12.6 arm64. It is clear to see the strucutre of the binary file. - 下面的文本是使用base16384程序在 MacOS Mojave 版本下编码自身的结果。可见文件结构十分清晰。 + 下面的文本是使用base16384程序在 MacOS Mojave 版本下编码自身(v2.2.0)的结果。可见文件结构十分清晰。 臾糟蘜一乀縀倀倀一仰一习佀丈戀渀一一乤一丒一丁浟成扴捩卒懀一一一一一一一一一一伀一一一一一一一一一一一一一一一一一一一丙一不渄一旗荄捡戀一一一一一一一丁一一亀一一一一一一一一丠一一一丅一一戀一佀一一一丗菷徕虴一一一一一丅譽扅搕一一一一一丂爋一丐一仈刀一一一眂縀丈一一一一一一一市一一一一一一一佽浳欝搧娀一一一一也旕剕潐一一一一一丛俀一伀一唠一一一丆繰一乀一一一一一一嘄丠一一丆一一一一旗蔷忕灟栙擇侕耀一叵譑単挀一一一一一冀樀一帀七尀一一一仠唀一嘀一一一一一一乀倀一一一一一一丅譽煳欜璖螜一一一丁浟挑掅帀一一一一一禇帀丄一丸帐一一一壡舀一一一一一一一丈一一一一一一一一也旝擧殥籤旚擦枼一丗菵引晔一一一一一三乼一乀一俀一一一丂帟一丠一一一一一一一一一一一一一一一侐一予乀丅譽剁挐帀一一一一一丠一丐一一刈一一一丈一一一一伀一一一丰一七一一帀一一一佽浮椗蔷玵灯椗蔇忈也旑刕弄一一一一一一倀一伀一亀一一一一亀一什一一一一一一吀一估一一一一一一旗葶诐一一一一一一叵謑佔幀一一一一一丠渀一帀一昀一一一丈嘀一娀一一一一一丁渀一戀一一一一一丅譽穡旜薖莉絬旜啇嘁浟弐捄刀一一一一一嘈一丄一並一一一一倂一七一一一一一一东一丅縀一一一一一也旘蓶莵絮一一一一丗菴弅扁一一一一一丌亀一乀一丰丠一一一一一乀一一一一一一乀一一一一一一一一侐一么一丅譽婉憒艔弥戀一一一丰嘀丐一一刀一一一丌一一一丼习一一一丐一丁一一一一一一予一渌一一丰一亀一丈娀七一一一一一一与儀一币一劃刀付一一嘀一吀一你耀三一丁丵一夀刀下一丅一一一一丄一一帀一嬀一仠一世一一一一一一一一一一一一一一一亘嬀丂瘀一一一一一一一一一一仠一丠一一縀一姝攷嚽穩暋葇玱爀一一一丛一丁渀一斪罒跻舷圪讫惙硗垚愠一丠一一刀一七溠一崊一帀一儀一一么倪一丁一一一一一一上一倀昀一峀稀一一一一一一一丰一与一一昀一丠一一一幐一伀姝攷嚽穩暋蓆玉慹櫝呖芹倮朞擆玈一一一亘一丄一一渲一侀一丩一丁一一尌渀亀一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一丁捈灹挴瀏稘怣揞烼吀一劈畻皮刀丄澤姨什丄烣椴箵蘭虭先诚纄瀧幈繺凴焇蠒怣幀圠俈怠詁潭毃捒嚞挅敁掐捅嬢凬删跰忔蝉災劈筸嚀峋敒茢域蠮伀丂埁滸淨巤偵媑嚧稅侀距啓怏蘂歟粇蘈一簿淿跿礊蠜渠丂蛿跿跴瀏刐擐揄卹佟数貅稈一簿緿跿秧滾丰谖夀一嘇稉舏潞縐丁嚍整姰昀一怢毮熰崀丒咐綠儀丒妍竒蓗溷澴嬣蕫倒暝朢埐怰沃謧俾劒帜朤俎裒劈荷庿侀一伢埞蠬仰丁嚸蓍奭氋氛廒嵶稡垉莒咐嶠儀丒嚝匣俩巒樟虉圁膒帜朦奄圂剈矠僫仑感朄嶾翠趆忐皃谙廸敘一丒暷纐幉烝偁漢嬕粄缀伢嬍盄縀冣码一岱茦奼圄劘篐爘怣彙穌帀怣廘幌一蠼繐丁侉翓晟柑晅潿蕕嬦奄圆周嫠筴怒囕蕂贆一丄瀧注亃縀伡眳蠀縀伢蛛嬭筸奸楃怽蒰漢埐怰沃謣俺劒东地矶怀此瀴謔刀七唃瘓净七唁厅跃虉添跿幣承谏蘆毑劈舷昀一劆娒佈乲巾伢嬽譃縀冣欎一妀刀一衚巯跿盐一下燯跿跺掟觿跨繀一僣諿跿貔移跿怣懘湀一蠪廠丁劉谺慯觿赈煏檐言仨獃渀僠倀一岒击跿怣懝娼一蠟绠丂蘃一与爫賿跒囓蕰崀为咐蘀亸伀一冧苽跿芈苷洏一岅娸一簁帀七矞赿跴瀴诧净与滴尀丮习一仩耿淿謢嬽覃縀冠甎一妀樀一衬緟跼崟丌淿跽蟿跿蛿跿趥跿跻緿跿艿跿趟跿跕抈疕嚍嵵绰七盺兀丄瀴謘刀与熸嬀丒囓苘帀为尠舀么煏慱一仨莃帀伢嬽射一冣堍一劈苵倐一岋蘴一怣懕繀一敺椐舀亐爤協瀧獁提捤单佔拒嘞肠一丒暜茦埖怢涶栌购怢敜濔捈灼犈獷幈烁橱一乌烈儜疬荈煭意跿赈灷貆訴一幯縐一亅縃虖済一怢苙伢叉凢厰嘀么灗欄拇版烕檆栌蠭歃劈稖吐一勈竣礘怢檴瀴菭净丄瀧旨蛃一伢埙恢橴萗贏漪帀丁嚅聃虊稀一怠涐刀帀凣柠一么灓樄瀭诐婽焜冣弌一噜举嘹乀丈甌翿愢葜伲埦粀帀丂蜂一丄吧久婲沉舰一怠趏訾刚乀丈獷幉曳劆畆愤恤犌喨湄乸皝唇真繾渠唪嬜荀一一矚幣捁懾出佃虰娄一怣廙訄一怘罉匠俊跸犘甚凋侺涰一乁緀渀七睩乀丄萗牵唒囓扤崀丒嚷蕃瘋儀丄琧剈潰仸悤一丯跠一乌灿粏測一緿縀丁媉趺岰稀亾乀一僫諿净勈痝媉虺寀稀么潰啂謲執灱狈疪蜸恄渎濤唀丒吿僨伀一勈疽媉豺妀稀么潰啛膧洀一劈笗噦滎僗帡媉跺嗠稀久婿芈笗幦滎僐谓倀一勈疟癥僀与瓔一丐槰戀一衪渀丁便侀一冦洀一创訌一为杀一义灱瘼娣礓恢橮稹垉羠誰憬呉灱瘼娪凃启跠一乌灿粂昬一緿縀丁媉趺侐稀乌災苈算乄灹狈疪埙蠯繠丁噣訮渐一乌灻苈痧盾傀丄瀗乴墓嚟欲埦蠾溠丁嚋彲周嫠筴倓嚟趢谊一嚷蕃皰傀丄拇跫侐槰帀一弢涄瀇动一丅笅橁敐揤卽毃枤启跿赪趿跶移跿捿跿譗跿跚緿跽捈灹戕欅摁挔芈旽艶恢浴瀗葴歒暜蜢埓恢淋跸一专嚟覡渊一姿言一愢淮潌堀丯渐一人贿绰伢域愢氞漐堀丒噜俐赈灷蚜朲埲籎劑嘃盡佀丄澏纺乀一伲執愢涞満堀丒噜俖誸伀一冬庸什一冬垸亀一冬倱縖舕缅汁旗樵挢埥幕舕朅捁挔茈旽虨幢浸旙虨恢櫤琧捁灿劈苗嘌一妠嘀一弢淾渜堀丮総証乄灹苈疻盟偀丄瀗乴嵓嚞谧呌灼禓漤怀蠓乐丁噣萑嚟謲埶怢殮焼圀丒冝濷冸伀一冬庸什一冬垸亀一冬倱縒嘼帡楁攐揔卹佟数荔瀧獁提捤单佔拒嘞肠一丒暜缢坕縒暟挢埻枠臲菔恈灗欄瀬厢儀丄耬縱蓺腴瀶茰跿跴瀧淨悂帀伆贁一丈攀嶅搀渀伢奍爒噜爾噋亀丄瀧噈灗欄拇葈灲葤名謀奓嚖蔡茌怢繕爰一愢膎穉嚍孰纰丁媉觺妐渀义灱苈箷乍潿绸慈一丒噝稾勔一丄瀇褁丄一谷唀一劈篷帱讌樎炨嘀両樀谣吁一刘甘翿怢毫瘄一丮帠一乁灰剓唧癹倀丄瀏蛿凡塰刀义灱嚝甇蜟繺忐啦埈繾丸嶇蘩繠訑勇乁渏偏蘾拀恣懄张俀灷炜朲埪蠁习丁噣訮渐一乌灻苈痧瘟倀丄瀗丏漆縐丁媉蟒嚝覠攈一劈笗噦滎僗帡媉跺宰樀乄災貌舜一彌淾狔伀丐槰嘀一衊渐丁宅讝忄瀴菅傀丄瀭诐蠭繰丁垉羒噜举刃乀丄耧藨畁縀价谀一啐眲執蠣湰七礊灱苈痛盖俀下蘄一丮渀乀乌灹苈症癿俀丄瀧内蓃蛨樀一愢浾潨唀丠趏译劃谏敓挲執蠒买丂叀欌芈略囁虈劋瘀一一帀丁嘁艒吽嬇各匏曕稉囁豈刘渐嫫傢橴耧蓨杁縀伲埧灷狈疪蜑七渎熤刀丒吿僨伀一勈疽媉豺乀樀么潰仸掇跿跐槰帀一裏芈笗噦滎僗帡媉跺娰昀久婿芈笗幦滎僗庁媉诺壠昀仫厐槰戀一裃爛記一为繤哼儀一剈痡嚁缪一丁楁攐揔卹佟数荔瀧獁提捤单佔拔劈旽舧恢浴瀗葴塒暜缦埖恢淞潸吀丏淠一乵喓嚞趡崆一岱裠儀一岛縀一簀渀七瞲一丈甝媉覺嘰昀亾乀一僨一刀勈疝媉衺僀昀么灰虝稾岆一丄耧編俁渀倏蛿欑嘿滵茵愢泾燔匀両樇廍嚉葒娞劁嚺一一丄一丒丝匡燓幱湁延孛互娟犁侈伃岰砧啌灻粁嘘一愢汸畹媉誮弐丸仨玀縀伡燰粀帀丁媉诓嚟疢缅一劈攀嶅晿跿賠刀一岰囇么滱亅笅橁敐揤卽毃捒嚞挅敁掐捔卑慈滻侄瀥揀灟欈旼嶈赀一倧膅讃蚏瘀一恢櫬昄人亀一倭诐怢櫮濨匀丒嚜哠唀一劈巤倏然縀丂坝脑愞茆举趐廹攕匁襒搽茦嬴單渀乀么塶皷蕃癀佀丄琧喅蓟纔搗贏熨帀丁匱蜑晟诹廆彵縋瘄一丢藝伢孵菺估戀亊彵臃菔抺乀一倭诐怣敝涣褄一嚤敝匁赡娇幍坣腐橠常譄煚帤吡刎乺繤哰伀一勈痝劉覒嚵蔁嚉蒮弐丸仨桀渀伱燸烟櫄瀧汌灾粌渐一形汔继蘏煓淿跾蘄一与穂蘃一与稦蘂一与稈翀怠詁潭作幗戕蜅浝绤圅挢埥幕舕朅打怘詤羧亓園朤甇瘠幀洄性仁蠇舜嗠偁买刨舓匀一丄劧乂煓乯谏蜅毈犈艷唁一劆娲奈乶淾吏嘆裃昼丣礈滲乎税净傐帟倏哹氞拆崹匱蜒榠一一一巳謦褀一丏諼一息渄蘁尀憀勤拇赊烇側渿奈灷犌喸偌噵犈略囁衁勂啥嘉詒嚝蜣修侠池七贿怂櫬喬嚁蛿臰丁嘉諓丟嬠巋悢忏眧跇恠詀欴蟌涬岰朔翿彌汄搗丏漄帐丁吏箃側耧坈繺帤琏漃恰氐蜤埉幠趀刾勒一丄瘾豌埀抈甹囁螁瘞昀贀专亜蜢凡仒娞剑垉聒废匆凸亃虊帀一悃觤纜偈灳犌喘媁螀一訁娉膒嘾刽囁虇劘甥圉詐昿渍艺悃觤纜先灳犌喘抁螀一丽娉膒嘾刽囁虈犘甥圉詐昿渑艐悃觤纜剈灳犈喛一一劌喘桌偳犈嶄赈繸悤琧坉偼战巠却坒滻蜰甅怢櫤瀇瓀一丄焇琢愂櫤瀏漿怰氓传埱恢檔烥尀憀勠伸乌乲抨爳衈曲婤師谽弢剀秽楁攐揤卽毃枤勏觿赂趿跴姻跿忿緿謟賿跔淯跽噣羑愜倁訇趏敓茐嶾弁跴吵仿滾乗檹嚍兲帐丁噣传技唣跠滱綮穦准谺罈崛詁簀帀七礉滱絤哠吀一協瀧獁提捤单佔拢洌嗠淁蠇帟倧俁豀蘾几矈庣拀処叉氞苆崥匱蜒榠儣資趱跬欦褀一一七諿息渀一仼跀丄瓼一縿绰一久婻抨穳絈凲芘苒案灼拂啥嚉諓借嬢嬌瑒嚟嬣俣伓借笠埋怰池标琀跏縄渧汈凳犨狐灉跱折崐啍屳嗫熬呅婻打喑刁縑晜举勠一丄砬諯煓褬喤岃虀蛘胧图跿舨渰灁滾丐谒谀一劈萾胿穿蚜複簆湹緀一争胰沱怏焃偼舨潰瀁幠趀嘾劓一丈画修儠汯一一繺忀病傈愈渤吏蘃欞劋糋趱跬淿跽嘁賢毬喸抁螼一丁嚉葒娞犊凡凂洔堡娢仐昿渑艉怢殔焇眚湸樀一么繺肨嶌贉胐皅纈剁滾乗庡嚹窿褟資趱跒东謢培怰沒堇激一丄焇細滹臰甽傈洈湕笅橁敐揤卽毃悿緿謃賿跐巯跽叾跿艟觿赕趿跿誖簃一已擀儀丿聛嘌一跉楀娀仿坭渰七败簀縀凼玺什丏誖訃一已擸儀丿聜丌一跉樠娀仿坱丰七败羀縀凼珈什丏誗堃一已攰儀丿聜蘌一跉欀娀仿坴渰一一愣忑爌一幔跲护儀两咀一一衹緿跽瘕一与畳跿跚倠一仩芿跿讠縀一岜燿跿栏帀七瞾跿跶漨一为楏跿赨揀一冦磿跿蒆帀一表巿跽癲一与瑛跿跚嗠一仩焿跿订娀一岘姿跿栦一七睸跿跶炘一为擯跿赨筀一冥狿跿蒌嘀一衖緿跽盏一与獃跿跚局一仩徿跿讣脀一岓臿跿栀渐七眲跿跷寁獮月商玵猺嘉擇掵脊丘琗宔缶嫎充讕聲旙著彽瑩椙揷宥补丘琗宔缶嫎充讕聲旙瓷侕籟槝敇俕艟枚擆戁灡櫙愓曌蘴旙攧坽瑯標擥讥籰歝叶枥穥丘琗宔缶嫎充讕聲旝蔦珑獟枚擆戁灡櫙愓曌蘴旙攧坽絰杛珶玹繵欗葦玱猀暘收拄萳對叶揉聟楘攅讥籰歝叶枥穥丘琗宔缶嫎充讕聲旜瑖厑浦桛呐侉潳杌慣嫠舀廛蔇珉睧栝倂澌眠媌儣嚁呵楚搖莄湍桛琖莽良如爦反猱完膃庀耮媋焢亡剥曈儓忑瘠媌儣嚤簠捜萖殔蠀暘收拄萳對倅窵獤欗怅箥籰歝呦玱獝嘖蓷揑繵欙璖羕欀嘈僖戤坥榘蓶徔丠嘋摀爥牥曛葆戀渠奝亐珍癯毈唷侕籤嘝咖莔丠嘚擧俕艦桛呐珁潳櫈僒俑素檙搖庁瑲槛怇寑物榀倂侽荴樝敆枥穥停吗富渭嘝哲保聩欙怇徼湳欙哷提乷暀唦嘃賿一丐一东一一嘀一圀一一一三一一倀一伐稐俑搁帚帬一崀一仰一丛忀一一一净一七一一縀嘀夀丠一一仒一一娃一璀娀佘侀丏樘丁瘃一儐尀乀一丄伀乀帀一一一一一一一一一一一一一一一一一仰唀一刀一貇一丄一丁俐一伀一仡舀丁一丁湴一乀一予欀一帀一稝一丐一丶啀一刀一帇帀丄一丒濐一伀一十舀丁一丅虴一乀一侠欀一帀丁耝一丐一乼啀一刀一澇帀丄一两俐一伀一垡舀丁一上年一乀一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一一丁劈湠勀一久也旗蔷徑睮樀北嘢幀旗菷寑牯歝唀偁乤汛呅词艵暗萦玹牥檀圇嚀彀旘蓆讍祟柙敇徥筥两万嚠彀旘蓆词猀爀唣久也枘蓆词猀爀唣湅也枙著後亐东爁匁浦槜呖蘂帀檒伔佽瑰歝吰偀乲戄戅讙聥晙三丁聘剐叶柝聩欙帉丁聠剐叶莵潰两万垠彀旛敖螵潰两万埀彀旛蔆掸亐东疁匁浰杜甦诈亐东瘀剅也樜璖蟑琀爀唨渄彀旜啗忌亐东眀剅也檙搖市帀檦丑匁浳欘敂弥屏弑慣市帀檨丑匁浳欜瓆掸亐东碀剅也歛瑶揑焀爀唫丄彀旝蔦珑猀爀一卼丅丁珶莡浥氙搷揑獟栙搖徕耀慙著彽腴晜畅讵脀扛搖玸乖暘收拄萳對台佭牥曘畖昃圁杛琶埕琀膀帠一七丩佰丌们叀一垕籣槙呐侹牥曛葆戂搁一珶昁蔀緀帀宥穥両縗丂威最圐刌二喀丰凰焀什垲戀丂旙渊丄仄乀丶玱猀稀攀僔佤丮渐娂舦一縏檬七両烠丌仄娀丰冠舀什娄刀刀舰戀一一丩佴焐卜訁柰呤促佣縫蘊爄一一偐尀万一布爑一侀丐乐咀丁渀刀指一习丄丧帐一封一夀蘀丁一一嘀一净开一一一帀一搀一仰刀乨咀一刀一堀一丼伀丁潰一伀一凐一丏乀七幌一乀一佐一七縐七蔕一丐一乩一一訄一弆一丄一丞縀一崁一垱嘀丁一三一一净帀丰崀一帀丂甀一仰刀仼剀一刀一紀一丼圀丰倀一伀一婀一丏偀不亀帀乀一儰一七縐丂爋一丐一仚一一訄一褂縀丄一丸一一伀一帀一一一与瘀一乀一刀一一一七茀一丐一伀一一一一伀帀丄一乀一一一一亰刀丁一丐一一一一乌伀一帀丄一一一一业乀一刀丁一一一一丈帐一伀一帀一一一丂渄一乀一刀一一一一紁一丐一伀一一一一寀帀丄一乀一一一一凐刀丁一丐一一一一伔伀一帀丄一一一一之乀一刀丁一一一一且縐一伀一帀一一一丅稄一乀一刀一一一丁漁一丐一伀一一一一柀帀丄一乀一一一一啐刀丁一丐一一一一俴伀一帀丄一一一一亅乀一刀丁一一一一丣丐一伀一帀一一一丁一一剀一么一丄縀一戀一佐一世一丁樀一吀一乤一丆渀一椀一俀一丝一丁蘀一嗀一亀一丈帀一瀀一一丁与一一言一囀一乀一丄帀一怀一估一且一丁戀一厀一乜一丆一一最一侠一丛一丁縀一啀一乸一万縀一渀一倐一丢一丂丁浟楚叶握獣歝呕计獡朙攠佽灡櫙愓曌蘴旙呖宽牥丗萦反猱完膃彽牥曛葆捽瑤丗萦反猱完膃彽牥曛葆捽瑩椙帅讉潳杌慣嫠艟朙搶讑獟果丅讉潳杌慣嫠艟杛琶讑猀旘琗宔缶嫎充讕籣槙呕讙爀旘琗宔缶嫎充讕籣槙呕讙睬杀叶垅腥婍焳滑浥榘蓶徕浦樀叶徕煢歙清讕籣暝摠佽略欗蔷待聴旛攰佽筡桛清譽浳欙咖蟀也旗蔷徑絵欜丅讍穯曚菶殕艴桛摐佽煬槜葐佽瑣椛蔶戁浦柙敆威浦槜呖蘁浦樝敆威浦檙搖币浦毜璗徔也楛搗丁浭歛瓖叀也槜呖蘁浰杜甦诈也樜璖蟑琀旜啗忌也檙搖币浳欘敂弥屏弑慣币浳欜瓆掸也歛瑶揑焀旝蔦珑猀朞擆彽腴歘珶垥籤杜清证聩榝号揍潧杀一一一一㴁 diff --git a/base16384.1 b/base16384.1 index d5dd9a5..fdf85e6 100644 --- a/base16384.1 +++ b/base16384.1 @@ -1,9 +1,9 @@ -.TH BASE16384 1 "5 April 2024" "GNU" "User Commands" +.TH BASE16384 1 "6 April 2024" "GNU" "User Commands" .SH NAME base16384 \- Encode binary files to printable utf16be .SH SYNOPSIS .B base16384 --[edtn] <\fIinputfile\fR> <\fIoutputfile\fR> +-[ed][t][n][cC] <\fIinputfile\fR> <\fIoutputfile\fR> .SH DESCRIPTION .LP There are diff --git a/base16384.c b/base16384.c index 53bff16..5db0552 100644 --- a/base16384.c +++ b/base16384.c @@ -52,11 +52,11 @@ static base16384_err_t print_usage() { BASE16384_VERSION_DATE "). Usage:\n", stderr ); - fputs("base16384 [-edtn] [inputfile] [outputfile]\n", stderr); + fputs("base16384 -[ed][t][n][cC] [inputfile] [outputfile]\n", stderr); fputs(" -e\t\tencode (default)\n", stderr); fputs(" -d\t\tdecode\n", stderr); fputs(" -t\t\tshow spend time\n", stderr); - fputs(" -n\t\tdon't write utf16be file header (0xFEFF)\n", stderr); + fputs(" -n\t\tdonot write utf16be file header (0xFEFF)\n", stderr); fputs(" -c\t\tembed or validate checksum in remainder\n", stderr); fputs(" -C\t\tdo -c forcely\n", stderr); fputs(" inputfile\tpass - to read from stdin\n", stderr); From c64fdb6dc9124b09a0d17c3bf58310a8d460f357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sat, 6 Apr 2024 18:49:23 +0900 Subject: [PATCH 03/13] feat(file): add custom stream api --- base16384.h | 54 ++++++++++++++++++++ file.c | 130 ++++++++++++++++++++++++++++++++++++++++++++--- test/file_test.c | 44 +++++++++++++++- test/file_test.h | 32 ++++++++++++ test/wrap_test.c | 38 ++++++++++++++ wrap.c | 2 + 6 files changed, 290 insertions(+), 10 deletions(-) diff --git a/base16384.h b/base16384.h index b5be8a5..288380e 100644 --- a/base16384.h +++ b/base16384.h @@ -59,6 +59,36 @@ typedef enum base16384_err_t base16384_err_t; // forcely do sumcheck without checking data length #define BASE16384_FLAG_DO_SUM_CHECK_FORCELY (1<<2) +/** + * @brief custom reader function interface + * @param client_data the data pointer defined by the client + * @param buffer to where put data + * @param count read bytes count + * @return the size read +*/ +typedef ssize_t(*base16384_reader_t)(const void *client_data, void *buffer, size_t count); + +/** + * @brief custom writer function interface + * @param client_data the data pointer defined by the client + * @param buffer from where read data + * @param count write bytes count + * @return the size written +*/ +typedef ssize_t(*base16384_writer_t)(const void *client_data, const void *buffer, size_t count); + +struct base16384_stream_t { + union { + base16384_reader_t reader; + base16384_writer_t writer; + } f; + const void *client_data; +}; +/** + * @brief for stream encode/decode +*/ +typedef struct base16384_stream_t base16384_stream_t; + /** * @brief calculate the exact encoded size * @param dlen the data length to encode @@ -210,6 +240,17 @@ base16384_err_t base16384_encode_fp_detailed(base16384_typed_flag_params(FILE*)) */ base16384_err_t base16384_encode_fd_detailed(base16384_typed_flag_params(int)); +/** + * @brief encode custom input reader to custom output writer + * @param input custom input reader + * @param output custom output writer + * @param encbuf must be no less than BASE16384_ENCBUFSZ + * @param decbuf must be no less than BASE16384_DECBUFSZ + * @param flag BASE16384_FLAG_xxx value, add multiple flags by `|` + * @return the error code +*/ +base16384_err_t base16384_encode_stream_detailed(base16384_typed_flag_params(base16384_stream_t*)); + /** * @brief decode input file to output file * @param input filename or `-` to specify stdin @@ -243,16 +284,29 @@ base16384_err_t base16384_decode_fp_detailed(base16384_typed_flag_params(FILE*)) */ base16384_err_t base16384_decode_fd_detailed(base16384_typed_flag_params(int)); +/** + * @brief decode custom input reader to custom output writer + * @param input custom input reader + * @param output custom output writer + * @param encbuf must be no less than BASE16384_ENCBUFSZ + * @param decbuf must be no less than BASE16384_DECBUFSZ + * @param flag BASE16384_FLAG_xxx value, add multiple flags by `|` + * @return the error code +*/ +base16384_err_t base16384_decode_stream_detailed(base16384_typed_flag_params(base16384_stream_t*)); + #define BASE16384_WRAP_DECL(method, name, type) \ base16384_err_t base16384_##method##_##name(base16384_typed_params(type)); BASE16384_WRAP_DECL(encode, file, const char*); BASE16384_WRAP_DECL(encode, fp, FILE*); BASE16384_WRAP_DECL(encode, fd, int); + BASE16384_WRAP_DECL(encode, stream, base16384_stream_t*); BASE16384_WRAP_DECL(decode, file, const char*); BASE16384_WRAP_DECL(decode, fp, FILE*); BASE16384_WRAP_DECL(decode, fd, int); + BASE16384_WRAP_DECL(decode, stream, base16384_stream_t*); #undef BASE16384_WRAP_DECL diff --git a/file.c b/file.c index 36fb7aa..faa7549 100644 --- a/file.c +++ b/file.c @@ -57,14 +57,14 @@ static inline off_t get_file_size(const char* filepath) { #define do_sum_check(flag) ((flag)&(BASE16384_FLAG_DO_SUM_CHECK_FORCELY|BASE16384_FLAG_SUM_CHECK_ON_REMAIN)) base16384_err_t base16384_encode_file_detailed(const char* input, const char* output, char* encbuf, char* decbuf, int flag) { - off_t inputsize; - FILE *fp = NULL, *fpo; - int errnobak = 0, is_stdin = is_standard_io(input); - base16384_err_t retval = base16384_err_ok; if(!input || !output || strlen(input) <= 0 || strlen(output) <= 0) { errno = EINVAL; return base16384_err_invalid_file_name; } + base16384_err_t retval = base16384_err_ok; + off_t inputsize; + FILE *fp = NULL, *fpo; + int errnobak = 0, is_stdin = is_standard_io(input); if(is_stdin) { // read from stdin inputsize = _BASE16384_ENCBUFSZ; fp = stdin; @@ -213,6 +213,41 @@ base16384_err_t base16384_encode_fd_detailed(int input, int output, char* encbuf return base16384_err_ok; } +#define reader(cd, buf, n) (input->f.reader((cd)->client_data, (buf), (n))) +#define writer(cd, buf, n) (output->f.writer((cd)->client_data, (buf), (n))) + +base16384_err_t base16384_encode_stream_detailed(base16384_stream_t* input, base16384_stream_t* output, char* encbuf, char* decbuf, int flag) { + if(!input || !input->f.reader) { + return base16384_err_fopen_input_file; + } + if(!output || !output->f.writer) { + return base16384_err_fopen_output_file; + } + off_t inputsize = _BASE16384_ENCBUFSZ; + size_t cnt = 0; + uint32_t sum = BASE16384_SIMPLE_SUM_INIT_VALUE; + if(!(flag&BASE16384_FLAG_NOHEADER)) writer(output, "\xfe\xff", 2); + while((cnt = reader(input, encbuf, inputsize)) > 0) { + int n; + while(cnt%7) { + n = reader(input, encbuf+cnt, sizeof(char)); + if(n > 0) cnt++; + else break; + } + if(do_sum_check(flag)) { + sum = calc_sum(sum, cnt, encbuf); + if(cnt%7) { // last encode + *(uint32_t*)(&encbuf[cnt]) = htobe32(sum); + } + } + n = base16384_encode_unsafe(encbuf, cnt, decbuf); + if(n && writer(output, decbuf, n) < n) { + return base16384_err_write_file; + } + } + return base16384_err_ok; +} + #define rm_head(fp) {\ int ch = fgetc(fp);\ if(ch == 0xFE) fgetc(fp);\ @@ -230,16 +265,16 @@ static inline int is_next_end(FILE* fp) { } base16384_err_t base16384_decode_file_detailed(const char* input, const char* output, char* encbuf, char* decbuf, int flag) { + if(!input || !output || strlen(input) <= 0 || strlen(output) <= 0) { + errno = EINVAL; + return base16384_err_invalid_file_name; + } off_t inputsize; FILE* fp = NULL; FILE* fpo; uint32_t sum = BASE16384_SIMPLE_SUM_INIT_VALUE; base16384_err_t retval = base16384_err_ok; int errnobak = 0, is_stdin = is_standard_io(input); - if(!input || !output || strlen(input) <= 0 || strlen(output) <= 0) { - errno = EINVAL; - return base16384_err_invalid_file_name; - } if(is_stdin) { // read from stdin inputsize = _BASE16384_DECBUFSZ; fp = stdin; @@ -458,3 +493,82 @@ base16384_err_t base16384_decode_fd_detailed(int input, int output, char* encbuf } return base16384_err_ok; } + +static inline uint16_t is_next_end_stream(base16384_stream_t* input) { + uint8_t ch = 0; + if(reader(input, &ch, 1) != 1) return (uint16_t)EOF; + uint16_t ret = (uint16_t)ch & 0x00ff; + if(ch == '=') { + if(reader(input, &ch, 1) != 1) return (uint16_t)EOF; + ret <<= 8; + ret |= (uint16_t)ch & 0x00ff; + } + return ret; +} + +base16384_err_t base16384_decode_stream_detailed(base16384_stream_t* input, base16384_stream_t* output, char* encbuf, char* decbuf, int flag) { + if(!input || !input->f.reader) { + errno = EINVAL; + return base16384_err_fopen_input_file; + } + if(!output || !output->f.writer) { + errno = EINVAL; + return base16384_err_fopen_output_file; + } + + off_t inputsize = _BASE16384_DECBUFSZ; + uint32_t sum = BASE16384_SIMPLE_SUM_INIT_VALUE; + uint8_t remains[8]; + + decbuf[0] = 0; + if(reader(input, remains, 2) != 2) { + return base16384_err_read_file; + } + + int p = 0; + if(remains[0] != (uint8_t)(0xfe)) p = 2; + + int n, last_encbuf_cnt = 0, last_decbuf_cnt = 0, offset = 0; + size_t total_decoded_len = 0; + while((n = reader(input, decbuf+p, inputsize-p)) > 0) { + if(p) { + memcpy(decbuf, remains, p); + n += p; + p = 0; + } + int x; + while(n%8) { + x = reader(input, decbuf+n, sizeof(char)); + if(x > 0) n++; + else break; + } + uint16_t next = is_next_end_stream(input); + if(errno) { + return base16384_err_read_file; + } + if((uint16_t)(~next)) { + if(next&0xff00) { + decbuf[n++] = '='; + decbuf[n++] = (char)(next&0x00ff); + } else remains[p++] = (char)(next&0x00ff); + } + offset = decbuf[n-1]; + last_decbuf_cnt = n; + n = base16384_decode_unsafe(decbuf, n, encbuf); + if(n && writer(output, encbuf, n) != n) { + return base16384_err_write_file; + } + total_decoded_len += n; + if(do_sum_check(flag)) sum = calc_sum(sum, n, encbuf); + last_encbuf_cnt = n; + } + if(do_sum_check(flag) + && (flag&BASE16384_FLAG_DO_SUM_CHECK_FORCELY || total_decoded_len >= _BASE16384_ENCBUFSZ) + && last_decbuf_cnt > 2 + && decbuf[last_decbuf_cnt-2] == '=' + && check_sum(sum, *(uint32_t*)(&encbuf[last_encbuf_cnt]), offset)) { + errno = EINVAL; + return base16384_err_invalid_decoding_checksum; + } + return base16384_err_ok; +} diff --git a/test/file_test.c b/test/file_test.c index 8910277..754cd72 100644 --- a/test/file_test.c +++ b/test/file_test.c @@ -100,7 +100,7 @@ static char tstbuf[BASE16384_ENCBUFSZ]; int fdout = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT|O_APPEND); \ loop_ok(!fdout, i, "open"); \ \ - err = base16384_encode_fd_detailed(fd, fdout, encbuf, decbuf, 0); \ + err = base16384_encode_fd_detailed(fd, fdout, encbuf, decbuf, flag); \ base16384_loop_ok(err); \ loop_ok(close(fd), i, "close"); \ \ @@ -109,7 +109,46 @@ static char tstbuf[BASE16384_ENCBUFSZ]; \ loop_ok(lseek(fdout, 0, SEEK_SET), i, "lseek"); \ \ - err = base16384_decode_fd_detailed(fdout, fdval, encbuf, decbuf, 0); \ + err = base16384_decode_fd_detailed(fdout, fdval, encbuf, decbuf, flag); \ + base16384_loop_ok(err); \ + \ + loop_ok(close(fdout), i, "close"); \ + loop_ok(close(fdval), i, "close"); \ + \ + validate_result(); \ + } + +#define test_stream_detailed(flag) \ + fputs("testing base16384_en/decode_stream with flag "#flag"...\n", stderr); \ + init_input_file(); \ + for(i = TEST_SIZE; i > 0; i--) { \ + reset_and_truncate(fd, i); \ + \ + int fdout = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT|O_APPEND); \ + loop_ok(!fdout, i, "open"); \ + \ + err = base16384_encode_stream_detailed(&(base16384_stream_t){ \ + .client_data = (void*)(uintptr_t)fd, \ + .f.reader = base16384_test_file_reader, \ + }, &(base16384_stream_t){ \ + .client_data = (void*)(uintptr_t)fdout, \ + .f.writer = base16384_test_file_writer, \ + }, encbuf, decbuf, flag); \ + base16384_loop_ok(err); \ + loop_ok(close(fd), i, "close"); \ + \ + int fdval = open(TEST_VALIDATE_FILENAME, O_WRONLY|O_TRUNC|O_CREAT); \ + loop_ok(!fdval, i, "open"); \ + \ + loop_ok(lseek(fdout, 0, SEEK_SET), i, "lseek"); \ + \ + err = base16384_decode_stream_detailed(&(base16384_stream_t){ \ + .client_data = (void*)(uintptr_t)fdout, \ + .f.reader = base16384_test_file_reader, \ + }, &(base16384_stream_t){ \ + .client_data = (void*)(uintptr_t)fdval, \ + .f.writer = base16384_test_file_writer, \ + }, encbuf, decbuf, flag); \ base16384_loop_ok(err); \ \ loop_ok(close(fdout), i, "close"); \ @@ -148,6 +187,7 @@ int main() { test_detailed(file); test_detailed(fp); test_detailed(fd); + test_detailed(stream); remove_test_files(); diff --git a/test/file_test.h b/test/file_test.h index 2109bd8..06f6745 100644 --- a/test/file_test.h +++ b/test/file_test.h @@ -92,4 +92,36 @@ ok(fclose(fp), "fclose"); \ fputs("input file created.\n", stderr); +#include +#include +#include + +static ssize_t base16384_test_file_reader(const void *client_data, void *buffer, size_t count) { + int fd = (int)((uintptr_t)client_data); + ssize_t ret = read(fd, buffer, count); + if(ret < 0) return ret; + for(ssize_t i = 0; i < ret; i++) { + ((uint8_t*)(buffer))[i] = ~((uint8_t*)(buffer))[i]; + } + return ret; +} + +static ssize_t base16384_test_file_writer(const void *client_data, const void *buffer, size_t count) { + int fd = (int)((uintptr_t)client_data); + if(count <= 0) { + errno = EINVAL; + return -100; + } + uint8_t* wbuf = (uint8_t*)malloc(count); + if(!wbuf) return -200; + for(ssize_t i = 0; i < count; i++) { + wbuf[i] = ~((uint8_t*)(buffer))[i]; + } + ssize_t ret = write(fd, buffer, count); + int errnobak = errno; + free(wbuf); + errno = errnobak; + return ret; +} + #endif \ No newline at end of file diff --git a/test/wrap_test.c b/test/wrap_test.c index 6cf84cd..e2345b4 100644 --- a/test/wrap_test.c +++ b/test/wrap_test.c @@ -122,6 +122,44 @@ int main() { validate_result(); } + fputs("testing base16384_en/decode_stream...\n", stderr); + init_input_file(); + for(i = TEST_SIZE; i > 0; i--) { + reset_and_truncate(fd, i); + + int fdout = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT|O_APPEND); + loop_ok(!fdout, i, "open"); + + err = base16384_encode_stream(&(base16384_stream_t){ + .client_data = (void*)(uintptr_t)fd, + .f.reader = base16384_test_file_reader, + }, &(base16384_stream_t){ + .client_data = (void*)(uintptr_t)fdout, + .f.writer = base16384_test_file_writer, + }, encbuf, decbuf); + base16384_loop_ok(err); + loop_ok(close(fd), i, "close"); + + int fdval = open(TEST_VALIDATE_FILENAME, O_WRONLY|O_TRUNC|O_CREAT); + loop_ok(!fdval, i, "open"); + + loop_ok(lseek(fdout, 0, SEEK_SET), i, "lseek"); + + err = base16384_decode_stream(&(base16384_stream_t){ + .client_data = (void*)(uintptr_t)fdout, + .f.reader = base16384_test_file_reader, + }, &(base16384_stream_t){ + .client_data = (void*)(uintptr_t)fdval, + .f.writer = base16384_test_file_writer, + }, encbuf, decbuf); + base16384_loop_ok(err); + + loop_ok(close(fdout), i, "close"); + loop_ok(close(fdval), i, "close"); + + validate_result(); + } + remove(TEST_INPUT_FILENAME); remove(TEST_OUTPUT_FILENAME); remove(TEST_VALIDATE_FILENAME); diff --git a/wrap.c b/wrap.c index 5358b5f..4d1334b 100644 --- a/wrap.c +++ b/wrap.c @@ -28,10 +28,12 @@ BASE16384_WRAP_DECL(encode, file, const char*); BASE16384_WRAP_DECL(encode, fp, FILE*); BASE16384_WRAP_DECL(encode, fd, int); + BASE16384_WRAP_DECL(encode, stream, base16384_stream_t*); BASE16384_WRAP_DECL(decode, file, const char*); BASE16384_WRAP_DECL(decode, fp, FILE*); BASE16384_WRAP_DECL(decode, fd, int); + BASE16384_WRAP_DECL(decode, stream, base16384_stream_t*); #undef BASE16384_WRAP_DECL From 4ff107e46f9fc698d8f5c4ebe98280f74a45f970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sat, 6 Apr 2024 20:22:57 +0900 Subject: [PATCH 04/13] chore: optimize documents --- base16384.h | 2 +- test/file_test.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/base16384.h b/base16384.h index 288380e..e0631a8 100644 --- a/base16384.h +++ b/base16384.h @@ -78,7 +78,7 @@ typedef ssize_t(*base16384_reader_t)(const void *client_data, void *buffer, size typedef ssize_t(*base16384_writer_t)(const void *client_data, const void *buffer, size_t count); struct base16384_stream_t { - union { + const union { base16384_reader_t reader; base16384_writer_t writer; } f; diff --git a/test/file_test.h b/test/file_test.h index 06f6745..b44fe8b 100644 --- a/test/file_test.h +++ b/test/file_test.h @@ -100,7 +100,8 @@ static ssize_t base16384_test_file_reader(const void *client_data, void *buffer, int fd = (int)((uintptr_t)client_data); ssize_t ret = read(fd, buffer, count); if(ret < 0) return ret; - for(ssize_t i = 0; i < ret; i++) { + ssize_t i; + for(i = 0; i < ret; i++) { ((uint8_t*)(buffer))[i] = ~((uint8_t*)(buffer))[i]; } return ret; @@ -114,7 +115,8 @@ static ssize_t base16384_test_file_writer(const void *client_data, const void *b } uint8_t* wbuf = (uint8_t*)malloc(count); if(!wbuf) return -200; - for(ssize_t i = 0; i < count; i++) { + ssize_t i; + for(i = 0; i < count; i++) { wbuf[i] = ~((uint8_t*)(buffer))[i]; } ssize_t ret = write(fd, buffer, count); From 5defe71ba9dc87593d299ce4f1ad622f2bd7edbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sat, 6 Apr 2024 20:55:39 +0900 Subject: [PATCH 05/13] chore: optimize documents --- base1432.c | 22 +++++++++++----------- base1464.c | 18 +++++++++--------- base16384.h | 19 +++++++++++-------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/base1432.c b/base1432.c index 9089ab0..faef239 100644 --- a/base1432.c +++ b/base1432.c @@ -30,7 +30,7 @@ typedef union { int base16384_encode_safe(const char* data, int dlen, char* buf) { int outlen = dlen / 7 * 8; int offset = dlen % 7; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen += 4; break; case 2: @@ -127,7 +127,7 @@ int base16384_encode_safe(const char* data, int dlen, char* buf) { int base16384_encode(const char* data, int dlen, char* buf) { int outlen = dlen / 7 * 8; int offset = dlen % 7; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen += 4; break; case 2: @@ -202,7 +202,7 @@ int base16384_encode(const char* data, int dlen, char* buf) { int base16384_encode_unsafe(const char* data, int dlen, char* buf) { int outlen = dlen / 7 * 8; int offset = dlen % 7; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen += 4; break; case 2: @@ -244,7 +244,7 @@ int base16384_decode_safe(const char* data, int dlen, char* buf) { int offset = 0; if(data[dlen-2] == '=') { offset = data[dlen-1]; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen -= 4; break; case 2: @@ -259,7 +259,7 @@ int base16384_decode_safe(const char* data, int dlen, char* buf) { const uint32_t* vals = (const uint32_t*)data; uint32_t n = 0; int32_t i = 0; - for(; i < outlen - 7; i+=7) { // n实际每次自增2 + for(; i < outlen - 7; i+=7) { // n += 2 in one loop register uint32_t sum = 0; register uint32_t shift = htobe32(vals[n++]) - 0x4e004e00; shift <<= 2; @@ -341,7 +341,7 @@ int base16384_decode(const char* data, int dlen, char* buf) { int offset = 0; if(data[dlen-2] == '=') { offset = data[dlen-1]; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen -= 4; break; case 2: @@ -356,7 +356,7 @@ int base16384_decode(const char* data, int dlen, char* buf) { const uint32_t* vals = (const uint32_t*)data; uint32_t n = 0; int32_t i = 0; - for(; i <= outlen - 7; i+=7) { // n实际每次自增2 + for(; i <= outlen - 7; i+=7) { // n += 2 in one loop register uint32_t sum = 0; register uint32_t shift = htobe32(vals[n++]) - 0x4e004e00; shift <<= 2; @@ -375,7 +375,7 @@ int base16384_decode(const char* data, int dlen, char* buf) { } if(*(uint8_t*)(&vals[n]) == '=') return outlen; if(offset--) { - // 这里有读取越界 + // here comes a read overlap #ifdef WORDS_BIGENDIAN register uint32_t sum = __builtin_bswap32(vals[n++]); #else @@ -391,7 +391,7 @@ int base16384_decode(const char* data, int dlen, char* buf) { if(offset--) { buf[i] = (sum & 0x0f000000) >> 20; if(*(uint8_t*)(&vals[n]) == '=') return outlen; - // 这里有读取越界 + // here comes a read overlap #ifdef WORDS_BIGENDIAN sum = __builtin_bswap32(vals[n]); #else @@ -418,7 +418,7 @@ int base16384_decode_unsafe(const char* data, int dlen, char* buf) { int offset = 0; if(data[dlen-2] == '=') { offset = data[dlen-1]; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen -= 4; break; case 2: @@ -433,7 +433,7 @@ int base16384_decode_unsafe(const char* data, int dlen, char* buf) { const uint32_t* vals = (const uint32_t*)data; uint32_t n = 0; int32_t i = 0; - for(; i < outlen-7; i+=7) { // n实际每次自增2 + for(; i < outlen-7; i+=7) { // n += 2 in one loop register uint32_t sum = 0; register uint32_t shift = htobe32(vals[n++]) - 0x4e004e00; shift <<= 2; diff --git a/base1464.c b/base1464.c index 1cfc786..80bc49c 100644 --- a/base1464.c +++ b/base1464.c @@ -30,7 +30,7 @@ typedef union { int base16384_encode_safe(const char* data, int dlen, char* buf) { int outlen = dlen / 7 * 8; int offset = dlen % 7; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen += 4; break; case 2: @@ -112,7 +112,7 @@ int base16384_encode_safe(const char* data, int dlen, char* buf) { int base16384_encode(const char* data, int dlen, char* buf) { int outlen = dlen / 7 * 8; int offset = dlen % 7; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen += 4; break; case 2: @@ -127,7 +127,7 @@ int base16384_encode(const char* data, int dlen, char* buf) { int64_t i = 0; for(; i <= dlen - 7; i += 7) { register uint64_t sum = 0; - register uint64_t shift = htobe64(*(uint64_t*)(data+i))>>2; // 这里有读取越界 + register uint64_t shift = htobe64(*(uint64_t*)(data+i))>>2; // here comes a read overlap sum |= shift & 0x3fff000000000000; shift >>= 2; sum |= shift & 0x00003fff00000000; @@ -177,7 +177,7 @@ int base16384_encode(const char* data, int dlen, char* buf) { int base16384_encode_unsafe(const char* data, int dlen, char* buf) { int outlen = dlen / 7 * 8; int offset = dlen % 7; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen += 4; break; case 2: @@ -192,7 +192,7 @@ int base16384_encode_unsafe(const char* data, int dlen, char* buf) { int64_t i = 0; for(; i < dlen; i += 7) { register uint64_t sum = 0; - register uint64_t shift = htobe64(*(uint64_t*)(data+i))>>2; // 这里有读取越界 + register uint64_t shift = htobe64(*(uint64_t*)(data+i))>>2; // here comes a read overlap sum |= shift & 0x3fff000000000000; shift >>= 2; sum |= shift & 0x00003fff00000000; @@ -215,7 +215,7 @@ int base16384_decode_safe(const char* data, int dlen, char* buf) { int offset = 0; if(data[dlen-2] == '=') { offset = data[dlen-1]; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen -= 4; break; case 2: @@ -292,7 +292,7 @@ int base16384_decode(const char* data, int dlen, char* buf) { int offset = 0; if(data[dlen-2] == '=') { offset = data[dlen-1]; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen -= 4; break; case 2: @@ -322,7 +322,7 @@ int base16384_decode(const char* data, int dlen, char* buf) { } if(*(uint8_t*)(&vals[n]) == '=') return outlen; if(offset--) { - // 这里有读取越界 + // here comes a read overlap #ifdef WORDS_BIGENDIAN register uint64_t sum = __builtin_bswap64(vals[n]) - 0x000000000000004e; #else @@ -356,7 +356,7 @@ int base16384_decode_unsafe(const char* data, int dlen, char* buf) { int offset = 0; if(data[dlen-2] == '=') { offset = data[dlen-1]; - switch(offset) { // 算上偏移标志字符占用的2字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen -= 4; break; case 2: diff --git a/base16384.h b/base16384.h index e0631a8..c24a05b 100644 --- a/base16384.h +++ b/base16384.h @@ -66,7 +66,7 @@ typedef enum base16384_err_t base16384_err_t; * @param count read bytes count * @return the size read */ -typedef ssize_t(*base16384_reader_t)(const void *client_data, void *buffer, size_t count); +typedef ssize_t (*base16384_reader_t)(const void *client_data, void *buffer, size_t count); /** * @brief custom writer function interface @@ -75,13 +75,16 @@ typedef ssize_t(*base16384_reader_t)(const void *client_data, void *buffer, size * @param count write bytes count * @return the size written */ -typedef ssize_t(*base16384_writer_t)(const void *client_data, const void *buffer, size_t count); +typedef ssize_t (*base16384_writer_t)(const void *client_data, const void *buffer, size_t count); + +union base16384_io_function_t { + base16384_reader_t reader; + base16384_writer_t writer; +}; +typedef union base16384_io_function_t base16384_io_function_t; struct base16384_stream_t { - const union { - base16384_reader_t reader; - base16384_writer_t writer; - } f; + const base16384_io_function_t f; const void *client_data; }; /** @@ -97,7 +100,7 @@ typedef struct base16384_stream_t base16384_stream_t; static inline int _base16384_encode_len(int dlen) { int outlen = dlen / 7 * 8; int offset = dlen % 7; - switch(offset) { // 算上偏移标志字符占用的 2 字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen += 4; break; case 2: @@ -127,7 +130,7 @@ static inline int base16384_encode_len(int dlen) { */ static inline int _base16384_decode_len(int dlen, int offset) { int outlen = dlen; - switch(offset) { // 算上偏移标志字符占用的 2 字节 + switch(offset) { // also count 0x3dxx case 0: break; case 1: outlen -= 4; break; case 2: From e2f64f404f30b728b256d2c499edae1a5ba103c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sat, 6 Apr 2024 21:08:28 +0900 Subject: [PATCH 06/13] chore(file): optimize documents --- file.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/file.c b/file.c index faa7549..71c125b 100644 --- a/file.c +++ b/file.c @@ -213,8 +213,8 @@ base16384_err_t base16384_encode_fd_detailed(int input, int output, char* encbuf return base16384_err_ok; } -#define reader(cd, buf, n) (input->f.reader((cd)->client_data, (buf), (n))) -#define writer(cd, buf, n) (output->f.writer((cd)->client_data, (buf), (n))) +#define call_reader(cd, buf, n) (input->f.reader((cd)->client_data, (buf), (n))) +#define call_writer(cd, buf, n) (output->f.writer((cd)->client_data, (buf), (n))) base16384_err_t base16384_encode_stream_detailed(base16384_stream_t* input, base16384_stream_t* output, char* encbuf, char* decbuf, int flag) { if(!input || !input->f.reader) { @@ -226,11 +226,11 @@ base16384_err_t base16384_encode_stream_detailed(base16384_stream_t* input, base off_t inputsize = _BASE16384_ENCBUFSZ; size_t cnt = 0; uint32_t sum = BASE16384_SIMPLE_SUM_INIT_VALUE; - if(!(flag&BASE16384_FLAG_NOHEADER)) writer(output, "\xfe\xff", 2); - while((cnt = reader(input, encbuf, inputsize)) > 0) { + if(!(flag&BASE16384_FLAG_NOHEADER)) call_writer(output, "\xfe\xff", 2); + while((cnt = call_reader(input, encbuf, inputsize)) > 0) { int n; while(cnt%7) { - n = reader(input, encbuf+cnt, sizeof(char)); + n = call_reader(input, encbuf+cnt, sizeof(char)); if(n > 0) cnt++; else break; } @@ -241,7 +241,7 @@ base16384_err_t base16384_encode_stream_detailed(base16384_stream_t* input, base } } n = base16384_encode_unsafe(encbuf, cnt, decbuf); - if(n && writer(output, decbuf, n) < n) { + if(n && call_writer(output, decbuf, n) < n) { return base16384_err_write_file; } } @@ -496,10 +496,10 @@ base16384_err_t base16384_decode_fd_detailed(int input, int output, char* encbuf static inline uint16_t is_next_end_stream(base16384_stream_t* input) { uint8_t ch = 0; - if(reader(input, &ch, 1) != 1) return (uint16_t)EOF; + if(call_reader(input, &ch, 1) != 1) return (uint16_t)EOF; uint16_t ret = (uint16_t)ch & 0x00ff; if(ch == '=') { - if(reader(input, &ch, 1) != 1) return (uint16_t)EOF; + if(call_reader(input, &ch, 1) != 1) return (uint16_t)EOF; ret <<= 8; ret |= (uint16_t)ch & 0x00ff; } @@ -521,7 +521,7 @@ base16384_err_t base16384_decode_stream_detailed(base16384_stream_t* input, base uint8_t remains[8]; decbuf[0] = 0; - if(reader(input, remains, 2) != 2) { + if(call_reader(input, remains, 2) != 2) { return base16384_err_read_file; } @@ -530,7 +530,7 @@ base16384_err_t base16384_decode_stream_detailed(base16384_stream_t* input, base int n, last_encbuf_cnt = 0, last_decbuf_cnt = 0, offset = 0; size_t total_decoded_len = 0; - while((n = reader(input, decbuf+p, inputsize-p)) > 0) { + while((n = call_reader(input, decbuf+p, inputsize-p)) > 0) { if(p) { memcpy(decbuf, remains, p); n += p; @@ -538,7 +538,7 @@ base16384_err_t base16384_decode_stream_detailed(base16384_stream_t* input, base } int x; while(n%8) { - x = reader(input, decbuf+n, sizeof(char)); + x = call_reader(input, decbuf+n, sizeof(char)); if(x > 0) n++; else break; } @@ -555,7 +555,7 @@ base16384_err_t base16384_decode_stream_detailed(base16384_stream_t* input, base offset = decbuf[n-1]; last_decbuf_cnt = n; n = base16384_decode_unsafe(decbuf, n, encbuf); - if(n && writer(output, encbuf, n) != n) { + if(n && call_writer(output, encbuf, n) != n) { return base16384_err_write_file; } total_decoded_len += n; From da9b6a844aba4acf1a095986d68da3379f87efe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sun, 7 Apr 2024 14:40:25 +0800 Subject: [PATCH 07/13] fix(file): wierd fgetc/ungetc behavior on Windows --- base16384.h | 4 ++-- file.c | 20 ++++++++++++++++---- test/file_test.c | 16 ++++++---------- test/file_test.h | 24 ++++++++++++++++++++++-- test/wrap_test.c | 14 +++++++------- 5 files changed, 53 insertions(+), 25 deletions(-) diff --git a/base16384.h b/base16384.h index c24a05b..6a83278 100644 --- a/base16384.h +++ b/base16384.h @@ -84,8 +84,8 @@ union base16384_io_function_t { typedef union base16384_io_function_t base16384_io_function_t; struct base16384_stream_t { - const base16384_io_function_t f; - const void *client_data; + base16384_io_function_t f; + void *client_data; }; /** * @brief for stream encode/decode diff --git a/file.c b/file.c index 71c125b..3d9d872 100644 --- a/file.c +++ b/file.c @@ -248,10 +248,10 @@ base16384_err_t base16384_encode_stream_detailed(base16384_stream_t* input, base return base16384_err_ok; } -#define rm_head(fp) {\ - int ch = fgetc(fp);\ - if(ch == 0xFE) fgetc(fp);\ - else ungetc(ch, fp);\ +static inline void rm_head(FILE* fp) { + int ch = fgetc(fp); + if(ch == 0xFE) fgetc(fp); + else ungetc(ch, fp); } #define skip_offset(input_file) ((input_file[0]==(char)0xFE)?2:0) @@ -299,9 +299,11 @@ base16384_err_t base16384_decode_file_detailed(const char* input, const char* ou goto_base16384_file_detailed_cleanup(decode, base16384_err_fopen_input_file, {}); } rm_head(fp); + #ifndef _WIN32 // windows is crazy and always throws EINVAL if(errno) { goto_base16384_file_detailed_cleanup(decode, base16384_err_read_file, {}); } + #endif int cnt, last_encbuf_cnt = 0, last_decbuf_cnt = 0, offset = 0; size_t total_decoded_len = 0; while((cnt = fread(decbuf, sizeof(char), inputsize, fp)) > 0) { @@ -316,7 +318,9 @@ base16384_err_t base16384_decode_file_detailed(const char* input, const char* ou decbuf[cnt++] = '='; decbuf[cnt++] = end; } + #ifndef _WIN32 // windows is crazy and always throws EINVAL if(errno) goto_base16384_file_detailed_cleanup(decode, base16384_err_read_file, {}); + #endif offset = decbuf[cnt-1]; last_decbuf_cnt = cnt; cnt = base16384_decode_unsafe(decbuf, cnt, encbuf); @@ -376,9 +380,11 @@ base16384_err_t base16384_decode_fp_detailed(FILE* input, FILE* output, char* en off_t inputsize = _BASE16384_DECBUFSZ; uint32_t sum = BASE16384_SIMPLE_SUM_INIT_VALUE; rm_head(input); + #ifndef _WIN32 // windows is crazy and always throws EINVAL if(errno) { return base16384_err_read_file; } + #endif int cnt, last_encbuf_cnt = 0, last_decbuf_cnt = 0, offset = 0; size_t total_decoded_len = 0; while((cnt = fread(decbuf, sizeof(char), inputsize, input)) > 0) { @@ -393,7 +399,9 @@ base16384_err_t base16384_decode_fp_detailed(FILE* input, FILE* output, char* en decbuf[cnt++] = '='; decbuf[cnt++] = end; } + #ifndef _WIN32 // windows is crazy and always throws EINVAL if(errno) return base16384_err_read_file; + #endif offset = decbuf[cnt-1]; last_decbuf_cnt = cnt; cnt = base16384_decode_unsafe(decbuf, cnt, encbuf); @@ -464,9 +472,11 @@ base16384_err_t base16384_decode_fd_detailed(int input, int output, char* encbuf else break; } uint16_t next = is_next_end_fd(input); + #ifndef _WIN32 // windows is crazy and always throws EINVAL if(errno) { return base16384_err_read_file; } + #endif if((uint16_t)(~next)) { if(next&0xff00) { decbuf[n++] = '='; @@ -543,9 +553,11 @@ base16384_err_t base16384_decode_stream_detailed(base16384_stream_t* input, base else break; } uint16_t next = is_next_end_stream(input); + #ifndef _WIN32 // windows is crazy and always throws EINVAL if(errno) { return base16384_err_read_file; } + #endif if((uint16_t)(~next)) { if(next&0xff00) { decbuf[n++] = '='; diff --git a/test/file_test.c b/test/file_test.c index 754cd72..2558118 100644 --- a/test/file_test.c +++ b/test/file_test.c @@ -97,14 +97,14 @@ static char tstbuf[BASE16384_ENCBUFSZ]; for(i = TEST_SIZE; i > 0; i--) { \ reset_and_truncate(fd, i); \ \ - int fdout = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT|O_APPEND); \ + int fdout = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT|O_APPEND, 0644); \ loop_ok(!fdout, i, "open"); \ \ err = base16384_encode_fd_detailed(fd, fdout, encbuf, decbuf, flag); \ base16384_loop_ok(err); \ loop_ok(close(fd), i, "close"); \ \ - int fdval = open(TEST_VALIDATE_FILENAME, O_WRONLY|O_TRUNC|O_CREAT); \ + int fdval = open(TEST_VALIDATE_FILENAME, O_WRONLY|O_TRUNC|O_CREAT, 0644); \ loop_ok(!fdval, i, "open"); \ \ loop_ok(lseek(fdout, 0, SEEK_SET), i, "lseek"); \ @@ -124,7 +124,7 @@ static char tstbuf[BASE16384_ENCBUFSZ]; for(i = TEST_SIZE; i > 0; i--) { \ reset_and_truncate(fd, i); \ \ - int fdout = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT|O_APPEND); \ + int fdout = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT|O_APPEND, 0644); \ loop_ok(!fdout, i, "open"); \ \ err = base16384_encode_stream_detailed(&(base16384_stream_t){ \ @@ -137,7 +137,7 @@ static char tstbuf[BASE16384_ENCBUFSZ]; base16384_loop_ok(err); \ loop_ok(close(fd), i, "close"); \ \ - int fdval = open(TEST_VALIDATE_FILENAME, O_WRONLY|O_TRUNC|O_CREAT); \ + int fdval = open(TEST_VALIDATE_FILENAME, O_WRONLY|O_TRUNC|O_CREAT, 0644); \ loop_ok(!fdval, i, "open"); \ \ loop_ok(lseek(fdout, 0, SEEK_SET), i, "lseek"); \ @@ -171,12 +171,6 @@ static char tstbuf[BASE16384_ENCBUFSZ]; \ test_##name##_detailed(BASE16384_FLAG_NOHEADER|BASE16384_FLAG_SUM_CHECK_ON_REMAIN|BASE16384_FLAG_DO_SUM_CHECK_FORCELY); - -#define remove_test_files() \ - remove(TEST_INPUT_FILENAME); \ - remove(TEST_OUTPUT_FILENAME); \ - remove(TEST_VALIDATE_FILENAME); - int main() { srand(time(NULL)); @@ -184,6 +178,8 @@ int main() { int fd, i; base16384_err_t err; + init_test_files(); + test_detailed(file); test_detailed(fp); test_detailed(fd); diff --git a/test/file_test.h b/test/file_test.h index b44fe8b..4fc165c 100644 --- a/test/file_test.h +++ b/test/file_test.h @@ -19,6 +19,8 @@ * along with this program. If not, see . */ +#include + #define ok(has_failed, reason) \ if (has_failed) { \ perror(reason); \ @@ -83,8 +85,9 @@ } #define init_input_file() \ - for(i = 0; i < BASE16384_ENCBUFSZ; i += sizeof(int)) { \ - *(int*)(&encbuf[i]) = rand(); \ + fprintf(stderr, "fill encbufsz: %d\n", BASE16384_ENCBUFSZ);\ + for(i = 0; i < BASE16384_ENCBUFSZ/sizeof(uint16_t); i++) { \ + ((uint16_t*)encbuf)[i] = (uint16_t)rand(); \ } \ fp = fopen(TEST_INPUT_FILENAME, "wb"); \ ok(!fp, "fopen"); \ @@ -92,6 +95,23 @@ ok(fclose(fp), "fclose"); \ fputs("input file created.\n", stderr); +#define init_test_files() {\ + fd = open(TEST_INPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT, 0644); \ + ok(fd<0, "open"); \ + ok(close(fd), "close"); \ + fd = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT, 0644); \ + ok(fd<0, "open"); \ + ok(close(fd), "close"); \ + fd = open(TEST_VALIDATE_FILENAME, O_RDWR|O_TRUNC|O_CREAT, 0644); \ + ok(fd<0, "open"); \ + ok(close(fd), "close"); + +#define remove_test_files() \ + remove(TEST_INPUT_FILENAME); \ + remove(TEST_OUTPUT_FILENAME); \ + remove(TEST_VALIDATE_FILENAME); \ +} + #include #include #include diff --git a/test/wrap_test.c b/test/wrap_test.c index e2345b4..7c9f4e0 100644 --- a/test/wrap_test.c +++ b/test/wrap_test.c @@ -50,6 +50,8 @@ int main() { int fd, i; base16384_err_t err; + init_test_files(); + fputs("testing base16384_en/decode_file...\n", stderr); init_input_file(); for(i = TEST_SIZE; i > 0; i--) { @@ -101,14 +103,14 @@ int main() { for(i = TEST_SIZE; i > 0; i--) { reset_and_truncate(fd, i); - int fdout = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT|O_APPEND); + int fdout = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT|O_APPEND, 0644); loop_ok(!fdout, i, "open"); err = base16384_encode_fd(fd, fdout, encbuf, decbuf); base16384_loop_ok(err); loop_ok(close(fd), i, "close"); - int fdval = open(TEST_VALIDATE_FILENAME, O_WRONLY|O_TRUNC|O_CREAT); + int fdval = open(TEST_VALIDATE_FILENAME, O_WRONLY|O_TRUNC|O_CREAT, 0644); loop_ok(!fdval, i, "open"); loop_ok(lseek(fdout, 0, SEEK_SET), i, "lseek"); @@ -127,7 +129,7 @@ int main() { for(i = TEST_SIZE; i > 0; i--) { reset_and_truncate(fd, i); - int fdout = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT|O_APPEND); + int fdout = open(TEST_OUTPUT_FILENAME, O_RDWR|O_TRUNC|O_CREAT|O_APPEND, 0644); loop_ok(!fdout, i, "open"); err = base16384_encode_stream(&(base16384_stream_t){ @@ -140,7 +142,7 @@ int main() { base16384_loop_ok(err); loop_ok(close(fd), i, "close"); - int fdval = open(TEST_VALIDATE_FILENAME, O_WRONLY|O_TRUNC|O_CREAT); + int fdval = open(TEST_VALIDATE_FILENAME, O_WRONLY|O_TRUNC|O_CREAT, 0644); loop_ok(!fdval, i, "open"); loop_ok(lseek(fdout, 0, SEEK_SET), i, "lseek"); @@ -160,9 +162,7 @@ int main() { validate_result(); } - remove(TEST_INPUT_FILENAME); - remove(TEST_OUTPUT_FILENAME); - remove(TEST_VALIDATE_FILENAME); + remove_test_files(); return 0; } From 3b4925e013d4ea4ff5b1be9cbfc62a892182f152 Mon Sep 17 00:00:00 2001 From: synodriver <624805065@qq.com> Date: Sun, 7 Apr 2024 19:04:04 +0800 Subject: [PATCH 08/13] fix msvc build problem (#24) --- base16384.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base16384.h b/base16384.h index 6a83278..b63b0a8 100644 --- a/base16384.h +++ b/base16384.h @@ -23,6 +23,10 @@ #include #include #endif +#ifdef _MSC_VER +#include +typedef SSIZE_T ssize_t; +#endif enum base16384_err_t { base16384_err_ok, From 3ee12395e01d1288527a4124caad64626f7f3639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sun, 7 Apr 2024 20:51:27 +0900 Subject: [PATCH 09/13] chore: adapt to MSVC --- base1464.c | 24 ++++++++++++------------ base16384.h | 17 +++++++++++++---- binary.h | 4 ++++ file.c | 20 +++++++++++++++++--- test/file_test.h | 6 ++++++ 5 files changed, 52 insertions(+), 19 deletions(-) diff --git a/base1464.c b/base1464.c index 80bc49c..d05d1c0 100644 --- a/base1464.c +++ b/base1464.c @@ -264,20 +264,20 @@ int base16384_decode_safe(const char* data, int dlen, char* buf) { #else register uint64_t sum = valbuf.val - 0x000000000000004e; #endif - buf[i++] = ((sum & 0x000000000000003f) << 2) | ((sum & 0x000000000000c000) >> 14); + buf[i++] = (char)(((sum & 0x000000000000003f) << 2) | ((sum & 0x000000000000c000) >> 14)); if(offset--) { sum -= 0x00000000004e0000; - buf[i++] = ((sum & 0x0000000000003f00) >> 6) | ((sum & 0x0000000000300000) >> 20); + buf[i++] = (char)(((sum & 0x0000000000003f00) >> 6) | ((sum & 0x0000000000300000) >> 20)); if(offset--) { - buf[i++] = ((sum & 0x00000000000f0000) >> 12) | ((sum & 0x00000000f0000000) >> 28); + buf[i++] = (char)(((sum & 0x00000000000f0000) >> 12) | ((sum & 0x00000000f0000000) >> 28)); if(offset--) { sum -= 0x0000004e00000000; - buf[i++] = ((sum & 0x000000000f000000) >> 20) | ((sum & 0x0000003c00000000) >> 34); + buf[i++] = (char)(((sum & 0x000000000f000000) >> 20) | ((sum & 0x0000003c00000000) >> 34)); if(offset--) { - buf[i++] = ((sum & 0x0000000300000000) >> 26) | ((sum & 0x0000fc0000000000) >> 42); + buf[i++] = (char)(((sum & 0x0000000300000000) >> 26) | ((sum & 0x0000fc0000000000) >> 42)); if(offset--) { sum -= 0x004e000000000000; - buf[i] = ((sum & 0x0000030000000000) >> 34) | ((sum & 0x003f000000000000) >> 48); + buf[i] = (char)(((sum & 0x0000030000000000) >> 34) | ((sum & 0x003f000000000000) >> 48)); } } } @@ -328,20 +328,20 @@ int base16384_decode(const char* data, int dlen, char* buf) { #else register uint64_t sum = vals[n] - 0x000000000000004e; #endif - buf[i++] = ((sum & 0x000000000000003f) << 2) | ((sum & 0x000000000000c000) >> 14); + buf[i++] = (char)(((sum & 0x000000000000003f) << 2) | ((sum & 0x000000000000c000) >> 14)); if(offset--) { sum -= 0x00000000004e0000; - buf[i++] = ((sum & 0x0000000000003f00) >> 6) | ((sum & 0x0000000000300000) >> 20); + buf[i++] = (char)(((sum & 0x0000000000003f00) >> 6) | ((sum & 0x0000000000300000) >> 20)); if(offset--) { - buf[i++] = ((sum & 0x00000000000f0000) >> 12) | ((sum & 0x00000000f0000000) >> 28); + buf[i++] = (char)(((sum & 0x00000000000f0000) >> 12) | ((sum & 0x00000000f0000000) >> 28)); if(offset--) { sum -= 0x0000004e00000000; - buf[i++] = ((sum & 0x000000000f000000) >> 20) | ((sum & 0x0000003c00000000) >> 34); + buf[i++] = (char)(((sum & 0x000000000f000000) >> 20) | ((sum & 0x0000003c00000000) >> 34)); if(offset--) { - buf[i++] = ((sum & 0x0000000300000000) >> 26) | ((sum & 0x0000fc0000000000) >> 42); + buf[i++] = (char)(((sum & 0x0000000300000000) >> 26) | ((sum & 0x0000fc0000000000) >> 42)); if(offset--) { sum -= 0x004e000000000000; - buf[i] = ((sum & 0x0000030000000000) >> 34) | ((sum & 0x003f000000000000) >> 48); + buf[i] = (char)(((sum & 0x0000030000000000) >> 34) | ((sum & 0x003f000000000000) >> 48)); } } } diff --git a/base16384.h b/base16384.h index b63b0a8..6cb1270 100644 --- a/base16384.h +++ b/base16384.h @@ -23,10 +23,6 @@ #include #include #endif -#ifdef _MSC_VER -#include -typedef SSIZE_T ssize_t; -#endif enum base16384_err_t { base16384_err_ok, @@ -63,6 +59,13 @@ typedef enum base16384_err_t base16384_err_t; // forcely do sumcheck without checking data length #define BASE16384_FLAG_DO_SUM_CHECK_FORCELY (1<<2) +#ifdef _MSC_VER +#include +#ifndef ssize_t + #define SSIZE_T ssize_t; +#endif +#endif + /** * @brief custom reader function interface * @param client_data the data pointer defined by the client @@ -81,6 +84,12 @@ typedef ssize_t (*base16384_reader_t)(const void *client_data, void *buffer, siz */ typedef ssize_t (*base16384_writer_t)(const void *client_data, const void *buffer, size_t count); +#ifdef _MSC_VER +#ifdef ssize_t + #undef ssize_t +#endif +#endif + union base16384_io_function_t { base16384_reader_t reader; base16384_writer_t writer; diff --git a/binary.h b/binary.h index 46c7039..011ea7e 100644 --- a/binary.h +++ b/binary.h @@ -90,7 +90,11 @@ // initial sum value used in BASE16384_FLAG_SUM_CHECK_ON_REMAIN #define BASE16384_SIMPLE_SUM_INIT_VALUE (0x8e29c213) +#ifdef _MSC_VER +static inline uint32_t calc_sum(uint32_t sum, int cnt, const char* encbuf) { +#else static inline uint32_t calc_sum(uint32_t sum, size_t cnt, const char* encbuf) { +#endif size_t i; uint32_t buf; for(i = 0; i < cnt; i++) { diff --git a/file.c b/file.c index 3d9d872..72c3714 100644 --- a/file.c +++ b/file.c @@ -16,6 +16,12 @@ * along with this program. If not, see . */ +#ifdef _MSC_VER +#ifndef _CRT_SECURE_NO_WARNINGS + #define _CRT_SECURE_NO_WARNINGS +#endif +#endif + #ifndef __cosmopolitan #include #include @@ -91,7 +97,11 @@ base16384_err_t base16384_encode_file_detailed(const char* input, const char* ou fputc(0xFE, fpo); fputc(0xFF, fpo); } - size_t cnt; + #ifdef _MSC_VER + int cnt; + #else + size_t cnt; + #endif uint32_t sum = BASE16384_SIMPLE_SUM_INIT_VALUE; while((cnt = fread(encbuf, sizeof(char), inputsize, fp)) > 0) { int n; @@ -159,7 +169,11 @@ base16384_err_t base16384_encode_fp_detailed(FILE* input, FILE* output, char* en } off_t inputsize = _BASE16384_ENCBUFSZ; uint32_t sum = BASE16384_SIMPLE_SUM_INIT_VALUE; - size_t cnt; + #ifdef _MSC_VER + int cnt; + #else + size_t cnt; + #endif while((cnt = fread(encbuf, sizeof(char), inputsize, input)) > 0) { int n; while(cnt%7) { @@ -228,7 +242,7 @@ base16384_err_t base16384_encode_stream_detailed(base16384_stream_t* input, base uint32_t sum = BASE16384_SIMPLE_SUM_INIT_VALUE; if(!(flag&BASE16384_FLAG_NOHEADER)) call_writer(output, "\xfe\xff", 2); while((cnt = call_reader(input, encbuf, inputsize)) > 0) { - int n; + ssize_t n; while(cnt%7) { n = call_reader(input, encbuf+cnt, sizeof(char)); if(n > 0) cnt++; diff --git a/test/file_test.h b/test/file_test.h index 4fc165c..445163b 100644 --- a/test/file_test.h +++ b/test/file_test.h @@ -19,6 +19,12 @@ * along with this program. If not, see . */ +#ifdef _MSC_VER +#ifndef _CRT_SECURE_NO_WARNINGS + #define _CRT_SECURE_NO_WARNINGS +#endif +#endif + #include #define ok(has_failed, reason) \ From a254c8f9d6abd248775adfd1c33b7f7d00c6068b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sun, 7 Apr 2024 21:17:14 +0900 Subject: [PATCH 10/13] chore: adapt to MSVC --- base16384.h | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/base16384.h b/base16384.h index 6cb1270..10addcc 100644 --- a/base16384.h +++ b/base16384.h @@ -61,11 +61,18 @@ typedef enum base16384_err_t base16384_err_t; #ifdef _MSC_VER #include -#ifndef ssize_t - #define SSIZE_T ssize_t; -#endif #endif +#ifdef _MSC_VER +/** + * @brief custom reader function interface + * @param client_data the data pointer defined by the client + * @param buffer to where put data + * @param count read bytes count + * @return the size read +*/ +typedef SSIZE_T (*base16384_reader_t)(const void *client_data, void *buffer, size_t count); +#else /** * @brief custom reader function interface * @param client_data the data pointer defined by the client @@ -74,7 +81,18 @@ typedef enum base16384_err_t base16384_err_t; * @return the size read */ typedef ssize_t (*base16384_reader_t)(const void *client_data, void *buffer, size_t count); +#endif +#ifdef _MSC_VER +/** + * @brief custom writer function interface + * @param client_data the data pointer defined by the client + * @param buffer from where read data + * @param count write bytes count + * @return the size written +*/ +typedef SSIZE_T (*base16384_writer_t)(const void *client_data, const void *buffer, size_t count); +#else /** * @brief custom writer function interface * @param client_data the data pointer defined by the client @@ -83,11 +101,6 @@ typedef ssize_t (*base16384_reader_t)(const void *client_data, void *buffer, siz * @return the size written */ typedef ssize_t (*base16384_writer_t)(const void *client_data, const void *buffer, size_t count); - -#ifdef _MSC_VER -#ifdef ssize_t - #undef ssize_t -#endif #endif union base16384_io_function_t { From 541009c9d3118a41ad7da0fb50d1733593358bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sun, 7 Apr 2024 21:20:08 +0900 Subject: [PATCH 11/13] chore: adapt to MSVC --- base16384.h | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/base16384.h b/base16384.h index 10addcc..bc31063 100644 --- a/base16384.h +++ b/base16384.h @@ -23,6 +23,12 @@ #include #include #endif +#ifdef _MSC_VER +#include +#ifndef ssize_t +typedef SSIZE_T ssize_t; +#endif +#endif enum base16384_err_t { base16384_err_ok, @@ -59,20 +65,6 @@ typedef enum base16384_err_t base16384_err_t; // forcely do sumcheck without checking data length #define BASE16384_FLAG_DO_SUM_CHECK_FORCELY (1<<2) -#ifdef _MSC_VER -#include -#endif - -#ifdef _MSC_VER -/** - * @brief custom reader function interface - * @param client_data the data pointer defined by the client - * @param buffer to where put data - * @param count read bytes count - * @return the size read -*/ -typedef SSIZE_T (*base16384_reader_t)(const void *client_data, void *buffer, size_t count); -#else /** * @brief custom reader function interface * @param client_data the data pointer defined by the client @@ -81,18 +73,7 @@ typedef SSIZE_T (*base16384_reader_t)(const void *client_data, void *buffer, siz * @return the size read */ typedef ssize_t (*base16384_reader_t)(const void *client_data, void *buffer, size_t count); -#endif -#ifdef _MSC_VER -/** - * @brief custom writer function interface - * @param client_data the data pointer defined by the client - * @param buffer from where read data - * @param count write bytes count - * @return the size written -*/ -typedef SSIZE_T (*base16384_writer_t)(const void *client_data, const void *buffer, size_t count); -#else /** * @brief custom writer function interface * @param client_data the data pointer defined by the client @@ -101,7 +82,6 @@ typedef SSIZE_T (*base16384_writer_t)(const void *client_data, const void *buffe * @return the size written */ typedef ssize_t (*base16384_writer_t)(const void *client_data, const void *buffer, size_t count); -#endif union base16384_io_function_t { base16384_reader_t reader; From a0015e92b2cbcb348ef1604f7566c53312df46ff Mon Sep 17 00:00:00 2001 From: synodriver Date: Sun, 7 Apr 2024 21:12:48 +0800 Subject: [PATCH 12/13] Add windows CI for testing (#25) --- .github/workflows/test.yml | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 849628b..3d1e420 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,8 +2,8 @@ name: test on: [ push, pull_request ] jobs: - test: - name: Run CMake Test 🧪 + test_ubuntu: + name: Run CMake Test on Ubuntu (GCC) 🧪 runs-on: ubuntu-latest steps: @@ -31,3 +31,26 @@ jobs: cmake -DBUILD=test -DFORCE_32BIT=1 .. make make test || ctest --rerun-failed --output-on-failure + + test_windows: + name: Run CMake Test on Windows (MSVC) 🧪 + runs-on: windows-latest + steps: + + - name: Checkout Code + uses: actions/checkout@v2 + + - name: Build and Run 64bit Tests + run: | + cmake -E make_directory build + cmake -S . -B build -G "Visual Studio 17 2022" -A x64 "-DBUILD=test" + cmake --build build --config Release --target ALL_BUILD -- + ctest -C Release -T test --test-dir build || ctest -C Release -T test --test-dir build --rerun-failed --output-on-failure + + - name: Build and Run 32bit Tests + run: | + Remove-Item build -Force -Recurse + cmake -E make_directory build + cmake -S . -B build -G "Visual Studio 17 2022" -A x64 "-DBUILD=test" "-DFORCE_32BIT=1" + cmake --build build --config Release --target ALL_BUILD -- + ctest -C Release -T test --test-dir build || ctest -C Release -T test --test-dir build --rerun-failed --output-on-failure From 95237f2ebf60d6060754760550b2edd2f18ca81c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sun, 7 Apr 2024 22:17:29 +0900 Subject: [PATCH 13/13] chore: bump version to v2.3.1 --- CMakeLists.txt | 4 ++-- base16384.1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6309b8f..c918720 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8.12) if (POLICY CMP0048) cmake_policy(SET CMP0048 NEW) endif (POLICY CMP0048) -project(base16384 VERSION 2.3.0) +project(base16384 VERSION 2.3.1) add_definitions(-DBASE16384_VERSION="${PROJECT_VERSION}") -add_definitions(-DBASE16384_VERSION_DATE="April 6th 2024") +add_definitions(-DBASE16384_VERSION_DATE="April 7th 2024") message(STATUS "Testing endian...") include(TestBigEndian) diff --git a/base16384.1 b/base16384.1 index fdf85e6..76faa2a 100644 --- a/base16384.1 +++ b/base16384.1 @@ -1,4 +1,4 @@ -.TH BASE16384 1 "6 April 2024" "GNU" "User Commands" +.TH BASE16384 1 "7 April 2024" "GNU" "User Commands" .SH NAME base16384 \- Encode binary files to printable utf16be .SH SYNOPSIS