proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-06-04 11:00:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

conf: remove fgets() from run_buffer()

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2019-03-01 12:00:42 +01:00
parent e613d684fa
commit ebf3a6af23
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lxc/conf.c
View File

@ -307,7 +307,7 @@ static struct limit_opt limit_opt[] = {
static int run_buffer(char *buffer)
{
__do_free char *output = NULL;
int ret;
int fd, ret;
struct lxc_popen_FILE *f;
f = lxc_popen(buffer);
@ -323,8 +323,25 @@ static int run_buffer(char *buffer)
return -1;
}
while (fgets(output, LXC_LOG_BUFFER_SIZE, f->f))
DEBUG("Script %s with output: %s", buffer, output);
fd = fileno(f->f);
if (fd < 0) {
SYSERROR("Failed to retrieve underlying file descriptor");
lxc_pclose(f);
return -1;
}
for (int i = 0; i < 10; i++) {
ssize_t bytes_read;
bytes_read = lxc_read_nointr(fd, output, LXC_LOG_BUFFER_SIZE - 1);
if (bytes_read > 0) {
output[bytes_read] = '\0';
DEBUG("Script %s produced output: %s", buffer, output);
continue;
}
break;
}
ret = lxc_pclose(f);
if (ret == -1) {

8
src/lxc/utils.h
View File

@ -61,10 +61,10 @@ static inline int lxc_set_cloexec(int fd)
return fcntl(fd, F_SETFD, FD_CLOEXEC);
}
/* Struct to carry child pid from lxc_popen() to lxc_pclose().
* Not an opaque struct to allow direct access to the underlying FILE *
* (i.e., struct lxc_popen_FILE *file; fgets(buf, sizeof(buf), file->f))
* without additional wrappers.
/*
* Struct to carry child pid from lxc_popen() to lxc_pclose(). Not an opaque
* struct to allow direct access to the underlying FILE without additional
* wrappers.
*/
struct lxc_popen_FILE {
int pipe;