mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vcs-svn: allow input from file descriptor

Browse Source 
Based-on-patch-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
This commit is contained in:
Jonathan Nieder
2011-01-02 21:09:38 -06:00
parent cc193f1f0b
commit cb3f87cf1b
5 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
t/t0081-line-buffer.sh
View File

@ -131,6 +131,15 @@ test_expect_success PIPE,EXPENSIVE 'longer read (around 65536 bytes)' '
long_read_test 65536 long_read_test 65536
' '
test_expect_success 'read from file descriptor' '
rm -f input &&
echo hello >expect &&
echo hello >input &&
echo copy 6 |
test-line-buffer "&4" 4<input >actual &&
test_cmp expect actual
'
test_expect_success 'buffer_read_string copes with null byte' ' test_expect_success 'buffer_read_string copes with null byte' '
>expect && >expect &&
q_to_nul <<-\EOF | test-line-buffer >actual && q_to_nul <<-\EOF | test-line-buffer >actual &&

11
test-line-buffer.c
View File

@ -69,13 +69,18 @@ int main(int argc, char *argv[])
else if (argc == 2) else if (argc == 2)
filename = argv[1]; filename = argv[1];
else else
usage("test-line-buffer [file] < script"); usage("test-line-buffer [file | &fd] < script");
if (buffer_init(&stdin_buf, NULL)) if (buffer_init(&stdin_buf, NULL))
die_errno("open error"); die_errno("open error");
if (filename) { if (filename) {
if (buffer_init(&file_buf, filename)) if (*filename == '&') {
die_errno("error opening %s", filename); if (buffer_fdinit(&file_buf, strtouint32(filename + 1)))
die_errno("error opening fd %s", filename + 1);
} else {
if (buffer_init(&file_buf, filename))
die_errno("error opening %s", filename);
}
input = &file_buf; input = &file_buf;
} }

8
vcs-svn/line_buffer.c
View File

@ -17,6 +17,14 @@ int buffer_init(struct line_buffer *buf, const char *filename)
return 0; return 0;
} }
int buffer_fdinit(struct line_buffer *buf, int fd)
{
buf->infile = fdopen(fd, "r");
if (!buf->infile)
return -1;
return 0;
}
int buffer_deinit(struct line_buffer *buf) int buffer_deinit(struct line_buffer *buf)
{ {
int err; int err;

1
vcs-svn/line_buffer.h
View File

@ -13,6 +13,7 @@ struct line_buffer {
#define LINE_BUFFER_INIT {"", STRBUF_INIT, NULL} #define LINE_BUFFER_INIT {"", STRBUF_INIT, NULL}
int buffer_init(struct line_buffer *buf, const char *filename); int buffer_init(struct line_buffer *buf, const char *filename);
int buffer_fdinit(struct line_buffer *buf, int fd);
int buffer_deinit(struct line_buffer *buf); int buffer_deinit(struct line_buffer *buf);
char *buffer_read_line(struct line_buffer *buf); char *buffer_read_line(struct line_buffer *buf);
char *buffer_read_string(struct line_buffer *buf, uint32_t len); char *buffer_read_string(struct line_buffer *buf, uint32_t len);

9
vcs-svn/line_buffer.txt
View File

@ -27,10 +27,11 @@ resources.
Functions Functions
--------- ---------
`buffer_init`:: `buffer_init`, `buffer_fdinit`::
Open the named file for input. If filename is NULL, Open the named file or file descriptor for input.
start reading from stdin. On failure, returns -1 (with buffer_init(buf, NULL) prepares to read from stdin.
errno indicating the nature of the failure). On failure, returns -1 (with errno indicating the nature
of the failure).
`buffer_deinit`:: `buffer_deinit`::
Stop reading from the current file (closing it unless Stop reading from the current file (closing it unless