External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

commandhelper: Use automatic memory management in printInput

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-02-01 12:28:03 +01:00 committed by Peter Krempa
parent 99502fa790
commit f00a6c2a5c
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tests/commandhelper.c
View File

@ -54,6 +54,19 @@ static void cleanupArguments(struct Arguments **ptr)
free(args); free(args);
} }
static void cleanupStringList(char ***ptr)
{
char **strings = *ptr;
if (strings) {
char **str;
for (str = strings; *str; str++)
free(*str);
}
free(strings);
}
static void cleanupGeneric(void *ptr) static void cleanupGeneric(void *ptr)
{ {
void **ptrptr = ptr; void **ptrptr = ptr;
@ -219,26 +232,25 @@ static int printCwd(FILE *log)
static int printInput(struct Arguments *args) static int printInput(struct Arguments *args)
{ {
char buf[1024]; char buf[1024];
struct pollfd *fds = NULL; cleanup(struct pollfd *, cleanupGeneric) fds = NULL;
char **buffers = NULL; cleanup(char **, cleanupStringList) buffers = NULL;
size_t *buflen = NULL; cleanup(size_t *, cleanupGeneric) buflen = NULL;
int ret = -1;
size_t i; size_t i;
ssize_t got; ssize_t got;
if (!(fds = calloc(args->numreadfds, sizeof(*fds)))) if (!(fds = calloc(args->numreadfds, sizeof(*fds))))
goto cleanup; return -1;
/* plus one NULL terminator */ /* plus one NULL terminator */
if (!(buffers = calloc(args->numreadfds + 1, sizeof(*buffers)))) if (!(buffers = calloc(args->numreadfds + 1, sizeof(*buffers))))
goto cleanup; return -1;
if (!(buflen = calloc(args->numreadfds, sizeof(*buflen)))) if (!(buflen = calloc(args->numreadfds, sizeof(*buflen))))
goto cleanup; return -1;
if (args->close_stdin) { if (args->close_stdin) {
if (freopen("/dev/null", "r", stdin) != stdin) if (freopen("/dev/null", "r", stdin) != stdin)
goto cleanup; return -1;
usleep(100 * 1000); usleep(100 * 1000);
} }
@ -258,7 +270,7 @@ static int printInput(struct Arguments *args)
if (poll(fds, args->numreadfds, -1) < 0) { if (poll(fds, args->numreadfds, -1) < 0) {
printf("poll failed: %s\n", strerror(errno)); printf("poll failed: %s\n", strerror(errno));
goto cleanup; return -1;
} }
for (i = 0; i < args->numreadfds; i++) { for (i = 0; i < args->numreadfds; i++) {
@ -277,7 +289,7 @@ static int printInput(struct Arguments *args)
got = read(fds[i].fd, buf, sizeof(buf)); got = read(fds[i].fd, buf, sizeof(buf));
if (got < 0) if (got < 0)
goto cleanup; return -1;
if (got == 0) { if (got == 0) {
/* do not want to hear from this fd anymore */ /* do not want to hear from this fd anymore */
fds[i].events = 0; fds[i].events = 0;
@ -285,7 +297,7 @@ static int printInput(struct Arguments *args)
buffers[i] = realloc(buffers[i], buflen[i] + got); buffers[i] = realloc(buffers[i], buflen[i] + got);
if (!buf[i]) { if (!buf[i]) {
fprintf(stdout, "Out of memory!\n"); fprintf(stdout, "Out of memory!\n");
goto cleanup; return -1;
} }
memcpy(buffers[i] + buflen[i], buf, got); memcpy(buffers[i] + buflen[i], buf, got);
buflen[i] += got; buflen[i] += got;
@ -304,9 +316,9 @@ static int printInput(struct Arguments *args)
for (i = 0; i < args->numreadfds; i++) { for (i = 0; i < args->numreadfds; i++) {
if (fwrite(buffers[i], 1, buflen[i], stdout) != buflen[i]) if (fwrite(buffers[i], 1, buflen[i], stdout) != buflen[i])
goto cleanup; return -1;
if (fwrite(buffers[i], 1, buflen[i], stderr) != buflen[i]) if (fwrite(buffers[i], 1, buflen[i], stderr) != buflen[i])
goto cleanup; return -1;
} }
fprintf(stdout, "END STDOUT\n"); fprintf(stdout, "END STDOUT\n");
@ -314,19 +326,7 @@ static int printInput(struct Arguments *args)
fprintf(stderr, "END STDERR\n"); fprintf(stderr, "END STDERR\n");
fflush(stderr); fflush(stderr);
ret = 0; return 0;
cleanup:
if (buffers) {
char **ptr;
for (ptr = buffers; *ptr; ptr++)
free(*ptr);
}
free(fds);
free(buflen);
free(buffers);
return ret;
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {