shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

config: Rename ssh_config_get_str().

Browse Source
This commit is contained in:
Andreas Schneider
2013-06-02 18:53:40 +02:00
parent 494fb26b01
commit 6f59c0534d
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/config.c
View File

@@ -127,7 +127,7 @@ static int ssh_config_get_int(char **str, int notfound) {
return notfound; return notfound;
} }
static const char *ssh_config_get_str(char **str, const char *def) { static const char *ssh_config_get_str_tok(char **str, const char *def) {
char *p; char *p;
p = ssh_config_get_token(str); p = ssh_config_get_token(str);
@@ -141,7 +141,7 @@ static const char *ssh_config_get_str(char **str, const char *def) {
static int ssh_config_get_yesno(char **str, int notfound) { static int ssh_config_get_yesno(char **str, int notfound) {
const char *p; const char *p;
p = ssh_config_get_str(str, NULL); p = ssh_config_get_str_tok(str, NULL);
if (p == NULL) { if (p == NULL) {
return notfound; return notfound;
} }
@@ -192,8 +192,8 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
case SOC_HOST: case SOC_HOST:
*parsing = 0; *parsing = 0;
lowerhost = (session->host) ? ssh_lowercase(session->host) : NULL; lowerhost = (session->host) ? ssh_lowercase(session->host) : NULL;
for (p = ssh_config_get_str(&s, NULL); p && *p; for (p = ssh_config_get_str_tok(&s, NULL); p && *p;
p = ssh_config_get_str(&s, NULL)) { p = ssh_config_get_str_tok(&s, NULL)) {
if (match_hostname(lowerhost, p, strlen(p))) { if (match_hostname(lowerhost, p, strlen(p))) {
*parsing = 1; *parsing = 1;
} }
@@ -201,14 +201,14 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
SAFE_FREE(lowerhost); SAFE_FREE(lowerhost);
break; break;
case SOC_HOSTNAME: case SOC_HOSTNAME:
p = ssh_config_get_str(&s, NULL); p = ssh_config_get_str_tok(&s, NULL);
if (p && *parsing) { if (p && *parsing) {
ssh_options_set(session, SSH_OPTIONS_HOST, p); ssh_options_set(session, SSH_OPTIONS_HOST, p);
} }
break; break;
case SOC_PORT: case SOC_PORT:
if (session->port == 22) { if (session->port == 22) {
p = ssh_config_get_str(&s, NULL); p = ssh_config_get_str_tok(&s, NULL);
if (p && *parsing) { if (p && *parsing) {
ssh_options_set(session, SSH_OPTIONS_PORT_STR, p); ssh_options_set(session, SSH_OPTIONS_PORT_STR, p);
} }
@@ -216,20 +216,20 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
break; break;
case SOC_USERNAME: case SOC_USERNAME:
if (session->username == NULL) { if (session->username == NULL) {
p = ssh_config_get_str(&s, NULL); p = ssh_config_get_str_tok(&s, NULL);
if (p && *parsing) { if (p && *parsing) {
ssh_options_set(session, SSH_OPTIONS_USER, p); ssh_options_set(session, SSH_OPTIONS_USER, p);
} }
} }
break; break;
case SOC_IDENTITY: case SOC_IDENTITY:
p = ssh_config_get_str(&s, NULL); p = ssh_config_get_str_tok(&s, NULL);
if (p && *parsing) { if (p && *parsing) {
ssh_options_set(session, SSH_OPTIONS_ADD_IDENTITY, p); ssh_options_set(session, SSH_OPTIONS_ADD_IDENTITY, p);
} }
break; break;
case SOC_CIPHERS: case SOC_CIPHERS:
p = ssh_config_get_str(&s, NULL); p = ssh_config_get_str_tok(&s, NULL);
if (p && *parsing) { if (p && *parsing) {
ssh_options_set(session, SSH_OPTIONS_CIPHERS_C_S, p); ssh_options_set(session, SSH_OPTIONS_CIPHERS_C_S, p);
ssh_options_set(session, SSH_OPTIONS_CIPHERS_S_C, p); ssh_options_set(session, SSH_OPTIONS_CIPHERS_S_C, p);
@@ -246,7 +246,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
} }
break; break;
case SOC_PROTOCOL: case SOC_PROTOCOL:
p = ssh_config_get_str(&s, NULL); p = ssh_config_get_str_tok(&s, NULL);
if (p && *parsing) { if (p && *parsing) {
char *a, *b; char *a, *b;
b = strdup(p); b = strdup(p);
@@ -289,7 +289,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
} }
break; break;
case SOC_KNOWNHOSTS: case SOC_KNOWNHOSTS:
p = ssh_config_get_str(&s, NULL); p = ssh_config_get_str_tok(&s, NULL);
if (p && *parsing) { if (p && *parsing) {
ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, p); ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, p);
} }