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>
This commit is contained in:
Jason Riedy
2005-08-23 13:34:07 -07:00
parent 6c5f9baa3b
commit c7c81b3a51
11 changed files with 43 additions and 19 deletions

View File

@ -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