Skip to content

Build process chash when btyacc parse file was created in windows with end of line mark as \r\n #8887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Khalyutin wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Build process chash when btyacc parse file was created in windows with end of line mark as \r\n #8887

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e08fa59
if parsing file was created in windows but processing on linux we ne…
Khalyutin Feb 8, 2026
d2be8b3
end not deed ii
Khalyutin Feb 8, 2026
e445814
correct to minimal change
Khalyutin Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions extern/btyacc/reader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,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;
Copy link
Copy Markdown
Member

@hvlad hvlad Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inc_file_name is already declared as global variable at line 26 above.
It is used later in other functions.
This change break it, AFAIU

Copy link
Copy Markdown
Contributor Author

@Khalyutin Khalyutin Feb 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you're right, the consequences of breaking a global variable "inc_file_name", are unpredictable.

The PR to the btyacc original source tree was intended to clarify the initial understanding regarding the handling of "\r\n" characters.

However, an attempt to integrate the original code from the btyacc source was failed...

My original idea was to handle only "\r\n" EndOfLine characters without touching anything else:

-- for(i=9; line[i]!='\n' && line[i]!=' '; i++, ii++) {
++ for(i=9; line[i]!='\n' && line[i]!=' ' && !(line[i] =='\r' && line[i+1]=='\n'); i++, ii++) {

Is this acceptable?

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");
}
Expand Down
Loading