Skip to content

Commit

Permalink
upstream: move skip_space() to misc.c and make it public; ok
Browse files Browse the repository at this point in the history
markus@

OpenBSD-Commit-ID: caa77e8a3b210948e29ad3e28c5db00852961eae
  • Loading branch information
djmdjm committed Sep 3, 2019
1 parent 06af358 commit c72d78c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
12 changes: 1 addition & 11 deletions auth2-pubkey.c
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down Expand Up @@ -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.
Expand Down
12 changes: 11 additions & 1 deletion misc.c
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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;
}
3 changes: 2 additions & 1 deletion misc.h
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit c72d78c

Please sign in to comment.