mirror of
https://github.com/moparisthebest/curl
synced 2024-11-15 14:05:03 -05:00
4520534e6d
- Add unit test 1604 to test the sanitize_file_name function.
- Use -DCURL_STATICLIB when building libcurltool for unit testing.
- Better detection of reserved DOS device names.
- New flags to modify sanitize behavior:
SANITIZE_ALLOW_COLONS: Allow colons
SANITIZE_ALLOW_PATH: Allow path separators and colons
SANITIZE_ALLOW_RESERVED: Allow reserved device names
SANITIZE_ALLOW_TRUNCATE: Allow truncating a long filename
- Restore sanitization of banned characters from user-specified outfile.
Prior to this commit sanitization of a user-specified outfile was
temporarily disabled in 2b6dadc because there was no way to allow path
separators and colons through while replacing other banned characters.
Now in such a case we call the sanitize function with
SANITIZE_ALLOW_PATH which allows path separators and colons to pass
through.
Closes https://github.com/curl/curl/issues/624
Reported-by: Octavio Schroeder
139 lines
5.1 KiB
Makefile
139 lines
5.1 KiB
Makefile
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.haxx.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
###########################################################################
|
|
AUTOMAKE_OPTIONS = foreign nostdinc
|
|
|
|
# remove targets if the command fails
|
|
.DELETE_ON_ERROR:
|
|
|
|
# Specify our include paths here, and do it relative to $(top_srcdir) and
|
|
# $(top_builddir), to ensure that these paths which belong to the library
|
|
# being currently built and tested are searched before the library which
|
|
# might possibly already be installed in the system.
|
|
#
|
|
# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
|
|
# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
|
|
# $(top_srcdir)/include is for libcurl's external include files
|
|
# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
|
|
# $(top_builddir)/src is for curl's generated src/curl_config.h file
|
|
# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
|
|
# $(top_srcdir)/src is for curl's src/tool_setup.h and "curl-private" files
|
|
|
|
AM_CPPFLAGS = -I$(top_builddir)/include/curl \
|
|
-I$(top_builddir)/include \
|
|
-I$(top_srcdir)/include \
|
|
-I$(top_builddir)/lib \
|
|
-I$(top_builddir)/src \
|
|
-I$(top_srcdir)/lib \
|
|
-I$(top_srcdir)/src
|
|
|
|
bin_PROGRAMS = curl
|
|
|
|
if USE_CPPFLAG_CURL_STATICLIB
|
|
AM_CPPFLAGS += -DCURL_STATICLIB
|
|
endif
|
|
|
|
include Makefile.inc
|
|
|
|
# CURL_FILES comes from Makefile.inc
|
|
curl_SOURCES = $(CURL_FILES)
|
|
|
|
# This might hold -Werror
|
|
CFLAGS += @CURL_CFLAG_EXTRAS@
|
|
|
|
# Prevent LIBS from being used for all link targets
|
|
LIBS = $(BLANK_AT_MAKETIME)
|
|
|
|
if USE_EXPLICIT_LIB_DEPS
|
|
curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
|
|
else
|
|
curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
|
|
endif
|
|
|
|
curl_LDFLAGS = @LIBMETALINK_LDFLAGS@
|
|
curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
|
|
curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
|
|
|
|
# if unit tests are enabled, build a static library to link them with
|
|
if BUILD_UNITTESTS
|
|
noinst_LTLIBRARIES = libcurltool.la
|
|
libcurltool_la_CPPFLAGS = $(LIBMETALINK_CPPFLAGS) $(AM_CPPFLAGS) \
|
|
-DCURL_STATICLIB -DUNITTESTS
|
|
libcurltool_la_CFLAGS =
|
|
libcurltool_la_LDFLAGS = -static $(LINKFLAGS)
|
|
libcurltool_la_SOURCES = $(curl_SOURCES)
|
|
endif
|
|
|
|
BUILT_SOURCES = tool_hugehelp.c
|
|
CLEANFILES = tool_hugehelp.c
|
|
# Use the C locale to ensure that only ASCII characters appear in the
|
|
# embedded text.
|
|
NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script
|
|
|
|
EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 \
|
|
Makefile.m32 macos/curl.mcp.xml.sit.hqx macos/MACINSTALL.TXT \
|
|
macos/src/curl_GUSIConfig.cpp macos/src/macos_main.cpp makefile.amiga \
|
|
curl.rc Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt \
|
|
checksrc.whitelist
|
|
|
|
MANPAGE=$(top_srcdir)/docs/curl.1
|
|
README=$(top_srcdir)/docs/MANUAL
|
|
MKHELP=$(top_srcdir)/src/mkhelp.pl
|
|
HUGE=tool_hugehelp.c
|
|
|
|
if USE_MANUAL
|
|
# Here are the stuff to create a built-in manual
|
|
|
|
if HAVE_LIBZ
|
|
# This generates the tool_hugehelp.c file in both uncompressed and
|
|
# compressed formats
|
|
$(HUGE): $(README) $(MANPAGE) mkhelp.pl
|
|
echo '#include "tool_setup.h"' > $(HUGE)
|
|
echo '#ifndef HAVE_LIBZ' >> $(HUGE)
|
|
$(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
|
|
echo '#else' >> $(HUGE)
|
|
$(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE)
|
|
echo '#endif /* HAVE_LIBZ */' >> $(HUGE)
|
|
else # HAVE_LIBZ
|
|
# This generates the tool_hugehelp.c file uncompressed only
|
|
$(HUGE): $(README) $(MANPAGE) mkhelp.pl
|
|
echo '#include "tool_setup.h"' > $(HUGE)
|
|
$(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
|
|
endif
|
|
|
|
else # USE_MANUAL
|
|
# built-in manual has been disabled, make a blank file
|
|
$(HUGE):
|
|
echo "/* built-in manual is disabled, blank function */" > $(HUGE)
|
|
echo '#include "tool_hugehelp.h"' >> $(HUGE)
|
|
echo "void hugehelp(void) {}" >>$(HUGE)
|
|
endif
|
|
|
|
# ignore tool_hugehelp.c since it is generated source code and it plays
|
|
# by slightly different rules!
|
|
checksrc:
|
|
@@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/src -Wtool_hugehelp.c $(CURL_CFILES) $(CURL_HFILES)
|
|
|
|
if CURLDEBUG
|
|
# for debug builds, we scan the sources on all regular make invokes
|
|
all-local: checksrc
|
|
endif
|