3 files changed, 11 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index baa58bc8a..b181a8cae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,10 @@
      the next key will expire when scanning for expired keys.  Set the select
      timeout to whichever of these two things happens next.  With djm@, with &
      ok deraadt@ markus@
+   - tedu@cvs.openbsd.org 2007/03/20 03:56:12
+     [readconf.c clientloop.c]
+     remove some bogus *p tests from charles longeau
+     ok deraadt millert
 
 20070313
  - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include
@@ -2848,4 +2852,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4643 2007/03/21 09:45:06 dtucker Exp $
+$Id: ChangeLog,v 1.4644 2007/03/21 09:46:03 dtucker Exp $
diff --git a/clientloop.c b/clientloop.c
index c7362caa8..1aeb412a9 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.178 2007/02/20 10:25:14 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.179 2007/03/20 03:56:12 tedu Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -935,7 +935,7 @@ process_cmdline(void)
         cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
         if (s == NULL)
                 goto out;
-        while (*s && isspace(*s))
+        while (isspace(*s))
                 s++;
         if (*s == '-')
                 s++;    /* Skip cmdline '-', if any */
@@ -982,9 +982,8 @@ process_cmdline(void)
                 goto out;
         }
 
-        s++;
-        while (*s && isspace(*s))
-                s++;
+        while (isspace(*++s))
+                ;
 
         if (delete) {
                 cancel_port = 0;
diff --git a/readconf.c b/readconf.c
index 2485146a0..d57d4551d 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.161 2007/01/21 01:45:35 stevesk Exp $ */
+/* $OpenBSD: readconf.c,v 1.162 2007/03/20 03:56:12 tedu Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1224,7 +1224,7 @@ parse_forward(Forward *fwd, const char *fwdspec)
         cp = p = xstrdup(fwdspec);
 
         /* skip leading spaces */
-        while (*cp && isspace(*cp))
+        while (isspace(*cp))
                 cp++;
 
         for (i = 0; i < 4; ++i)