mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-24 10:52:05 +00:00
be19763532
Fixes the following build failure with Clang 15 on musl:
```
bsd-asprintf.c:51:8: error: call to undeclared library function 'vsnprintf' with type 'int (char *, unsigned long, const char *, struct __va_list_tag *)'; ISO C99 and laterclang -O2 -pipe -fdiagnostics-color=always -frecord-gcc-switches -pipe -Wunknown-warning-option -Qunused-arguments -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-result -Wmisleading-indentation -Wbitwise-instead-of-logical -fno-strict-aliasing -mretpoline -ftrapv -fzero-call-used-regs=all -fno-builtin-memset -fstack-protector-strong -fPIE -I. -I. -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -DSSHDIR=\"/etc/ssh\" -D_PATH_SSH_PROGRAM=\"/usr/bin/ssh\" -D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/lib/misc/ssh-askpass\" -D_PATH_SFTP_SERVER=\"/usr/lib/misc/sftp-server\" -D_PATH_SSH_KEY_SIGN=\"/usr/lib/misc/ssh-keysign\" -D_PATH_SSH_PKCS11_HELPER=\"/usr/lib/misc/ssh-pkcs11-helper\" -D_PATH_SSH_SK_HELPER=\"/usr/lib/misc/ssh-sk-helper\" -D_PATH_SSH_PIDDIR=\"/run\" -D_PATH_PRIVSEP_CHROOT_DIR=\"/var/empty\" -DHAVE_CONFIG_H -c cipher-aes.c -o cipher-aes.o
do not support
implicit function declarations [-Wimplicit-function-declaration]
ret = vsnprintf(string, INIT_SZ, fmt, ap2);
^
bsd-asprintf.c:51:8: note: include the header <stdio.h> or explicitly provide a declaration for 'vsnprintf'
1 error generated.
```
100 lines
2.3 KiB
C
100 lines
2.3 KiB
C
/*
|
|
* Copyright (c) 2004 Darren Tucker.
|
|
*
|
|
* Based originally on asprintf.c from OpenBSD:
|
|
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
|
|
/*
|
|
* Don't let systems with broken printf(3) avoid our replacements
|
|
* via asprintf(3)/vasprintf(3) calling libc internally.
|
|
*/
|
|
#if defined(BROKEN_SNPRINTF)
|
|
# undef HAVE_VASPRINTF
|
|
# undef HAVE_ASPRINTF
|
|
#endif
|
|
|
|
#ifndef HAVE_VASPRINTF
|
|
|
|
#include <errno.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#define INIT_SZ 128
|
|
|
|
int
|
|
vasprintf(char **str, const char *fmt, va_list ap)
|
|
{
|
|
int ret = -1;
|
|
va_list ap2;
|
|
char *string, *newstr;
|
|
size_t len;
|
|
|
|
VA_COPY(ap2, ap);
|
|
if ((string = malloc(INIT_SZ)) == NULL)
|
|
goto fail;
|
|
|
|
ret = vsnprintf(string, INIT_SZ, fmt, ap2);
|
|
if (ret >= 0 && ret < INIT_SZ) { /* succeeded with initial alloc */
|
|
*str = string;
|
|
} else if (ret == INT_MAX || ret < 0) { /* Bad length */
|
|
free(string);
|
|
goto fail;
|
|
} else { /* bigger than initial, realloc allowing for nul */
|
|
len = (size_t)ret + 1;
|
|
if ((newstr = realloc(string, len)) == NULL) {
|
|
free(string);
|
|
goto fail;
|
|
} else {
|
|
va_end(ap2);
|
|
VA_COPY(ap2, ap);
|
|
ret = vsnprintf(newstr, len, fmt, ap2);
|
|
if (ret >= 0 && (size_t)ret < len) {
|
|
*str = newstr;
|
|
} else { /* failed with realloc'ed string, give up */
|
|
free(newstr);
|
|
goto fail;
|
|
}
|
|
}
|
|
}
|
|
va_end(ap2);
|
|
return (ret);
|
|
|
|
fail:
|
|
*str = NULL;
|
|
errno = ENOMEM;
|
|
va_end(ap2);
|
|
return (-1);
|
|
}
|
|
#endif
|
|
|
|
#ifndef HAVE_ASPRINTF
|
|
int asprintf(char **str, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
int ret;
|
|
|
|
*str = NULL;
|
|
va_start(ap, fmt);
|
|
ret = vasprintf(str, fmt, ap);
|
|
va_end(ap);
|
|
|
|
return ret;
|
|
}
|
|
#endif
|