diff options
author | Jason Riedy <ejr@cs.berkeley.edu> | 2005-08-23 13:34:07 -0700 |
---|---|---|
committer | Jason Riedy <ejr@cs.berkeley.edu> | 2005-08-23 20:41:12 -0700 |
commit | c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc (patch) | |
tree | 78e210d8703959d13f476205e48d5e9125166296 /connect.c | |
parent | 6c5f9baa3bc0d63e141e0afc23110205379905a4 (diff) | |
download | git-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.tar.gz git-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.tar.xz |
Fix ?: statements.
Omitting the first branch in ?: is a GNU extension. Cute,
but not supported by other compilers. Replaced mostly
by explicit tests. Calls to getenv() simply are repeated
on non-GNU compilers.
Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
Diffstat (limited to 'connect.c')
-rw-r--r-- | connect.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -383,8 +383,10 @@ int git_connect(int fd[2], char *url, const char *prog) close(pipefd[1][0]); close(pipefd[1][1]); if (protocol == PROTO_SSH) { - const char *ssh = getenv("GIT_SSH") ? : "ssh"; - const char *ssh_basename = strrchr(ssh, '/'); + const char *ssh, *ssh_basename; + ssh = getenv("GIT_SSH"); + if (!ssh) ssh = "ssh"; + ssh_basename = strrchr(ssh, '/'); if (!ssh_basename) ssh_basename = ssh; else |