Skip to content

reading from a file should not stop at zero byte #20

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

reading from a file should not stop at zero byte #20

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
16 changes: 8 additions & 8 deletions winapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1791,11 +1791,9 @@ static void File_ctor(lua_State *L, File *this, HANDLE hread, HANDLE hwrite) {
return 1;
}

static BOOL raw_read (File *this) {
DWORD bytesRead = 0;
BOOL res = ReadFile(lcb_handle(this), lcb_buf(this), lcb_bufsz(this), &bytesRead, NULL);
lcb_buf(this)[bytesRead] = '\0';
return res && bytesRead;
static BOOL raw_read (File *this, DWORD *bytesRead) {
BOOL res = ReadFile(lcb_handle(this), lcb_buf(this), lcb_bufsz(this), bytesRead, NULL);
return res && *bytesRead;
}

/// read from a file.
Expand All @@ -1805,9 +1803,10 @@ static void File_ctor(lua_State *L, File *this, HANDLE hread, HANDLE hwrite) {
// @function read
static int l_File_read(lua_State *L) {
File *this = File_arg(L,1);
DWORD bytesRead;
#line 1299 "winapi.l.c"
if (raw_read(this)) {
lua_pushstring(L,lcb_buf(this));
if (raw_read(this, &bytesRead)) {
lua_pushlstring(L,lcb_buf(this), bytesRead);
return 1;
} else {
return push_error(L);
Expand All @@ -1817,7 +1816,8 @@ static void File_ctor(lua_State *L, File *this, HANDLE hread, HANDLE hwrite) {
static void file_reader (File *this) { // background reader thread
int n;
do {
n = raw_read(this);
DWORD len;
n = raw_read(this, &len);
// empty buffer is passed at end - we can discard the callback then.
lcb_call (this,0,lcb_buf(this),n == 0 ? DISCARD : 0);
} while (n);
Expand Down