midfavila/sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

sort: Librarify getlines()

Browse Source
This commit is contained in:
Robert Ransom 2012-05-21 21:09:38 +00:00
parent 6a86755fee
commit 07b702d9a1
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -14,6 +14,7 @@ LIB = \
util/eprintf.o \ util/eprintf.o \
util/estrtol.o \ util/estrtol.o \
util/fnck.o \ util/fnck.o \
util/getlines.o \
util/putword.o \ util/putword.o \
util/recurse.o \ util/recurse.o \
util/rm.o util/rm.o

24
sort.c
View File

@ -12,16 +12,8 @@ static int linecmp(const char **, const char **);
static bool rflag = false; static bool rflag = false;
static bool uflag = false; static bool uflag = false;
struct linebuf {
char **lines;
long nlines;
long capacity;
};
#define EMPTY_LINEBUF {NULL, 0, 0,}
static struct linebuf linebuf = EMPTY_LINEBUF; static struct linebuf linebuf = EMPTY_LINEBUF;
static void getlines(FILE *, struct linebuf *);
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
@ -56,22 +48,6 @@ main(int argc, char *argv[])
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
void
getlines(FILE *fp, struct linebuf *b)
{
char *line = NULL;
size_t size = 0;
while(afgets(&line, &size, fp)) {
if(++b->nlines > b->capacity && !(b->lines = realloc(b->lines, (b->capacity+=512) * sizeof *b->lines)))
eprintf("realloc:");
if(!(b->lines[b->nlines-1] = malloc(strlen(line)+1)))
eprintf("malloc:");
strcpy(b->lines[b->nlines-1], line);
}
free(line);
}
int int
linecmp(const char **a, const char **b) linecmp(const char **a, const char **b)
{ {

8
text.h
View File

@ -1,4 +1,12 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
struct linebuf {
char **lines;
long nlines;
long capacity;
};
#define EMPTY_LINEBUF {NULL, 0, 0,}
void getlines(FILE *, struct linebuf *);
char *afgets(char **, size_t *, FILE *); char *afgets(char **, size_t *, FILE *);
void concat(FILE *, const char *, FILE *, const char *); void concat(FILE *, const char *, FILE *, const char *);