--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-AC_INIT([dump], [0.4b47], [https://dump.sourceforge.io])
-AC_PREREQ(2.57)
+AC_INIT([dump],[0.4b47],[https://dump.sourceforge.io])
+AC_PREREQ([2.71])
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
 dnl
 dnl Check for programs
@@ -39,7 +39,7 @@ dnl
 dnl Handle --enable-debug
 dnl
 AC_MSG_CHECKING([whether to enable extra debugging])
-AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug], [include debugging code @<:@default=no@:>@])])
+AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],[include debugging code @<:@default=no@:>@])])
 if test "$enable_debug" = "yes"
 then
 	AC_DEFINE([FDEBUG], 1, [Enable extra debugging])
@@ -55,7 +55,7 @@ dnl
 dnl Handle --enable-static-progs
 dnl
 AC_MSG_CHECKING([whether to build static binaries])
-AC_ARG_ENABLE([static-progs], [AC_HELP_STRING([--enable-static-progs], [link dump and restore statically @<:@default=no@:>@])])
+AC_ARG_ENABLE([static-progs], [AS_HELP_STRING([--enable-static-progs],[link dump and restore statically @<:@default=no@:>@])])
 if test "$enable_static_progs" = "yes"
 then
 	LDFLAGS="$LDFLAGS -static"
@@ -70,7 +70,7 @@ dnl Handle --enable-rmt
 dnl
 AC_MSG_CHECKING([whether to build rmt])
 BUILD_RMT=yes
-AC_ARG_ENABLE([rmt], [AC_HELP_STRING([--enable-rmt], [compile and install rmt @<:@default=yes@:>@])])
+AC_ARG_ENABLE([rmt], [AS_HELP_STRING([--enable-rmt],[compile and install rmt @<:@default=yes@:>@])])
 if test "$enable_rmt" = "no"; then
 	BUILD_RMT=no
 fi
@@ -82,7 +82,7 @@ dnl Handle --enable-ermt
 dnl
 AC_MSG_CHECKING([whether to build ermt])
 BUILD_ERMT=no
-AC_ARG_ENABLE([ermt], [AC_HELP_STRING([--enable-ermt], [compile ermt, an encrypting version of rmt @<:@default=no@:>@])])
+AC_ARG_ENABLE([ermt], [AS_HELP_STRING([--enable-ermt],[compile ermt, an encrypting version of rmt @<:@default=no@:>@])])
 if test "$enable_ermt" = "yes"; then
 	if test "$BUILD_RMT" != "yes"; then
 		AC_MSG_ERROR([ermt requires --enable-rmt])
@@ -96,7 +96,7 @@ dnl
 dnl Handle --enable-kerberos
 dnl
 AC_MSG_CHECKING([whether to enable kerberos extensions])
-AC_ARG_ENABLE([kerberos], [AC_HELP_STRING([--enable-kerberos], [compile kerberos extensions @<:@default=no@:>@])])
+AC_ARG_ENABLE([kerberos], [AS_HELP_STRING([--enable-kerberos],[compile kerberos extensions @<:@default=no@:>@])])
 if test "$enable_kerberos" = "yes"
 then
 	AC_DEFINE([KERBEROS], 1, [Enable kerberos extensions])
@@ -108,7 +108,7 @@ fi
 dnl
 dnl Handle --enable-readline
 dnl
