Skip to content

Modified for proper checking of \r (CR) Mac line endings #136

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modified for proper checking of \r (CR) Mac line endings #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions csv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ namespace io{
}

int line_end = data_begin;
while(line_end != data_end && buffer[line_end] != '\n'){
while(line_end != data_end && buffer[line_end] != '\n' && buffer[line_end] != '\r'){
++line_end;
}

Expand All @@ -476,20 +476,24 @@ namespace io{
err.set_file_line(file_line);
throw err;
}

// handle linux \n- and windows \r\n-line breaks
if(line_end != data_end && buffer[line_end] == '\n'){
buffer[line_end] = '\0';
}else{
// handle windows \r\n-line breaks
if(line_end != data_begin && buffer[line_end-1] == '\r')
buffer[line_end-1] = '\0';
}
// handle mac \r-line breaks
else if(line_end != data_end && buffer[line_end] == '\r') {
buffer[line_end] = '\0';
}
else{
// some files are missing the newline at the end of the
// last line
++data_end;
buffer[line_end] = '\0';
}

// handle windows \r\n-line breaks
if(line_end != data_begin && buffer[line_end-1] == '\r')
buffer[line_end-1] = '\0';

char*ret = buffer.get() + data_begin;
data_begin = line_end+1;
return ret;
Expand Down