diff options
| author | Werner Koch <[email protected]> | 2011-11-30 16:03:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-11-30 16:34:49 +0000 |
| commit | 8cf2356fa8aa1dda644314e6e656b3df1586e297 (patch) | |
| tree | 03b4c7593f9752ade07b27259331df6cf766c6ce /common/estream.c | |
| parent | Add parameter checks and extend documentation of estream. (diff) | |
| download | gnupg-8cf2356fa8aa1dda644314e6e656b3df1586e297.tar.gz gnupg-8cf2356fa8aa1dda644314e6e656b3df1586e297.zip | |
* common/estream.c (es_fopenmem_init): New.
* common/estream.h (es_fopenmem_init): New.
Diffstat (limited to '')
| -rw-r--r-- | common/estream.c | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/common/estream.c b/common/estream.c index 20d365a63..c55c7f26d 100644 --- a/common/estream.c +++ b/common/estream.c @@ -2606,7 +2606,7 @@ es_fopen (const char *ES__RESTRICT path, const char *ES__RESTRICT mode) function but no free function. Providing only a free function is allowed as long as GROW is false. */ estream_t -es_mopen (unsigned char *ES__RESTRICT data, size_t data_n, size_t data_len, +es_mopen (void *ES__RESTRICT data, size_t data_n, size_t data_len, unsigned int grow, func_realloc_t func_realloc, func_free_t func_free, const char *ES__RESTRICT mode) @@ -2657,7 +2657,6 @@ es_fopenmem (size_t memlimit, const char *ES__RESTRICT mode) return NULL; modeflags |= O_RDWR; - if (func_mem_create (&cookie, NULL, 0, 0, BUFFER_BLOCK_SIZE, 1, mem_realloc, mem_free, modeflags, @@ -2673,6 +2672,40 @@ es_fopenmem (size_t memlimit, const char *ES__RESTRICT mode) +/* This is the same as es_fopenmem but intializes the memory with a + copy of (DATA,DATALEN). The stream is initally set to the + beginning. If MEMLIMIT is not 0 but shorter than DATALEN it + DATALEN will be used as the value for MEMLIMIT. */ +estream_t +es_fopenmem_init (size_t memlimit, const char *ES__RESTRICT mode, + const void *data, size_t datalen) +{ + estream_t stream; + + if (memlimit && memlimit < datalen) + memlimit = datalen; + + stream = es_fopenmem (memlimit, mode); + if (stream && data && datalen) + { + if (es_writen (stream, data, datalen, NULL)) + { + int saveerrno = errno; + es_fclose (stream); + stream = NULL; + _set_errno (saveerrno); + } + else + { + es_seek (stream, 0L, SEEK_SET, NULL); + es_set_indicators (stream, 0, 0); + } + } + return stream; +} + + + estream_t es_fopencookie (void *ES__RESTRICT cookie, const char *ES__RESTRICT mode, |