Skip to content

Fix `FileString~ for string > 2G (#862 for stable-4.8) #875

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

Merged
markuspf merged 3 commits into from
Aug 4, 2016
Merged

Fix `FileString~ for string > 2G (#862 for stable-4.8) #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1937ac9
Fix `FileString~ for string > 2G
frankluebeck Jul 20, 2016
645c70d
Correct a typo.
frankluebeck Jul 20, 2016
c11b3dd
Fix for StringFile for file > 2G
frankluebeck Jul 20, 2016
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
11 changes: 10 additions & 1 deletion lib/string.gi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,11 @@ InstallGlobalFunction(StringFile, function(name)
return fail;
fi;
str := READ_STRING_FILE(f![1]);
if str = fail then
CloseStream(f);
Error("in StringFile: ", LastSystemError().message, "\n");
return fail;
fi;
CloseStream(f);
return str;
end);
Expand All @@ -803,7 +808,11 @@ InstallGlobalFunction(FileString, function(arg)
return fail;
fi;
IS_STRING_CONV(str);
WRITE_STRING_FILE_NC(out![1], str);
if WRITE_STRING_FILE_NC(out![1], str) = fail then
CloseStream(out);
Error("in FileString: ", LastSystemError().message, "\n");
return fail;
fi;
CloseStream(out);
return Length(str);
end);
Expand Down
49 changes: 35 additions & 14 deletions src/streams.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1947,24 +1947,36 @@ Obj FuncWRITE_STRING_FILE_NC (
Obj fid,
Obj str )
{
Int len = 0, ret;
Int len = 0, l, ret;
char *ptr;

/* don't check the argument */

len = GET_LEN_STRING(str);
ret = write( syBuf[INT_INTOBJ(fid)].echo, CHARS_STRING(str), len);
return (ret == len)?True : Fail;
ptr = CSTR_STRING(str);
while (len > 0) {
l = (len > 1048576) ? 1048576 : len;
ret = write( syBuf[INT_INTOBJ(fid)].echo, ptr, l);
if (ret == -1) {
SySetErrorNo();
return Fail;
}
len -= ret;
ptr += ret;
}
return True;
}


Obj FuncREAD_STRING_FILE (
Obj self,
Obj fid )
{
Char buf[20001];
Int ret, len;
Char buf[32769];
Int ret, len, l;
UInt lstr;
Obj str;
char *ptr;

/* check the argument */
while ( ! IS_INTOBJ(fid) ) {
Expand All @@ -1990,23 +2002,32 @@ Obj FuncREAD_STRING_FILE (
}
len = (Int) fstatbuf.st_size;
str = NEW_STRING( len );
ret = read( syBuf[INT_INTOBJ(fid)].fp,
CHARS_STRING(str), len);
CHARS_STRING(str)[ret] = '\0';
SET_LEN_STRING(str, ret);
if ( (off_t) ret == fstatbuf.st_size ) {
return str;
CHARS_STRING(str)[len] = '\0';
SET_LEN_STRING(str, len);
ptr = CSTR_STRING(str);
while (len > 0) {
l = (len > 1048576) ? 1048576 : len;
ret = read( syBuf[INT_INTOBJ(fid)].fp, ptr, l);
if (ret == -1) {
SySetErrorNo();
return Fail;
}
len -= ret;
ptr += ret;
}
return str;
}
}
#endif
#endif
/* read <fid> until we see eof (in 20kB pieces) */
/* read <fid> until we see eof (in 32kB pieces) */
str = NEW_STRING(0);
len = 0;
while (1) {
if ( (ret = read( syBuf[INT_INTOBJ(fid)].fp , buf, 20000)) <= 0 )
break;
if ( (ret = read( syBuf[INT_INTOBJ(fid)].fp , buf, 32768)) <= 0 ) {
SySetErrorNo();
return Fail;
}
len += ret;
GROW_STRING( str, len );
lstr = GET_LEN_STRING(str);
Expand Down