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

Fix macro substitution bug; some Makefile issues

Browse source
This commit is contained in:
hpa 2002-03-08 04:08:05 +00:00
parent 60707444d7
commit d849153191
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -11,6 +11,8 @@ Changes in 0.29:
a "recvfrom: Interrupted system call" log message if signals a "recvfrom: Interrupted system call" log message if signals
arrive at a particularly inopportune moment. arrive at a particularly inopportune moment.
Fix a macro substitution bug (thanks to Richard Nyberg.)
Changes in 0.28: Changes in 0.28:
Fix stupid one-liner bug which broke standalone mode (-l). Fix stupid one-liner bug which broke standalone mode (-l).

4
Makefile
View file

@ -32,7 +32,7 @@ distclean: localdistclean $(patsubst %, %.distclean, $(SUB))
localdistclean: localclean localdistclean: localclean
rm -f MCONFIG config.status config.log acconfig.h *~ \#* rm -f MCONFIG config.status config.log acconfig.h *~ \#*
rm -rf *.cache rm -rf *.cache
find . -type f \( -name \*.orig -o -name \*.rej \) | xargs -r rm -f find . -type f \( -name \*.orig -o -name \*.rej \) | xargs rm -f
spotless: distclean spotless: distclean
rm -f configure acconfig.h.in rm -f configure acconfig.h.in
@ -56,7 +56,7 @@ acconfig.h: MCONFIG
# autoconf and autoheader. # autoconf and autoheader.
acconfig.h.in: configure.in configure aclocal.m4 acconfig.h.in: configure.in configure aclocal.m4
rm -f acconfig.h.in acconfig.h rm -f acconfig.h.in acconfig.h
autoheader -f autoheader
configure: configure.in aclocal.m4 configure: configure.in aclocal.m4
rm -f MCONFIG configure config.log acconfig.h config.cache rm -f MCONFIG configure config.log acconfig.h config.cache

2
tftpd/remap.c
View file

@ -78,6 +78,8 @@ static int genmatchstring(char *string, const char *pattern, const char *input,
if ( macrosub && if ( macrosub &&
(sublen = macrosub(macro, string)) >= 0 ) { (sublen = macrosub(macro, string)) >= 0 ) {
len += sublen; len += sublen;
if ( string )
string += sublen;
} else { } else {
len++; len++;
if ( string ) if ( string )