From ea23115af449e086ba05c9757ad22108944f6ec2 Mon Sep 17 00:00:00 2001 From: Bert Date: Sun, 29 May 2011 11:45:58 +0200 Subject: Use getline instead of readline --- util.c | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index e16de94..3957629 100644 --- a/util.c +++ b/util.c @@ -140,7 +140,7 @@ char* absolute_path(const char *filename) { path = (char*) s_malloc(len); snprintf(path, len, "%s/%s", dir, basename); -goto end; + goto end; error: if (path) { @@ -297,39 +297,3 @@ int r_mkdir(const char *path) { return err; } - -char* readline(FILE *stream) { - size_t len; - char *buf, *s, *end; - - if (!stream || feof(stream) || ferror(stream)) - return NULL; - - len = FNAME_LEN; - s = buf = (char*) s_malloc(len * sizeof(char)); - - do { - *s = '\0'; - fgets(s, len - (s - buf), stream); - if ((end = strchr(s, '\n'))) { - *end = '\0'; - } else if (strlen(s) + 1 == len - (s - buf)) { - buf = (char*) s_realloc(buf, 2 * len * sizeof(char)); - s = buf + len - 1; - len *= 2; - } else { - s += strlen(s); - } - } while (!end && !feof(stream) && !ferror(stream)); - - if (ferror(stream)) { - s = NULL; - } else { - s = (char*) s_malloc((strlen(buf) + 1) * sizeof(char)); - strcpy(s, buf); - } - - free(buf); - - return s; -} -- cgit v1.2.3