Readline: Cleanup some warnings

Cleanup the readline warnings that gdb buildbot complains about.

To prevent wcwidth missing declaration warnings, add the SOURCE /
EXTENSION macros to config.in that have already checked for in
configure.

Ensure pid is a long before printing as one.  Also fix GNU style.

Check the return value of write the same way as history_do_write ().

These changes are consistent with upstream readline.

readline/ChangeLog.gdb:

	* config.h.in: Add SOURCE/EXTENSION macros.
	* histfile.c (history_truncate_file): Check return of write.
	* util.c (_rl_tropen): Ensure pid is long.
This commit is contained in:
Alan Hayward 2019-01-31 09:48:39 +00:00
parent fc60b8c806
commit 16bfc2f970
4 changed files with 21 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2019-01-31 Alan Hayward <alan.hayward@arm.com>
* config.h.in: Add SOURCE/EXTENSION macros.
* histfile.c (history_truncate_file): Check return of write.
* util.c (_rl_tropen): Ensure pid is long.
2017-05-19 Eli Zaretskii <eliz@gnu.org>
* input.c [_WIN32]: Include <conio.h> to avoid compiler warning on

View File

@ -1,5 +1,15 @@
/* config.h.in. Maintained by hand. */
/* Template definitions for autoconf */
#undef __EXTENSIONS__
#undef _ALL_SOURCE
#undef _GNU_SOURCE
#undef _POSIX_SOURCE
#undef _POSIX_1_SOURCE
#undef _POSIX_PTHREAD_SEMANTICS
#undef _TANDEM_SOURCE
#undef _MINIX
/* Define NO_MULTIBYTE_SUPPORT to not compile in support for multibyte
characters, even if the OS supports them. */
#undef NO_MULTIBYTE_SUPPORT

View File

@ -407,7 +407,8 @@ history_truncate_file (fname, lines)
truncate to. */
if (bp > buffer && ((file = open (filename, O_WRONLY|O_TRUNC|O_BINARY, 0600)) != -1))
{
write (file, bp, chars_read - (bp - buffer));
if (write (file, bp, chars_read - (bp - buffer)) < 0)
rv = errno;
#if defined (__BEOS__)
/* BeOS ignores O_TRUNC. */

View File

@ -515,11 +515,11 @@ _rl_tropen ()
(sh_get_env_value ("TEMP")
? sh_get_env_value ("TEMP")
: "."),
getpid());
getpid ());
#else
sprintf (fnbuf, "/var/tmp/rltrace.%ld", getpid());
sprintf (fnbuf, "/var/tmp/rltrace.%ld", (long) getpid ());
#endif
unlink(fnbuf);
unlink (fnbuf);
_rl_tracefp = fopen (fnbuf, "w+");
return _rl_tracefp != 0;
}