e63f318 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

Added BSD licensed getline and used that to read string from file

e63f318Ahmad Salim Al-Sibahi12 years ago

rts/getline.cnew file+81

compare with master

unifiedsplit

@@ -0,0 +1,81 @@

1+/* $NetBSD: fgetln.c,v 1.9 2008/04/29 06:53:03 martin Exp $ */

3+/*-

6+ *

7+ * This code is derived from software contributed to The NetBSD Foundation

8+ * by Christos Zoulas.

9+ *

10+ * Redistribution and use in source and binary forms, with or without

11+ * modification, are permitted provided that the following conditions

12+ * are met:

13+ * 1. Redistributions of source code must retain the above copyright

14+ * notice, this list of conditions and the following disclaimer.

15+ * 2. Redistributions in binary form must reproduce the above copyright

16+ * notice, this list of conditions and the following disclaimer in the

17+ * documentation and/or other materials provided with the distribution.

18+ *

19+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS

20+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

21+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

22+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS

23+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

24+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

25+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

26+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

27+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

28+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

29+ * POSSIBILITY OF SUCH DAMAGE.

30+ */

31+

32+#include <stdlib.h>

33+#include <stdio.h>

34+#include <unistd.h>

35+#include <errno.h>

36+#include <string.h>

37+

38+ssize_t

39+getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)

40+{

41+ char *ptr, *eptr;

42+

43+

44+ if (*buf == NULL || *bufsiz == 0) {

45+ *bufsiz = BUFSIZ;

46+ if ((*buf = malloc(*bufsiz)) == NULL)

47+ return -1;

48+ }

49+

50+ for (ptr = *buf, eptr = *buf + *bufsiz;;) {

51+ int c = fgetc(fp);

52+ if (c == -1) {

53+ if (feof(fp))

54+ return ptr == *buf ? -1 : ptr - *buf;

55+ else

56+ return -1;

57+ }

58+ *ptr++ = c;

59+ if (c == delimiter) {

60+ *ptr = '\0';

61+ return ptr - *buf;

62+ }

63+ if (ptr + 2 >= eptr) {

64+ char *nbuf;

65+ size_t nbufsiz = *bufsiz * 2;

66+ ssize_t d = ptr - *buf;

67+ if ((nbuf = realloc(*buf, nbufsiz)) == NULL)

68+ return -1;

69+ *buf = nbuf;

70+ *bufsiz = nbufsiz;

71+ eptr = nbuf + nbufsiz;

72+ ptr = nbuf + d;

73+ }

74+ }

75+}

76+

77+ssize_t

78+getline(char **buf, size_t *bufsiz, FILE *fp)

79+{

80+ return getdelim(buf, bufsiz, '\n', fp);

81+}

rts/getline.hnew file+7

@@ -0,0 +1,7 @@

1+#ifndef GETLINE_H

2+#define GETLINE_H

3+#include <stdlib.h>

4+#include <stdio.h>

5+ssize_t getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp);

6+ssize_t getline(char **buf, size_t *bufsiz, FILE *fp);

7+#endif // GETLINE_H

rts/idris_rts.c+4−5

@@ -4,6 +4,7 @@

4#include "idris_gc.h"

5#include "idris_utf8.h"

6#include "idris_bitstring.h"

7+#include "getline.h"

8#ifdef HAS_PTHREAD

9#ifdef HAS_PTHREAD

9static pthread_key_t vm_key;

10static pthread_key_t vm_key;

@@ -500,12 +501,10 @@ VAL idris_strlen(VM* vm, VAL l) {

500}

501}

501

502

502VAL idris_readStr(VM* vm, FILE* h) {

503VAL idris_readStr(VM* vm, FILE* h) {

503− // FIXME (quickly...): This will fail if there is a line longer than

504+ char *buffer = NULL;

504− // bufsize characters!

505+ size_t n = 0;

505− int bufsize = 255;

506

507− char* buffer = malloc(bufsize+1);

508− if (fgets(buffer, bufsize, h) == 0) {

507+ if (getline(&buffer, &n, h) == 0) {

509 return MKSTR(vm, "");

508 return MKSTR(vm, "");

510 } else {

509 } else {

511 return MKSTR(vm, buffer);

510 return MKSTR(vm, buffer);