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

file_utils: fix integer comparisons

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2021-09-03 12:56:43 +02:00
parent d535a483c9
commit 5e0e7af42a
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/file_utils.c
View File

@ -259,14 +259,19 @@ bool file_exists(const char *f)
int print_to_file(const char *file, const char *content) int print_to_file(const char *file, const char *content)
{ {
__do_fclose FILE *f = NULL; __do_fclose FILE *f = NULL;
int ret = 0; int ret;
size_t len;
f = fopen(file, "we"); f = fopen(file, "we");
if (!f) if (!f)
return -1; return -1;
if (fprintf(f, "%s", content) != strlen(content)) len = strlen(content);
ret = fprintf(f, "%s", content);
if (ret < 0 || (size_t)ret != len)
ret = -1; ret = -1;
else
ret = 0;
return ret; return ret;
} }
@ -593,8 +598,7 @@ FILE *fdopen_at(int dfd, const char *path, const char *mode,
int timens_offset_write(clockid_t clk_id, int64_t s_offset, int64_t ns_offset) int timens_offset_write(clockid_t clk_id, int64_t s_offset, int64_t ns_offset)
{ {
__do_close int fd = -EBADF; __do_close int fd = -EBADF;
int ret; ssize_t len, ret;
ssize_t len;
char buf[INTTYPE_TO_STRLEN(int) + char buf[INTTYPE_TO_STRLEN(int) +
STRLITERALLEN(" ") + INTTYPE_TO_STRLEN(int64_t) + STRLITERALLEN(" ") + INTTYPE_TO_STRLEN(int64_t) +
STRLITERALLEN(" ") + INTTYPE_TO_STRLEN(int64_t) + 1]; STRLITERALLEN(" ") + INTTYPE_TO_STRLEN(int64_t) + 1];
@ -611,7 +615,7 @@ int timens_offset_write(clockid_t clk_id, int64_t s_offset, int64_t ns_offset)
return ret_errno(EFBIG); return ret_errno(EFBIG);
ret = lxc_write_nointr(fd, buf, len); ret = lxc_write_nointr(fd, buf, len);
if (ret < 0 || (size_t)ret != len) if (ret < 0 || ret != len)
return -EIO; return -EIO;
return 0; return 0;