Skip to content

Commit

Permalink
configure.ac: upgrade ancient snprintf macro to modern autoconf-archi…
Browse files Browse the repository at this point in the history
…ve edition

ac_func_snprintf was very old, and produced illogical results with
modern compilers. Specifically, the check always failed and claimed:

```
checking for snprintf... yes
checking for vsnprintf... yes
checking for working snprintf... no
checking for working vsnprintf... no
configure: WARNING: Will use fallback (v)snprintf() implementation.
```

autoconf-archive has migrated to a dedicated AX_ namespace and released
a couple decades worth of improvements, including fixing this particular
bug in 2022.

Bug: https://bugs.gentoo.org/898602
  • Loading branch information
eli-schwartz committed Nov 8, 2024
1 parent a24b8da commit 7d775fc
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 74 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AC_CHECK_MEMBERS([struct stat.st_rdev])

# Checks for library functions.
AC_CHECK_FUNCS([getopt_long getline strtof])
AC_FUNC_SNPRINTF
AX_FUNC_SNPRINTF
AC_FUNC_SCANF_CAN_MALLOC

AC_MSG_CHECKING(--enable-libarchive argument)
Expand Down
73 changes: 0 additions & 73 deletions m4/ac_func_snprintf.m4

This file was deleted.

86 changes: 86 additions & 0 deletions m4/ax_func_snprintf.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
# ===========================================================================
# https://www.gnu.org/software/autoconf-archive/ax_func_snprintf.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_FUNC_SNPRINTF
#
# DESCRIPTION
#
# Checks for a fully C99 compliant snprintf, in particular checks whether
# it does bounds checking and returns the correct string length; does the
# same check for vsnprintf. If no working snprintf or vsnprintf is found,
# request a replacement and warn the user about it. Note: the mentioned
# replacement is freely available and may be used in any project
# regardless of it's license.
#
# LICENSE
#
# Copyright (c) 2008 Ruediger Kuhlmann <[email protected]>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.

#serial 8

AU_ALIAS([AC_FUNC_SNPRINTF], [AX_FUNC_SNPRINTF])
AC_DEFUN([AX_FUNC_SNPRINTF],
[AC_CHECK_FUNCS(snprintf vsnprintf)
AC_MSG_CHECKING(for working snprintf)
AC_CACHE_VAL(ac_cv_have_working_snprintf,
[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
#include <stdlib.h>
#include <string.h>
int main(void)
{
char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
int i;
i = snprintf (bufs, 2, "%s", "111");
if (strcmp (bufs, "1")) exit (1);
if (i != 3) exit (1);
i = snprintf (bufd, 2, "%d", 111);
if (strcmp (bufd, "1")) exit (1);
if (i != 3) exit (1);
exit(0);
}]])],[ac_cv_have_working_snprintf=yes],[ac_cv_have_working_snprintf=no],[ac_cv_have_working_snprintf=cross])])
AC_MSG_RESULT([$ac_cv_have_working_snprintf])
AC_MSG_CHECKING(for working vsnprintf)
AC_CACHE_VAL(ac_cv_have_working_vsnprintf,
[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
int my_vsnprintf (char *buf, const char *tmpl, ...)
{
int i;
va_list args;
va_start (args, tmpl);
i = vsnprintf (buf, 2, tmpl, args);
va_end (args);
return i;
}
int main(void)
{
char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
int i;
i = my_vsnprintf (bufs, "%s", "111");
if (strcmp (bufs, "1")) exit (1);
if (i != 3) exit (1);
i = my_vsnprintf (bufd, "%d", 111);
if (strcmp (bufd, "1")) exit (1);
if (i != 3) exit (1);
exit(0);
}]])],[ac_cv_have_working_vsnprintf=yes],[ac_cv_have_working_vsnprintf=no],[ac_cv_have_working_vsnprintf=cross])])
AC_MSG_RESULT([$ac_cv_have_working_vsnprintf])
if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes"; then
AC_LIBOBJ(snprintf)
AC_MSG_WARN([Replacing missing/broken (v)snprintf() with version from http://www.ijs.si/software/snprintf/.])
AC_DEFINE(PREFER_PORTABLE_SNPRINTF, 1, "enable replacement (v)snprintf if system (v)snprintf is broken")
fi])

0 comments on commit 7d775fc

Please sign in to comment.