tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Make dollar_expand variadic and pass a real va_list to

Browse Source 
vdollar_percent_expand. Fixes build error on arm64 spotted by otto@.

OpenBSD-Commit-ID: 181910d7ae489f40ad609b4cf4a20f3d068a7279
This commit is contained in:
dtucker@openbsd.org 2020-05-29 11:17:56 +00:00 committed by Darren Tucker
parent 837ffa9699
commit 712ac1efb6
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.c,v 1.151 2020/05/29 09:02:44 dtucker Exp $ */ /* $OpenBSD: misc.c,v 1.152 2020/05/29 11:17:56 dtucker Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005-2020 Damien Miller. All rights reserved. * Copyright (c) 2005-2020 Damien Miller. All rights reserved.
@ -1207,13 +1207,22 @@ vdollar_percent_expand(int *parseerror, int dollar, int percent,
#undef EXPAND_MAX_KEYS #undef EXPAND_MAX_KEYS
} }
/*
* Expand only environment variables.
* Note that although this function is variadic like the other similar
* functions, any such arguments will be unused.
*/
char * char *
dollar_expand(int *parseerr, const char *string) dollar_expand(int *parseerr, const char *string, ...)
{ {
char *ret; char *ret;
int err; int err;
va_list ap;
ret = vdollar_percent_expand(&err, 1, 0, string, NULL); va_start(ap, string);
ret = vdollar_percent_expand(&err, 1, 0, string, ap);
va_end(ap);
if (parseerr != NULL) if (parseerr != NULL)
*parseerr = err; *parseerr = err;
return ret; return ret;

4
misc.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.h,v 1.86 2020/05/29 04:25:40 dtucker Exp $ */ /* $OpenBSD: misc.h,v 1.87 2020/05/29 11:17:56 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -69,7 +69,7 @@ long convtime(const char *);
const char *fmt_timeframe(time_t t); const char *fmt_timeframe(time_t t);
char *tilde_expand_filename(const char *, uid_t); char *tilde_expand_filename(const char *, uid_t);
char *dollar_expand(int *, const char *string); char *dollar_expand(int *, const char *string, ...);
char *percent_expand(const char *, ...) __attribute__((__sentinel__)); char *percent_expand(const char *, ...) __attribute__((__sentinel__));
char *percent_dollar_expand(const char *, ...) __attribute__((__sentinel__)); char *percent_dollar_expand(const char *, ...) __attribute__((__sentinel__));
char *tohex(const void *, size_t); char *tohex(const void *, size_t);