summaryrefslogtreecommitdiff
path: root/rsh.c
diff options
context:
space:
mode:
authorJason Riedy <ejr@cs.berkeley.edu>2005-08-23 20:34:07 (GMT)
committerJason Riedy <ejr@cs.berkeley.edu>2005-08-24 03:41:12 (GMT)
commitc7c81b3a51de2778535c8bb18d42a4bb7dfd57bc (patch)
tree78e210d8703959d13f476205e48d5e9125166296 /rsh.c
parent6c5f9baa3bc0d63e141e0afc23110205379905a4 (diff)
downloadgit-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.zip
git-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.tar.gz
git-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.tar.bz2
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 'rsh.c')
-rw-r--r--rsh.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/rsh.c b/rsh.c
index bcb1c80..04cbdf7 100644
--- a/rsh.c
+++ b/rsh.c
@@ -56,8 +56,10 @@ int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
return error("Couldn't create socket");
}
if (!fork()) {
- 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