skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Remove dependency on asprintf.

Browse Source
This commit is contained in:
Maarten Billemont 2017-08-27 09:25:53 -04:00
parent 011416690a
commit 77b4ed2cfd
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/c/mpw-util.c
View File

@ -357,15 +357,28 @@ const char *mpw_str(const char *format, ...) {
const char *mpw_vstr(const char *format, va_list args) { const char *mpw_vstr(const char *format, va_list args) {
// TODO: We should find a way to get rid of this shared storage medium. // TODO: We should find a way to get rid of this shared storage medium.
// FIXME: Not thread-safe // TODO: Not thread-safe
static char *str_str; static char *str_str;
return vasprintf( &str_str, format, args ) < 0? NULL: str_str; static size_t str_str_max;
if (!str_str && !(str_str = calloc( str_str_max = 1, 1 )))
return NULL;
do {
int len = vsnprintf( &str_str, str_str_max, format, args );
if (len < str_str_max)
break;
if (!mpw_realloc( &str_str, &str_str_max, len - str_str_max + 1 ))
return NULL;
} while (true);
return str_str;
} }
const char *mpw_hex(const void *buf, size_t length) { const char *mpw_hex(const void *buf, size_t length) {
// TODO: We should find a way to get rid of this shared storage medium. // TODO: We should find a way to get rid of this shared storage medium.
// FIXME: Not thread-safe // TODO: Not thread-safe
static char **mpw_hex_buf; static char **mpw_hex_buf;
static unsigned int mpw_hex_buf_i; static unsigned int mpw_hex_buf_i;
@ -435,6 +448,7 @@ static char *mpw_tputs(const char *str, int affcnt) {
return result; return result;
} }
#endif #endif
const char *mpw_identicon(const char *fullName, const char *masterPassword) { const char *mpw_identicon(const char *fullName, const char *masterPassword) {