upstream: move skip_space() to misc.c and make it public; ok

markus@

OpenBSD-Commit-ID: caa77e8a3b210948e29ad3e28c5db00852961eae

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 32ce1925082b4dc7ac051cb25ab3a6b4bbb93b57..65db116ed6786d34dff0db2183ad9eedebd0ea2d 100644 (file)
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.91 2019/07/16 13:18:39 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.92 2019/09/03 08:29:58 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -538,16 +538,6 @@ match_principals_command(struct ssh *ssh, struct passwd *user_pw,
        return found_principal;
 }
 
-static void
-skip_space(char **cpp)
-{
-       char *cp;
-
-       for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++)
-               ;
-       *cpp = cp;
-}
-
 /*
  * Advanced *cpp past the end of key options, defined as the first unquoted
  * whitespace character. Returns 0 on success or -1 on failure (e.g.

diff --git a/misc.c b/misc.c
index c94d2c2661e14ccb19fab5a6c95807d4d114ecd4..d5e44da775c6841d0f67578eb54d10e027f1cef6 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.140 2019/08/16 06:13:15 djm Exp $ */
+/* $OpenBSD: misc.c,v 1.141 2019/09/03 08:29:58 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -2127,3 +2127,13 @@ path_absolute(const char *path)
 {
        return (*path == '/') ? 1 : 0;
 }
+
+void
+skip_space(char **cpp)
+{
+       char *cp;
+
+       for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++)
+               ;
+       *cpp = cp;
+}

diff --git a/misc.h b/misc.h
index 5b4325aba2b8a54bd454991524bed4e852ad834a..8deea5ea64a26965ace3b353d46c123159a3ee6b 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.79 2019/01/23 21:50:56 dtucker Exp $ */
+/* $OpenBSD: misc.h,v 1.80 2019/09/03 08:29:58 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -44,6 +44,7 @@ struct ForwardOptions {
 /* misc.c */
 
 char   *chop(char *);
+void   skip_space(char **);
 char   *strdelim(char **);
 char   *strdelimw(char **);
 int     set_nonblock(int);