| 46,13 → 46,14 |
|---|
| #include <string.h> |
| #include <stdarg.h> |
| #include <stdlib.h> |
| #include <stdarg.h> |
| |
| #include "config.h" |
| #include "errors.h" |
| #include "util.h" |
| |
| |
| /* some platforms do not have strdup, implement it here */ |
| /* some platforms do not have strdup, implement it here. |
| * Returns a pointer to an allocated string or NULL on failure */ |
| char * cli_strdup(const char *s1) |
| { |
| size_t len = strlen(s1) + 1; |
| 64,6 → 65,71 |
|---|
| return (char *) memcpy(ret, s1, len); |
| } |
| |
| /* |
| * Take a previously allocated string (s1), re-size it to accept s2 and copy |
| * the contents of s2 into s1. |
| * Return -1 on failure, or the length of the copied string on success. |
| */ |
| int cli_redup(char **s1, const char *s2) |
| { |
| size_t len = strlen(s2) + 1; |
| |
| if (! len) |
| return -1; |
| |
| *s1 = realloc(*s1, len); |
| |
| if (*s1 == NULL) |
| return -1; |
| |
| memset(*s1, 0, sizeof(*s1)); |
| memcpy(*s1, s2, len); |
| return (int) len; |
| } |
| |
| /* An asprintf() for concantenating paths. Allocates the system PATH_MAX value, |
| * expands the formatted string and re-sizes the block s1 points to accordingly. |
| * |
| * Returns the length of the new s1 on success, -1 on failure. On failure, an |
| * attempt is made to return s1 unmodified for sanity, in this case 0 is returned. |
| * to indicate that s1 was not modified. |
| * |
| * FIXME: ugly hack to get around asprintf(), if you use this, CHECK ITS VALUE! */ |
| int cli_psprintf(char **s1, const char *fmt, ...) |
| { |
| va_list ap; |
| size_t needed, base = PATH_MAX + 1; |
| char *tmp = (char *) malloc(base); |
| |
| if (NULL == tmp) |
| return -1; |
| |
| char *orig = *s1; |
| |
| memset(tmp, 0, sizeof(tmp)); |
| va_start(ap, fmt); |
| vsnprintf(tmp, base, fmt, ap); |
| va_end(ap); |
| needed = strlen(tmp) + 1; |
| *s1 = realloc(*s1, needed); |
| if (NULL == *s1) { |
| *s1 = realloc(*s1, strlen(orig) + 1); |
| if (NULL == *s1) { |
| free(tmp); |
| return -1; |
| } |
| memset(*s1, 0, sizeof(*s1)); |
| memcpy(*s1, orig, strlen(orig) + 1); |
| free(tmp); |
| return 0; |
| } |
| memset(*s1, 0, sizeof(*s1)); |
| memcpy(*s1, tmp, needed); |
| free(tmp); |
| |
| return (int) needed; |
| } |
| |
| /* Ported from FBSD strtok.c 8.1 (Berkeley) 6/4/93 */ |
| char * cli_strtok_r(char *s, const char *delim, char **last) |
| { |