From 6ed8515e8a91b529c3b8034315b8f5a4fab9732e Mon Sep 17 00:00:00 2001 From: Sergey Khalyutn Date: Thu, 5 Feb 2026 18:07:09 +0200 Subject: [PATCH 1/3] function inet_error as 5 parameters inet_error(bool releasePort, rem_port* port, const TEXT* function, ISC_STATUS operation, int status) --- src/remote/inet.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/remote/inet.cpp b/src/remote/inet.cpp index 3bba75ef52c..81ab575aa41 100644 --- a/src/remote/inet.cpp +++ b/src/remote/inet.cpp @@ -3121,7 +3121,9 @@ static bool packet_receive(rem_port* port, UCHAR* buffer, SSHORT buffer_length, INET_force_error = 1; try { - inet_error(false, port, "simulated error - read", isc_net_read_err); + // function inet_error as 5 parameters + // inet_error(bool releasePort, rem_port* port, const TEXT* function, ISC_STATUS operation, int status) + inet_error(false, port, "simulated error - read", isc_net_read_err, 0); } catch (const Exception&) { } return false; From 29c311fd855704ccf558b63682a97a68c608b20a Mon Sep 17 00:00:00 2001 From: Sergey Khalyutn <124491821+Khalyutin@users.noreply.github.com> Date: Sat, 7 Feb 2026 15:07:49 +0200 Subject: [PATCH 2/3] Update src/remote/inet.cpp Co-authored-by: Adriano dos Santos Fernandes <529415+asfernandes@users.noreply.github.com> --- src/remote/inet.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/remote/inet.cpp b/src/remote/inet.cpp index 81ab575aa41..0f2d35f0301 100644 --- a/src/remote/inet.cpp +++ b/src/remote/inet.cpp @@ -3121,8 +3121,6 @@ static bool packet_receive(rem_port* port, UCHAR* buffer, SSHORT buffer_length, INET_force_error = 1; try { - // function inet_error as 5 parameters - // inet_error(bool releasePort, rem_port* port, const TEXT* function, ISC_STATUS operation, int status) inet_error(false, port, "simulated error - read", isc_net_read_err, 0); } catch (const Exception&) { } From 7a1f319be34cefd6cf84aae12a986d7feebff94e Mon Sep 17 00:00:00 2001 From: Sergey Khalyutn Date: Sun, 8 Feb 2026 10:11:29 +0200 Subject: [PATCH 3/3] if parsing file was created in windows but processing on linux we need delete windows end of line mark as \r\n (CR + LF) Otherwise, the file will not be found. more info: https://github.com/ChrisDodd/btyacc/pull/32 --- extern/btyacc/reader.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/extern/btyacc/reader.c b/extern/btyacc/reader.c index 435e5ad3f48..8cddc739e94 100644 --- a/extern/btyacc/reader.c +++ b/extern/btyacc/reader.c @@ -147,10 +147,13 @@ char *get_line() { /* VM: Process %include line */ if(strncmp(&line[0], "%include ", 9)==0) { int ii=0; - for(i=9; line[i]!='\n' && line[i]!=' '; i++, ii++) { - inc_file_name[ii] = line[i]; - } - inc_file_name[ii] = 0; + + char *inc_file_name = line+9; + while (isspace(*inc_file_name)) inc_file_name++; + i = strlen(inc_file_name); + while (i > 0 && isspace(inc_file_name[i-1])) --i; + inc_file_name[i] = 0; + if(inc_file) { error(lineno, 0, 0, "Nested include lines are not allowed"); }