e832f43c1d
buffer_read_string works well for non line-oriented input except for one problem: it does not tell the caller how many bytes were actually written. This means that unless one is very careful about checking for errors (and eof) the calling program cannot tell the difference between the string "foo" followed by an early end of file and the string "foo\0bar\0baz". So introduce a variant that reports the length, too, a thinner wrapper around strbuf_fread. Its result is written to a strbuf so the caller does not need to keep track of the number of bytes read. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
25 lines
735 B
C
25 lines
735 B
C
#ifndef LINE_BUFFER_H_
|
|
#define LINE_BUFFER_H_
|
|
|
|
#include "strbuf.h"
|
|
|
|
#define LINE_BUFFER_LEN 10000
|
|
|
|
struct line_buffer {
|
|
char line_buffer[LINE_BUFFER_LEN];
|
|
struct strbuf blob_buffer;
|
|
FILE *infile;
|
|
};
|
|
#define LINE_BUFFER_INIT {"", STRBUF_INIT, NULL}
|
|
|
|
int buffer_init(struct line_buffer *buf, const char *filename);
|
|
int buffer_deinit(struct line_buffer *buf);
|
|
char *buffer_read_line(struct line_buffer *buf);
|
|
char *buffer_read_string(struct line_buffer *buf, uint32_t len);
|
|
void buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, uint32_t len);
|
|
void buffer_copy_bytes(struct line_buffer *buf, uint32_t len);
|
|
void buffer_skip_bytes(struct line_buffer *buf, uint32_t len);
|
|
void buffer_reset(struct line_buffer *buf);
|
|
|
|
#endif
|