summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-08-20 13:22:15 +0200
committerDaniel Stenberg <daniel@haxx.se>2019-08-20 23:07:59 +0200
commite59540139a398dc70fde6aec487b19c5085105af (patch)
tree3b9be44e9887ab3f50f374886ec86b3b9edc9a88
parent23803aae7b9e3ef15a0339a2afa9da7c5c2bfac1 (diff)
downloadcurl-e59540139a398dc70fde6aec487b19c5085105af.tar.gz
cleanup: remove DOT_CHAR completely
Follow-up to f9c7ba9096ec 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
-rw-r--r--lib/curl_setup.h9
-rw-r--r--lib/url.c3
-rw-r--r--src/tool_operate.c2
3 files changed, 2 insertions, 12 deletions
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 2b3f9f2fd..13af8cdec 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -486,7 +486,6 @@
#ifdef WIN32
# define DIR_CHAR "\\"
-# define DOT_CHAR "_"
#else /* WIN32 */
@@ -512,14 +511,6 @@
# endif
# 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! */
int fileno(FILE *stream);
diff --git a/lib/url.c b/lib/url.c
index 30263258f..437b5d85c 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2860,8 +2860,7 @@ static CURLcode override_login(struct Curl_easy *data,
&netrc_user_changed, &netrc_passwd_changed,
data->set.str[STRING_NETRC_FILE]);
if(ret > 0) {
- infof(data, "Couldn't find host %s in the "
- DOT_CHAR "netrc file; using defaults\n",
+ infof(data, "Couldn't find host %s in the .netrc file; using defaults\n",
conn->host.name);
}
else if(ret < 0) {
diff --git a/src/tool_operate.c b/src/tool_operate.c
index c9189bdee..87d3ab89c 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -1487,7 +1487,7 @@ static CURLcode create_transfers(struct GlobalConfig *global,
result = CURLE_OUT_OF_MEMORY;
home = homedir();
if(home) {
- file = aprintf("%s/%sssh/known_hosts", home, DOT_CHAR);
+ file = aprintf("%s/.ssh/known_hosts", home);
if(file) {
/* new in curl 7.19.6 */
result = res_setopt_str(curl, CURLOPT_SSH_KNOWNHOSTS, file);