libio: Fix fmemopen 'w' mode with provided buffer
Commit Message
On 16-07-2015 08:58, Stefan Liebler wrote:
> As already mentioned in https://www.sourceware.org/ml/libc-alpha/2015-07/msg00455.html, the testcase is now passing on s390-32.
>
> Can you change this printf in case of a failure, too:
Ok, change below:
* libio/fmemopen.c (__fmemopen): Fix 'w' openmode with provided
buffer.
* stdio-common/tst-fmemopen2.c (do_test_with_buffer): Fix typo and
fail output information.
--
Comments
On 07/16/2015 09:03 AM, Adhemerval Zanella wrote:
>
>
> On 16-07-2015 08:58, Stefan Liebler wrote:
>> As already mentioned in https://www.sourceware.org/ml/libc-alpha/2015-07/msg00455.html, the testcase is now passing on s390-32.
>>
>> Can you change this printf in case of a failure, too:
>
> Ok, change below:
>
> * libio/fmemopen.c (__fmemopen): Fix 'w' openmode with provided
> buffer.
> * stdio-common/tst-fmemopen2.c (do_test_with_buffer): Fix typo and
> fail output information.
> @@ -69,7 +69,7 @@ do_test_with_buffer (void)
> if (o != nstr)
> {
> printf ("FAIL: third ftello returned %jd, expected %zu\n",
> - (intmax_t)o, nbuf);
> + (intmax_t)o, nstr);
> result = 1;
> }
OK for 2.22.
c.
@@ -150,7 +150,7 @@ __fmemopen (void *buf, size_t len, const char *mode)
cookie_io_functions_t iof;
fmemopen_cookie_t *c;
- c = (fmemopen_cookie_t *) malloc (sizeof (fmemopen_cookie_t));
+ c = (fmemopen_cookie_t *) calloc (sizeof (fmemopen_cookie_t), 1);
if (c == NULL)
return NULL;
@@ -165,7 +165,6 @@ __fmemopen (void *buf, size_t len, const char *mode)
return NULL;
}
c->buffer[0] = '\0';
- c->maxpos = 0;
}
else
{
@@ -182,7 +181,8 @@ __fmemopen (void *buf, size_t len, const char *mode)
if (mode[0] == 'w' && mode[1] == '+')
c->buffer[0] = '\0';
- c->maxpos = strnlen (c->buffer, len);
+ if (mode[0] == 'a')
+ c->maxpos = strnlen (c->buffer, len);
}
@@ -34,7 +34,7 @@ do_test_with_buffer (void)
FILE *fp = fmemopen (buf, nbuf, "w");
if (fp == NULL)
{
- printf ("FAIL: fmemopen failedi (%s)\n", __FUNCTION__);
+ printf ("FAIL: fmemopen failed (%s)\n", __FUNCTION__);
return 1;
}
@@ -69,7 +69,7 @@ do_test_with_buffer (void)
if (o != nstr)
{
printf ("FAIL: third ftello returned %jd, expected %zu\n",
- (intmax_t)o, nbuf);
+ (intmax_t)o, nstr);
result = 1;
}