moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 17:18:48 -05:00
Code Issues Releases Wiki Activity

cleanup: remove DOT_CHAR completely

Browse Source 
Follow-up to f9c7ba9096

The use of DOT_CHAR for ".ssh" was probably a mistake and is removed
now.

Pointed-out-by: Gisle Vanem
Bug: https://github.com/curl/curl/pull/4230#issuecomment-522960638

Closes #4247
This commit is contained in:
Daniel Stenberg 2019-08-20 13:22:15 +02:00
parent 23803aae7b
commit e59540139a
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/curl_setup.h
View File

@ -486,7 +486,6 @@
#ifdef WIN32 #ifdef WIN32
# define DIR_CHAR "\\" # define DIR_CHAR "\\"
# define DOT_CHAR "_"
#else /* WIN32 */ #else /* WIN32 */
@ -512,14 +511,6 @@
# endif # endif
# define DIR_CHAR "/" # define DIR_CHAR "/"
# ifndef DOT_CHAR
# define DOT_CHAR "."
# endif
# ifdef MSDOS
# undef DOT_CHAR
# define DOT_CHAR "_"
# endif
# ifndef fileno /* sunos 4 have this as a macro! */ # ifndef fileno /* sunos 4 have this as a macro! */
int fileno(FILE *stream); int fileno(FILE *stream);

3
lib/url.c
View File

@ -2860,8 +2860,7 @@ static CURLcode override_login(struct Curl_easy *data,
&netrc_user_changed, &netrc_passwd_changed, &netrc_user_changed, &netrc_passwd_changed,
data->set.str[STRING_NETRC_FILE]); data->set.str[STRING_NETRC_FILE]);
if(ret > 0) { if(ret > 0) {
infof(data, "Couldn't find host %s in the " infof(data, "Couldn't find host %s in the .netrc file; using defaults\n",
DOT_CHAR "netrc file; using defaults\n",
conn->host.name); conn->host.name);
} }
else if(ret < 0) { else if(ret < 0) {

2
src/tool_operate.c
View File

@ -1487,7 +1487,7 @@ static CURLcode create_transfers(struct GlobalConfig *global,
result = CURLE_OUT_OF_MEMORY; result = CURLE_OUT_OF_MEMORY;
home = homedir(); home = homedir();
if(home) { if(home) {
file = aprintf("%s/%sssh/known_hosts", home, DOT_CHAR); file = aprintf("%s/.ssh/known_hosts", home);
if(file) { if(file) {
/* new in curl 7.19.6 */ /* new in curl 7.19.6 */
result = res_setopt_str(curl, CURLOPT_SSH_KNOWNHOSTS, file); result = res_setopt_str(curl, CURLOPT_SSH_KNOWNHOSTS, file);