AkaiiKitsune/aimeio-cardreader
1
0
Fork 0
Code Releases 4 Activity

Fixed an off-by-one error and config loading for reader name

Browse Source 
Reading card 3 and above resulted in an off by one error that always threw a "this line isn't X bytes long" error.

Readername now always gets properly loaded from config :
I've added comments in the config file to make it obvious what each line does but that fucked up the reader name config. i'm now discarding the comment after loading the line.
This commit is contained in:
Farewell_ 2024-04-24 14:27:27 +02:00
parent cf4c289253
commit a7a0868a81
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/aimeio.c
View File

@ -9,6 +9,27 @@ static struct aime_io_config aime_io_cfg;
static struct card_data card_data;
#pragma region CONFIG
// This is used because otherwise loading a reader with a given name while keeping the comment inline in the config file fails..
void RemoveCommentAndTruncate(wchar_t *value)
{
size_t len = wcslen(value);
wchar_t *semicolon = NULL;
// Remove comments
semicolon = wcschr(value, L';');
if (semicolon != NULL)
{
*semicolon = L'\0';
len = wcslen(value);
}
// Trim trailing whitespaces
while (len > 0 && (value[len - 1] == L' ' || value[len - 1] == L'\t' || value[len - 1] == L'\r' || value[len - 1] == L'\n'))
{
value[--len] = L'\0';
}
}
static void aime_io_config_read(struct aime_io_config *cfg, const wchar_t *filename)
{
assert(cfg != NULL);
@ -43,6 +64,7 @@ static void aime_io_config_read(struct aime_io_config *cfg, const wchar_t *filen
cfg->reader_name,
_countof(cfg->reader_name),
filename);
RemoveCommentAndTruncate(cfg->reader_name);
cfg->reader_optional = GetPrivateProfileIntW(
L"aimeio",
@ -95,7 +117,10 @@ static HRESULT aime_io_read_id_file(const wchar_t *path, uint8_t *bytes, size_t
}
if (c == '\n')
{
currentLine++;
offset++;
}
offset++;
}