summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar default2022-10-17 20:32:47 +0200
committerGravatar default2022-10-17 20:32:47 +0200
commit3d5cf0f069e0f0e6cf47a8ffc2c515b8db795ad0 (patch)
tree31b8eaf486735c2d5305d994ce5497421c6102ae
parentAdded some forgotten fclose() calls. (diff)
downloadpenes-snac2-3d5cf0f069e0f0e6cf47a8ffc2c515b8db795ad0.tar.gz
penes-snac2-3d5cf0f069e0f0e6cf47a8ffc2c515b8db795ad0.tar.xz
penes-snac2-3d5cf0f069e0f0e6cf47a8ffc2c515b8db795ad0.zip
Backport from xs.
-rw-r--r--xs_io.h30
-rw-r--r--xs_version.h2
2 files changed, 12 insertions, 20 deletions
diff --git a/xs_io.h b/xs_io.h
index 1379a34..9649484 100644
--- a/xs_io.h
+++ b/xs_io.h
@@ -4,31 +4,13 @@
4 4
5#define _XS_IO_H 5#define _XS_IO_H
6 6
7d_char *xs_readall(FILE *f);
8d_char *xs_readline(FILE *f); 7d_char *xs_readline(FILE *f);
9d_char *xs_read(FILE *f, int *size); 8d_char *xs_read(FILE *f, int *size);
9d_char *xs_readall(FILE *f);
10 10
11 11
12#ifdef XS_IMPLEMENTATION 12#ifdef XS_IMPLEMENTATION
13 13
14d_char *xs_readall(FILE *f)
15/* reads the rest of the file into a string */
16{
17 d_char *s;
18 char tmp[1024];
19
20 errno = 0;
21
22 /* create the new string */
23 s = xs_str_new(NULL);
24
25 while (fgets(tmp, sizeof(tmp), f))
26 s = xs_str_cat(s, tmp);
27
28 return s;
29}
30
31
32d_char *xs_readline(FILE *f) 14d_char *xs_readline(FILE *f)
33/* reads a line from a file */ 15/* reads a line from a file */
34{ 16{
@@ -93,6 +75,16 @@ d_char *xs_read(FILE *f, int *sz)
93 return s; 75 return s;
94} 76}
95 77
78
79d_char *xs_readall(FILE *f)
80/* reads the rest of the file into a string */
81{
82 int size = 0xfffffff;
83
84 return xs_read(f, &size);
85}
86
87
96#endif /* XS_IMPLEMENTATION */ 88#endif /* XS_IMPLEMENTATION */
97 89
98#endif /* _XS_IO_H */ 90#endif /* _XS_IO_H */
diff --git a/xs_version.h b/xs_version.h
index c408db0..1266a4f 100644
--- a/xs_version.h
+++ b/xs_version.h
@@ -1 +1 @@
/* d1bebf4154dd42f20c981f65325b33eadacfb1d8 */ /* 2d6bb8fdf48f1c9ccfce76600eb1d729edce7bef */