summaryrefslogtreecommitdiff
path: root/usr.bin/rdist/rdist.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2001-12-29 23:16:11 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2001-12-29 23:16:11 +0000
commitc26967b026015b1d4e28090c7c0bba39675c9be3 (patch)
tree6d4dc601501f8945ecc0c9195a38e3d4e531209a /usr.bin/rdist/rdist.c
parentb0d03603551e6b3db0e0d539ee4b0e568459ef64 (diff)
Collapse two if statements into one (introduced in previous commit)
Diffstat (limited to 'usr.bin/rdist/rdist.c')
-rw-r--r--usr.bin/rdist/rdist.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/rdist/rdist.c b/usr.bin/rdist/rdist.c
index 855ff5a1ade..1b7792fc0f4 100644
--- a/usr.bin/rdist/rdist.c
+++ b/usr.bin/rdist/rdist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdist.c,v 1.10 2001/12/29 21:31:55 millert Exp $ */
+/* $OpenBSD: rdist.c,v 1.11 2001/12/29 23:16:10 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
"$From: rdist.c,v 6.65 1995/12/12 00:20:39 mcooper Exp $";
#else
static char RCSid[] =
-"$OpenBSD: rdist.c,v 1.10 2001/12/29 21:31:55 millert Exp $";
+"$OpenBSD: rdist.c,v 1.11 2001/12/29 23:16:10 millert Exp $";
#endif
static char sccsid[] = "@(#)main.c 5.1 (Berkeley) 6/6/85";
@@ -295,9 +295,8 @@ main(argc, argv, envp)
fatalerr(
"The -n flag and \"verify\" mode may not both be used.");
- if (path_remsh == NULL)
- if ((cp = getenv("RSH")) != NULL && *cp != '\0')
- path_remsh = cp;
+ if (path_remsh == NULL && (cp = getenv("RSH")) != NULL && *cp != '\0')
+ path_remsh = cp;
/*
* Don't fork children for nflag