nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Put getdelim(3) and getline(3) in their own files.

This commit is contained in:
Jonas 'Sortie' Termansen 2012-09-26 19:26:04 +02:00
parent 97deb8bb8a
commit 60214a9dfb
4 changed files with 95 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmaxsi/Makefile
View File

@ -69,6 +69,8 @@ ftello.o \
fwritable.o \
fwrite.o \
fwriting.o \
getdelim.o \
getline.o \
heap.o \
integer.o \
mbtowc.o \

63
libmaxsi/getdelim.cpp Normal file
View File

@ -0,0 +1,63 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
This file is part of LibMaxsi.
LibMaxsi is free software: you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
LibMaxsi is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
details.
You should have received a copy of the GNU Lesser General Public License
along with LibMaxsi. If not, see <http://www.gnu.org/licenses/>.
getdelim.cpp
Delimited string input.
*******************************************************************************/
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
ssize_t getdelim(char** lineptr, size_t* n, int delim, FILE* fp)
{
if ( !lineptr || (*lineptr && !n) || !fp ) { errno = EINVAL; return -1; }
const size_t DEFAULT_BUFSIZE = 32UL;
int malloced = !*lineptr;
if ( malloced ) { *lineptr = (char*) malloc(DEFAULT_BUFSIZE); }
if ( !*lineptr ) { return -1; }
size_t bufsize = malloced ? DEFAULT_BUFSIZE : *n;
if ( n ) { *n = bufsize; }
ssize_t written = 0;
int c;
do
{
if ( (c = getc(fp)) == EOF )
{
if ( written ) { break; } else { goto cleanup; }
}
if ( bufsize <= (size_t) written + 1UL )
{
size_t newbufsize = 2UL * bufsize;
char* newbuf = (char*) realloc(*lineptr, newbufsize);
if ( !newbuf ) { goto cleanup; }
bufsize = newbufsize;
if ( n ) { *n = bufsize; }
*lineptr = newbuf;
}
(*lineptr)[written++] = c;
} while ( c != delim );
(*lineptr)[written] = 0;
return written;
cleanup:
free(malloced ? *lineptr : NULL);
return -1;
}

30
libmaxsi/getline.cpp Normal file
View File

@ -0,0 +1,30 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
This file is part of LibMaxsi.
LibMaxsi is free software: you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
LibMaxsi is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
details.
You should have received a copy of the GNU Lesser General Public License
along with LibMaxsi. If not, see <http://www.gnu.org/licenses/>.
getline.cpp
Reads a line from a FILE.
*******************************************************************************/
#include <stdio.h>
ssize_t getline(char** lineptr, size_t* n, FILE* fp)
{
return getdelim(lineptr, n, '\n', fp);
}

42
libmaxsi/stdio.c
View File

@ -51,47 +51,6 @@ int putchar(int c)
return fputc(c, stdout);
}
ssize_t getdelim(char** lineptr, size_t* n, int delim, FILE* fp)
{
if ( !lineptr || (*lineptr && !n) || !fp ) { errno = EINVAL; return -1; }
const size_t DEFAULT_BUFSIZE = 32UL;
int malloced = !*lineptr;
if ( malloced ) { *lineptr = (char*) malloc(DEFAULT_BUFSIZE); }
if ( !*lineptr ) { return -1; }
size_t bufsize = malloced ? DEFAULT_BUFSIZE : *n;
if ( n ) { *n = bufsize; }
ssize_t written = 0;
int c;
do
{
if ( (c = getc(fp)) == EOF )
{
if ( written ) { break; } else { goto cleanup; }
}
if ( bufsize <= (size_t) written + 1UL )
{
size_t newbufsize = 2UL * bufsize;
char* newbuf = (char*) realloc(*lineptr, newbufsize);
if ( !newbuf ) { goto cleanup; }
bufsize = newbufsize;
if ( n ) { *n = bufsize; }
*lineptr = newbuf;
}
(*lineptr)[written++] = c;
} while ( c != delim );
(*lineptr)[written] = 0;
return written;
cleanup:
free(malloced ? *lineptr : NULL);
return -1;
}
ssize_t getline(char** lineptr, size_t* n, FILE* fp)
{
return getdelim(lineptr, n, '\n', fp);
}
char* sortix_gets(void)
{
char* buf = NULL;
@ -106,4 +65,3 @@ int puts(const char* str)
{
return printf("%s\n", str) < 0 ? EOF : 1;
}