summaryrefslogtreecommitdiff
path: root/src/common/util.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-17 10:03:11 -0400
committerNick Mathewson <nickm@torproject.org>2012-09-17 10:03:11 -0400
commitc3f526ed64012f64589b926082ff5e542ec7d18d (patch)
treee85837f0956622fb222ab30a82232e37eecba726 /src/common/util.h
parent2939cc3ba3afe5ef2c6a273eef18577274e6867b (diff)
parentfaab7881894e55e71c0a19654f3c733c8b0d2920 (diff)
downloadtor-c3f526ed64012f64589b926082ff5e542ec7d18d.tar.gz
tor-c3f526ed64012f64589b926082ff5e542ec7d18d.zip
Merge branch '6044_nm_squashed'
Diffstat (limited to 'src/common/util.h')
-rw-r--r--src/common/util.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/common/util.h b/src/common/util.h
index 04812df7ca..6667978d18 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -361,6 +361,9 @@ struct stat;
#endif
char *read_file_to_str(const char *filename, int flags, struct stat *stat_out)
ATTR_MALLOC;
+char *read_file_to_str_until_eof(int fd, size_t max_bytes_to_read,
+ size_t *sz_out)
+ ATTR_MALLOC;
const char *parse_config_line_from_str(const char *line,
char **key_out, char **value_out);
char *expand_filename(const char *filename);