upstream commit

0 -> NULL when comparing with a char*.

ok dtucker@, djm@.

Upstream-ID: a928e9c21c0a9020727d99738ff64027c1272300

diff --git a/scp.c b/scp.c
index 593fe89bded2c812e68367ec5024678384cc5013..842dc66a93af941b1aa03e7d75660deca80d05f6 100644 (file)
--- 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++;