-AC_ARG_ENABLE([readline], [AC_HELP_STRING([--enable-readline], [enable readline support in restore @<:@default=yes@:>@])],
+AC_ARG_ENABLE([readline], [AS_HELP_STRING([--enable-readline],[enable readline support in restore @<:@default=yes@:>@])],
 if test "$enableval" = "no"
 then
 	READLINE=""
@@ -127,7 +127,7 @@ echo "Including readline support by defa
 dnl
 dnl Handle --enable-oldsylefscript
 dnl
-AC_ARG_ENABLE([oldstylefscript], [AC_HELP_STRING([--enable-oldstylefscript], [enable old style F script (no arguments) @<:@default=no@:>@])],
+AC_ARG_ENABLE([oldstylefscript], [AS_HELP_STRING([--enable-oldstylefscript],[enable old style F script (no arguments) @<:@default=no@:>@])],
 if test "$enableval" = "yes"
 then
 	AC_DEFINE([OLD_STYLE_FSCRIPT],1,[Define this is you want old style F script (no arguments).])
@@ -142,7 +142,7 @@ echo "Using new style F script by defaul
 dnl
 dnl Handle --enable-qfa
 dnl
-AC_ARG_ENABLE([qfa], [AC_HELP_STRING([--enable-qfa], [enable Quick File Access support @<:@default=yes@:>@])],
+AC_ARG_ENABLE([qfa], [AS_HELP_STRING([--enable-qfa],[enable Quick File Access support @<:@default=yes@:>@])],
 if test "$enableval" = "yes"
 then
 	AC_DEFINE([USE_QFA],1,[Define this if you want Quick File Access support.])
@@ -158,7 +158,7 @@ echo "Enabling Quick File Access support
 dnl
 dnl Handle --enable-qfadebug
 dnl
-AC_ARG_ENABLE([qfadebug], [AC_HELP_STRING([--enable-qfadebug], [include Quick File Access debugging code @<:@default=no@:>@])],
+AC_ARG_ENABLE([qfadebug], [AS_HELP_STRING([--enable-qfadebug],[include Quick File Access debugging code @<:@default=no@:>@])],
 if test "$enableval" = "yes"
 then
 	AC_DEFINE([DEBUG_QFA],1,[Define this if you want to include Quick File Access debugging code.])
@@ -173,7 +173,7 @@ echo "Not including Quick File Access de
 dnl
 dnl Handle --enable-macosx
 dnl
-AC_ARG_ENABLE([macosx], [AC_HELP_STRING([--enable-macosx], [include Mac OSX restore compatibility @<:@default=no@:>@])],
+AC_ARG_ENABLE([macosx], [AS_HELP_STRING([--enable-macosx],[include Mac OSX restore compatibility @<:@default=no@:>@])],
 if test "$enableval" = "yes"
 then
 	AC_DEFINE([DUMP_MACOSX],1,[Define this if you want to include Mac OSX restore compatibility.])
@@ -188,7 +188,7 @@ echo "Not including Mac OSX restore comp
 dnl
 dnl Handle --enable-selinux
 dnl
-AC_ARG_ENABLE([selinux], [AC_HELP_STRING([--enable-selinux], [restore can translate SELinux EAs @<:@default=auto@:>@])])
+AC_ARG_ENABLE([selinux], [AS_HELP_STRING([--enable-selinux],[restore can translate SELinux EAs @<:@default=auto@:>@])])
 if test "$enable_selinux" != "no"; then
 	found_selinux="yes"
 	PKG_CHECK_MODULES([SELINUX], [libselinux], [], [
@@ -205,7 +205,7 @@ fi
 dnl
 dnl set $(DUMPDATESPATH) from --with-dumpdatespath
 dnl
-AC_ARG_WITH([dumpdatespath], [AC_HELP_STRING([--with-dumpdatespath=PATH], [select path for dumpdates file])],
+AC_ARG_WITH([dumpdatespath], [AS_HELP_STRING([--with-dumpdatespath=PATH],[select path for dumpdates file])],
 AC_MSG_RESULT(DUMPDATESPATH is $withval)
 DUMPDATESPATH=$withval,
 DUMPDATESPATH="${sysconfdir}/dumpdates"
@@ -216,7 +216,7 @@ AC_SUBST(DUMPDATESPATH)
 dnl
 dnl set _PATH_RMT from --with-rmtpath
 dnl
-AC_ARG_WITH([rmtpath], [AC_HELP_STRING([--with-rmtpath=PATH], [select path for rmt program])],
+AC_ARG_WITH([rmtpath], [AS_HELP_STRING([--with-rmtpath=PATH],[select path for rmt program])],
 RMTPATH=$withval,
 RMTPATH='/etc/rmt')
 AC_SUBST(RMTPATH)
@@ -239,44 +239,38 @@ fi
 dnl
 dnl Try to use ext2_fs.h header from libext2fs instead of from the kernel
 dnl
-AC_CHECK_HEADERS(ext2fs/ext2_fs.h, [], [], [-])
+AC_CHECK_HEADERS([ext2fs/ext2_fs.h])
 
 dnl
 dnl Check for ext2_ino_t type
 dnl
 AC_MSG_CHECKING(for ext2_ino_t type in libext2fs headers)
-AC_TRY_COMPILE([#include <stdio.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
 #ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
 #else
 #include <linux/ext2_fs.h>
 #endif
-#include <ext2fs/ext2fs.h>],
-[ext2_ino_t ino = 0;],
-[AC_DEFINE([HAVE_EXT2_INO_T],1,[Define if we have the ext2_ino_t type (from e2fsprogs 1.20+).])
- AC_MSG_RESULT(yes)],
-AC_MSG_RESULT(no))
+#include <ext2fs/ext2fs.h>]], [[ext2_ino_t ino = 0;]])],[AC_DEFINE([HAVE_EXT2_INO_T],1,[Define if we have the ext2_ino_t type (from e2fsprogs 1.20+).])
+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 dnl
 dnl Check for s_journal_inum field in ext2_super_block struct
 dnl
 AC_MSG_CHECKING(for s_journal_inum field in ext2_super_block struct)
-AC_TRY_COMPILE([#include <stdio.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
 #ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
 #else
 #include <linux/ext2_fs.h>
 #endif
-#include <ext2fs/ext2fs.h>],
-[struct ext2_super_block es; es.s_journal_inum = 0;],
-[AC_DEFINE([HAVE_EXT2_JOURNAL_INUM],1,[Define if we have the s_journal_inum field in struct ext2_super_block.])
- AC_MSG_RESULT(yes)],
-AC_MSG_RESULT(no))
+#include <ext2fs/ext2fs.h>]], [[struct ext2_super_block es; es.s_journal_inum = 0;]])],[AC_DEFINE([HAVE_EXT2_JOURNAL_INUM],1,[Define if we have the s_journal_inum field in struct ext2_super_block.])
+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 dnl
 dnl Check for blkid headers libraries
 dnl
-AC_ARG_ENABLE([blkid], [AC_HELP_STRING([--disable-blkid], [enable blkid support])])
+AC_ARG_ENABLE([blkid], [AS_HELP_STRING([--disable-blkid],[enable blkid support])])
 if test "$enable_blkid" != "no"; then
 	PKG_CHECK_MODULES([BLKID], [blkid], [], [
 		found_blkid="no"
@@ -289,7 +283,7 @@ if test "$enable_blkid" != "no"; then
 	fi
 fi
 
-AC_ARG_ENABLE([uuid], [AC_HELP_STRING([--disable-uuid], [enable uuid support])])
+AC_ARG_ENABLE([uuid], [AS_HELP_STRING([--disable-uuid],[enable uuid support])])
 if test "$enable_uuid" != "no"; then
 	PKG_CHECK_MODULES([UUID], [uuid], [], [
 		found_uuid="no"
@@ -325,7 +319,7 @@ fi
 dnl
 dnl Check for readline headers and libraries
 dnl
-AC_CHECK_HEADER(readline/readline.h, [readline_h=yes], [readline_h=no], [-])
+AC_CHECK_HEADER(readline/readline.h, [readline_h=yes], [readline_h=no])
 AC_CHECK_LIB(readline, readline, [readline_lib=yes], [readline_lib=no], $rdllib)
 if test "$readline_h" = no -o "$readline_lib" = no; then
 	if test "$READLINE" = "yes"; then
@@ -356,7 +350,7 @@ fi
 dnl
 dnl Check for zlib headers and libraries
 dnl
-AC_ARG_ENABLE([zlib], [AC_HELP_STRING([--disable-zlib], [enable zlib compression support])])
+AC_ARG_ENABLE([zlib], [AS_HELP_STRING([--disable-zlib],[enable zlib compression support])])
 if test "$enable_zlib" != "no"; then
 	PKG_CHECK_MODULES([ZLIB], [zlib], [], [
 		found_zlib="no"
@@ -372,10 +366,10 @@ fi
 dnl
 dnl Check for bzlib headers and libraries
 dnl
-AC_ARG_ENABLE([bzip2], [AC_HELP_STRING([--disable-bzip2], [enable bzip2 compression support])])
+AC_ARG_ENABLE([bzip2], [AS_HELP_STRING([--disable-bzip2],[enable bzip2 compression support])])
 BZLIB=
 if test "$enable_bzip2" != "no"; then
-	AC_CHECK_HEADER(bzlib.h, [bzlib_h=yes], [bzlib_h=no], [-])
+	AC_CHECK_HEADER(bzlib.h, [bzlib_h=yes], [bzlib_h=no])
 	AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, [bzlib_lib=yes], [bzlib_lib=no])
 
 	if test "$bzlib_h" = yes -a "$bzlib_lib" = yes; then
@@ -390,10 +384,10 @@ AC_SUBST(BZLIB)
 dnl
 dnl Check for lzo headers and libraries
 dnl
-AC_ARG_ENABLE([lzo], [AC_HELP_STRING([--disable-lzo], [enable lzo compression support])])
+AC_ARG_ENABLE([lzo], [AS_HELP_STRING([--disable-lzo],[enable lzo compression support])])
 LZOLIB=
 if test "$enable_lzo" != "no"; then
-	AC_CHECK_HEADER(lzo/lzo1x.h, [lzo_h=yes], [lzo_h=no], [-])
+	AC_CHECK_HEADER(lzo/lzo1x.h, [lzo_h=yes], [lzo_h=no])
 	AC_CHECK_LIB(lzo2, lzo1x_1_compress, [lzo_lib=yes], [lzo_lib=no])
 
 	if test "$lzo_h" = yes -a "$lzo_lib" = yes; then
@@ -408,10 +402,10 @@ AC_SUBST(LZOLIB)
 dnl
 dnl Check for sqlite3 headers and libraries
 dnl
-AC_ARG_ENABLE([sqlite], [AC_HELP_STRING([--disable-sqlite], [disable sqlite indexing support])])
+AC_ARG_ENABLE([sqlite], [AS_HELP_STRING([--disable-sqlite],[disable sqlite indexing support])])
 SQLITE3=
 if test "$enable_sqlite" != "no"; then
-	AC_CHECK_HEADER(sqlite3.h, [sqlite3_h=yes], [sqlite3_h=no], [-])
+	AC_CHECK_HEADER(sqlite3.h, [sqlite3_h=yes], [sqlite3_h=no])
 	AC_CHECK_LIB(sqlite3, sqlite3_initialize, [sqlite3_lib=yes], [sqlite3_lib=no])
 	if test "$sqlite3_h" = yes -a "$sqlite3_lib" = yes; then
 		SQLITE3="-lsqlite3"
@@ -453,7 +447,7 @@ fi
 dnl
 dnl Check for OpenSSL, for ermt and encryption.
 dnl
-AC_ARG_ENABLE([ssl], [AC_HELP_STRING([--disable-ssl], [disable ssl support])])
+AC_ARG_ENABLE([ssl], [AS_HELP_STRING([--disable-ssl],[disable ssl support])])
 if test "$enable_ssl" != "no"; then
 	PKG_CHECK_MODULES([SSL], [openssl], [], [
 		found_ssl="no"
--- a/restore/interactive.c
+++ b/restore/interactive.c
@@ -608,7 +608,7 @@ printlist(char *name, char *basename)
 					locname, dp->d_name, MAXPATHLEN);
 			} else {
 				(void) strncat(locname, dp->d_name,
-				    (int)strlen(dp->d_name));
+				    sizeof(locname)-namelen);
 				mkentry(locname, dp, listp++);
 				entries++;
 			}
