summaryrefslogtreecommitdiffstats
path: root/scp.c
diff options
context:
space:
mode:
authormmcc@openbsd.org <mmcc@openbsd.org>2015-10-16 19:07:24 +0200
committerDamien Miller <djm@mindrot.org>2015-10-16 20:45:10 +0200
commite92c499a75477ecfe94dd7b4aed89f20b1fac5a7 (patch)
tree3e6fa5539513695e29ef9ba7f264dbae21b614cb /scp.c
parentupstream commit (diff)
downloadopenssh-e92c499a75477ecfe94dd7b4aed89f20b1fac5a7.tar.xz
openssh-e92c499a75477ecfe94dd7b4aed89f20b1fac5a7.zip
upstream commit
0 -> NULL when comparing with a char*. ok dtucker@, djm@. Upstream-ID: a928e9c21c0a9020727d99738ff64027c1272300
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/scp.c b/scp.c
index 593fe89bd..842dc66a9 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.182 2015/04/24 01:36:00 deraadt Exp $ */
+/* $OpenBSD: scp.c,v 1.183 2015/10/16 17:07:24 mmcc Exp $ */
/*
* scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd).
@@ -866,7 +866,7 @@ rsource(char *name, struct stat *statp)
return;
}
last = strrchr(name, '/');
- if (last == 0)
+ if (last == NULL)
last = name;
else
last++;