From 6dd5bd6c20720a8f1a15a037435f6b385e590106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Wed, 2 Aug 2023 09:07:06 +0200
Subject: [PATCH] Use strerror unconditionally, delete configure logic to fall
back to sys_errlist.
---
ChangeLog | 7 +++++++
aclocal.m4 | 10 ----------
configure.ac | 2 +-
tools/nettle-hash.c | 6 +++---
tools/nettle-pbkdf2.c | 2 +-
5 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 499bdf27..548af4e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-08-02 Niels Möller <nisse@lysator.liu.se>
+
+ * aclocal.m4 (LSH_FUNC_STRERROR): Delete macro.
+ * configure.ac: Delete usage.
+ * tools/nettle-hash.c (main): Use strerror unconditionally.
+ * tools/nettle-pbkdf2.c (main): Likewise.
+
2023-08-01 Niels Möller <nisse@lysator.liu.se>
* configure.ac: Delete special handling of rntcl; it should be
diff --git a/aclocal.m4 b/aclocal.m4
index 119eab37..08292d9d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -215,16 +215,6 @@ char *alloca ();
#endif
])])
-AC_DEFUN([LSH_FUNC_STRERROR],
-[AC_CHECK_FUNCS(strerror)
-AH_BOTTOM(
-[#if HAVE_STRERROR
-#define STRERROR strerror
-#else
-#define STRERROR(x) (sys_errlist[x])
-#endif
-])])
-
AC_DEFUN([LSH_FUNC_STRSIGNAL],
[AC_CHECK_FUNCS(strsignal)
AC_CHECK_DECLS([sys_siglist, _sys_siglist])
diff --git a/configure.ac b/configure.ac
index cafcca63..8fbdb008 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,7 @@ AC_CHECK_LIB([dl], [dlopen],
[Define to 1 if you have dlopen (with -ldl).])])
LSH_FUNC_ALLOCA
-LSH_FUNC_STRERROR
+
# getenv_secure is used for fat overrides,
# getline is used in the testsuite
AC_CHECK_FUNCS(secure_getenv getline)
diff --git a/tools/nettle-hash.c b/tools/nettle-hash.c
index 24199921..87330783 100644
--- a/tools/nettle-hash.c
+++ b/tools/nettle-hash.c
@@ -222,15 +222,15 @@ main (int argc, char **argv)
{
FILE *f = fopen (argv[i], "rb");
if (!f)
- die ("Cannot open `%s': %s\n", argv[i], STRERROR(errno));
+ die ("Cannot open `%s': %s\n", argv[i], strerror(errno));
printf("%s: ", argv[i]);
if (!digest_file (alg, length, raw, f))
- die("Reading `%s' failed: %s\n", argv[i], STRERROR(errno));
+ die("Reading `%s' failed: %s\n", argv[i], strerror(errno));
fclose(f);
}
}
if (fflush(stdout) != 0 )
- die("Write failed: %s\n", STRERROR(errno));
+ die("Write failed: %s\n", strerror(errno));
return EXIT_SUCCESS;
}
diff --git a/tools/nettle-pbkdf2.c b/tools/nettle-pbkdf2.c
index 9993b301..0b5c98f5 100644
--- a/tools/nettle-pbkdf2.c
+++ b/tools/nettle-pbkdf2.c
@@ -194,7 +194,7 @@ main (int argc, char **argv)
free (output);
if (fflush(stdout) != 0 )
- die("Write failed: %s\n", STRERROR(errno));
+ die("Write failed: %s\n", strerror(errno));
return EXIT_SUCCESS;
}
--
GitLab