The homedir() function is now renamed into findfile() and iterates over all the environment variables trying to access the file in question until it finds it. Last resort is then getpwuid() if available. Previously it would first try to find a home directory and if that was set, insist on checking only that directory for the file. This now returns the full file name it finds. The Windows specific checks are now done differently too and in this order: 1 - %USERPROFILE% 2 - %APPDATA% 3 - %USERPROFILE%\\Application Data The windows order is modified to match how the Windows 10 ssh tool works when it searches for .ssh/known_hosts. Reported-by: jeffrson on github Co-authored-by: Jay Satiro Fixes #8033 Closes #8035
144 lines
3.6 KiB
Makefile
144 lines
3.6 KiB
Makefile
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) 1998 - 2021, 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.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.
|
|
#
|
|
###########################################################################
|
|
# ./src/Makefile.inc
|
|
# Using the backslash as line continuation character might be problematic
|
|
# with some make flavours, as Watcom's wmake showed us already. If we
|
|
# ever want to change this in a portable manner then we should consider
|
|
# this idea (posted to the libcurl list by Adam Kellas):
|
|
# CSRC1 = file1.c file2.c file3.c
|
|
# CSRC2 = file4.c file5.c file6.c
|
|
# CSOURCES = $(CSRC1) $(CSRC2)
|
|
|
|
# libcurl has sources that provide functions named curlx_* that aren't part of
|
|
# the official API, but we re-use the code here to avoid duplication.
|
|
CURLX_CFILES = \
|
|
../lib/strtoofft.c \
|
|
../lib/nonblock.c \
|
|
../lib/warnless.c \
|
|
../lib/curl_ctype.c \
|
|
../lib/curl_multibyte.c \
|
|
../lib/version_win32.c \
|
|
../lib/dynbuf.c
|
|
|
|
CURLX_HFILES = \
|
|
../lib/curl_setup.h \
|
|
../lib/strtoofft.h \
|
|
../lib/nonblock.h \
|
|
../lib/warnless.h \
|
|
../lib/curl_ctype.h \
|
|
../lib/curl_multibyte.h \
|
|
../lib/version_win32.h \
|
|
../lib/dynbuf.h
|
|
|
|
CURL_CFILES = \
|
|
slist_wc.c \
|
|
tool_binmode.c \
|
|
tool_bname.c \
|
|
tool_cb_dbg.c \
|
|
tool_cb_hdr.c \
|
|
tool_cb_prg.c \
|
|
tool_cb_rea.c \
|
|
tool_cb_see.c \
|
|
tool_cb_wrt.c \
|
|
tool_cfgable.c \
|
|
tool_convert.c \
|
|
tool_dirhie.c \
|
|
tool_doswin.c \
|
|
tool_easysrc.c \
|
|
tool_filetime.c \
|
|
tool_findfile.c \
|
|
tool_formparse.c \
|
|
tool_getparam.c \
|
|
tool_getpass.c \
|
|
tool_help.c \
|
|
tool_helpers.c \
|
|
tool_hugehelp.c \
|
|
tool_libinfo.c \
|
|
tool_listhelp.c \
|
|
tool_main.c \
|
|
tool_msgs.c \
|
|
tool_operate.c \
|
|
tool_operhlp.c \
|
|
tool_panykey.c \
|
|
tool_paramhlp.c \
|
|
tool_parsecfg.c \
|
|
tool_progress.c \
|
|
tool_strdup.c \
|
|
tool_setopt.c \
|
|
tool_sleep.c \
|
|
tool_urlglob.c \
|
|
tool_util.c \
|
|
tool_vms.c \
|
|
tool_writeout.c \
|
|
tool_writeout_json.c \
|
|
tool_xattr.c
|
|
|
|
CURL_HFILES = \
|
|
slist_wc.h \
|
|
tool_binmode.h \
|
|
tool_bname.h \
|
|
tool_cb_dbg.h \
|
|
tool_cb_hdr.h \
|
|
tool_cb_prg.h \
|
|
tool_cb_rea.h \
|
|
tool_cb_see.h \
|
|
tool_cb_wrt.h \
|
|
tool_cfgable.h \
|
|
tool_convert.h \
|
|
tool_dirhie.h \
|
|
tool_doswin.h \
|
|
tool_easysrc.h \
|
|
tool_filetime.h \
|
|
tool_findfile.h \
|
|
tool_formparse.h \
|
|
tool_getparam.h \
|
|
tool_getpass.h \
|
|
tool_help.h \
|
|
tool_helpers.h \
|
|
tool_hugehelp.h \
|
|
tool_libinfo.h \
|
|
tool_main.h \
|
|
tool_msgs.h \
|
|
tool_operate.h \
|
|
tool_operhlp.h \
|
|
tool_panykey.h \
|
|
tool_paramhlp.h \
|
|
tool_parsecfg.h \
|
|
tool_progress.h \
|
|
tool_sdecls.h \
|
|
tool_setopt.h \
|
|
tool_setup.h \
|
|
tool_sleep.h \
|
|
tool_strdup.h \
|
|
tool_urlglob.h \
|
|
tool_util.h \
|
|
tool_version.h \
|
|
tool_vms.h \
|
|
tool_writeout.h \
|
|
tool_writeout_json.h \
|
|
tool_xattr.h
|
|
|
|
CURL_RCFILES = curl.rc
|
|
|
|
# curl_SOURCES is special and gets assigned in src/Makefile.am
|
|
CURL_FILES = $(CURL_CFILES) $(CURLX_CFILES) $(CURL_HFILES)
|