forks/tftp-hpa-google
1
0
Fork 0
forked from mirrors/tftp-hpa-google
Code Pull requests Releases 1 Activity

remap: re-enable in autoconf; fix missing pointer assignment

Browse source 
Need to actually output something, too.

The whole section for remap had gotten dropped from autoconf, with the
obvious results...

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2024-06-10 20:56:27 -07:00
parent 9a92dec1dc
commit 33ec23c0dc
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -175,6 +175,14 @@ PA_ARG_DISABLED([tcpwrappers],
PA_HAVE_TCPWRAPPERS PA_HAVE_TCPWRAPPERS
]) ])
AC_CHECK_HEADERS_ONCE([regex.h])
PA_ARG_DISABLED([remap],
[disable regex-based filename remapping], [],
[AS_IF([test x"$ac_cv_header_regex_h" = xyes],
[AC_SEARCH_LIBS(regcomp, [regex rx],
[AC_DEFINE([WITH_REGEX], 1,
[Define if we are compiling with regex filename remapping.])])])])
TFTPD_LIBS="$LIBS $XTRALIBS" TFTPD_LIBS="$LIBS $XTRALIBS"
LIBS="$common_libs" LIBS="$common_libs"
@ -188,7 +196,7 @@ AH_TEMPLATE([WITH_READLINE],
PA_ARG_DISABLED([readline], PA_ARG_DISABLED([readline],
[disable the use of readline command-line editing], [], [disable the use of readline command-line editing], [],
[ [
AC_CHECK_HEADER(readline/readline.h, AC_CHECK_HEADER([readline/readline.h],
[ [
dnl readline may need libtermcap or somesuch... dnl readline may need libtermcap or somesuch...
AC_SEARCH_LIBS(tputs, [termcap terminfo]) AC_SEARCH_LIBS(tputs, [termcap terminfo])
@ -197,7 +205,7 @@ PA_ARG_DISABLED([readline],
[AC_DEFINE(WITH_READLINE)]) [AC_DEFINE(WITH_READLINE)])
AC_CHECK_HEADERS(readline/history.h) AC_CHECK_HEADERS(readline/history.h)
], ],
[AC_CHECK_HEADER(editline/readline.h, [AC_CHECK_HEADER([editline/readline.h],
[ [
dnl editline may need libtermcap or somesuch... dnl editline may need libtermcap or somesuch...
AC_SEARCH_LIBS(tputs, [termcap terminfo]) AC_SEARCH_LIBS(tputs, [termcap terminfo])

2
tftpd/remap.c
View file

@ -185,7 +185,7 @@ static int genmatchstring(char **string, const char *pattern,
len = do_genmatchstring(NULL, pattern, ibuf, pmatch, len = do_genmatchstring(NULL, pattern, ibuf, pmatch,
macrosub, start, NULL); macrosub, start, NULL);
buf = tf_malloc(len + 1); *string = buf = tf_malloc(len + 1);
return do_genmatchstring(buf, pattern, ibuf, pmatch, return do_genmatchstring(buf, pattern, ibuf, pmatch,
macrosub, start, nextp); macrosub, start, nextp);
} }