lcpp
/
lci
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated some library code

This commit is contained in:
Justin Meza 2014-05-05 11:30:35 -04:00
parent 5e567c90e3
commit 74b80b4aca
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
binding.c
View File

@ -1,5 +1,5 @@
#include "binding.h"
#include "inet.h" /* for SOCKS */
#include "inet.h" /* for sockets */
ValueObject *getArg(struct scopeobject *scope, char *name)
{
@ -98,8 +98,9 @@ ReturnObject *ireceiveWrapper(struct scopeobject *scope)
inet_host_t *remote = (inet_host_t *)getBlob(arg2);
int amount = getInteger(arg3);
char *data = malloc(sizeof(char) * amount);
inet_receive(remote, local, data, amount, -1);
char *data = malloc(sizeof(char) * (amount + 1));
int len = inet_receive(remote, local, data, amount, -1);
data[len] = '\0';
ValueObject *ret = createStringValueObject(data);
return createReturnObject(RT_RETURN, ret);
@ -125,9 +126,9 @@ ReturnObject *freadWrapper(struct scopeobject *scope)
FILE *file = (FILE *)getBlob(arg1);
int length = getInteger(arg2);
char *buf = malloc((sizeof(char) * length) + 1);
fread(buf, 1, length, file);
buf[length] = '\0';
char *buf = malloc(sizeof(char) * (length + 1));
int len = fread(buf, 1, length, file);
buf[len] = '\0';
ValueObject *ret = createStringValueObject(buf);
return createReturnObject(RT_RETURN, ret);
@ -155,6 +156,15 @@ ReturnObject *fcloseWrapper(struct scopeobject *scope)
return createReturnObject(RT_DEFAULT, NULL);
}
ReturnObject *ferrorWrapper(struct scopeobject *scope)
{
ValueObject *arg1 = getArg(scope, "file");
FILE *file = (FILE *)getBlob(arg1);
ValueObject *ret = createBooleanValueObject(file == NULL || ferror(file));
return createReturnObject(RT_RETURN, ret);
}
ReturnObject *rewindWrapper(struct scopeobject *scope)
{
ValueObject *arg1 = getArg(scope, "file");
@ -208,6 +218,7 @@ void loadLibrary(ScopeObject *scope, IdentifierNode *target)
if (!lib) goto loadLibraryAbort;
loadBinding(lib, "OPEN", "filename mode", &fopenWrapper);
loadBinding(lib, "DIAF", "file", &ferrorWrapper);
loadBinding(lib, "LUK", "file length", &freadWrapper);
loadBinding(lib, "SCRIBBEL", "file data", &fwriteWrapper);
loadBinding(lib, "AGEIN", "file", &rewindWrapper);

4
interpreter.c
View File

@ -1406,6 +1406,10 @@ ValueObject *castStringExplicit(ValueObject *node,
temp[a] = '\n';
a++, b += 2;
}
else if (!strncmp(str + b, ":3", 2)) {
temp[a] = '\r';
a++, b += 2;
}
else if (!strncmp(str + b, ":>", 2)) {
temp[a] = '\t';
a++, b += 2;