gered/picoc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed some problems with getc() not removing EOL as it should.

Browse source 
git-svn-id: http://picoc.googlecode.com/svn/trunk@512 21eae674-98b7-11dd-bd71-f92a316d2d60
This commit is contained in:
zik.saleeba 2011-02-12 02:42:17 +00:00
parent 4da8196e9d
commit 235736ed93
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
clibrary.c
View file

@ -322,16 +322,13 @@ void LibSPrintf(struct ParseState *Parser, struct Value *ReturnValue, struct Val
/* get a line of input. protected from buffer overrun */ /* get a line of input. protected from buffer overrun */
void LibGets(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs) void LibGets(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
{ {
struct Value *CharArray = (struct Value *)(Param[0]->Val->Pointer); ReturnValue->Val->Pointer = PlatformGetLine(Param[0]->Val->Pointer, GETS_BUF_MAX, NULL);
char *ReadBuffer = &CharArray->Val->ArrayMem[0]; if (ReturnValue->Val->Pointer != NULL)
char *Result; {
char *EOLPos = strchr(Param[0]->Val->Pointer, '\n');
ReturnValue->Val->Pointer = NULL; if (EOLPos != NULL)
Result = PlatformGetLine(ReadBuffer, GETS_BUF_MAX, NULL); *EOLPos = '\0';
if (Result == NULL) }
return;
ReturnValue->Val->Pointer = Param[0]->Val->Pointer;
} }
void LibGetc(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs) void LibGetc(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
@ -601,7 +598,7 @@ struct LibraryFunction CLibrary[] =
{ {
{ LibPrintf, "void printf(char *, ...);" }, { LibPrintf, "void printf(char *, ...);" },
{ LibSPrintf, "char *sprintf(char *, char *, ...);" }, { LibSPrintf, "char *sprintf(char *, char *, ...);" },
{ LibGets, "void gets(char *, int);" }, { LibGets, "void gets(char *);" },
{ LibGetc, "int getchar();" }, { LibGetc, "int getchar();" },
{ LibExit, "void exit(int);" }, { LibExit, "void exit(int);" },
#ifdef PICOC_MATH_LIBRARY #ifdef PICOC_MATH_LIBRARY

6
cstdlib/stdio.c
View file

@ -490,6 +490,12 @@ void StdioPuts(struct ParseState *Parser, struct Value *ReturnValue, struct Valu
void StdioGets(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs) void StdioGets(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
{ {
ReturnValue->Val->Pointer = fgets(Param[0]->Val->Pointer, GETS_MAXValue, stdin); ReturnValue->Val->Pointer = fgets(Param[0]->Val->Pointer, GETS_MAXValue, stdin);
if (ReturnValue->Val->Pointer != NULL)
{
char *EOLPos = strchr(Param[0]->Val->Pointer, '\n');
if (EOLPos != NULL)
*EOLPos = '\0';
}
} }
void StdioGetchar(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs) void StdioGetchar(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)