From 9611c6041d70af2b5c208fbd38f164ea472fd7bf Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Thu, 1 Oct 2020 22:28:04 +0200 Subject: fix build with clang error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus-int] --- src/firejail/chroot.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/firejail/chroot.c b/src/firejail/chroot.c index a18c181ab..cfa32d1d3 100644 --- a/src/firejail/chroot.c +++ b/src/firejail/chroot.c @@ -231,16 +231,16 @@ void fs_chroot(const char *rootdir) { } // create /run/firejail directory in chroot - if (mkdirat(parentfd, RUN_FIREJAIL_DIR+1, 0755) == -1 && errno != EEXIST) + if (mkdirat(parentfd, &RUN_FIREJAIL_DIR[1], 0755) == -1 && errno != EEXIST) errExit("mkdir"); - check_subdir(parentfd, RUN_FIREJAIL_DIR+1, 1); + check_subdir(parentfd, &RUN_FIREJAIL_DIR[1], 1); // create /run/firejail/lib directory in chroot - if (mkdirat(parentfd, RUN_FIREJAIL_LIB_DIR+1, 0755) == -1 && errno != EEXIST) + if (mkdirat(parentfd, &RUN_FIREJAIL_LIB_DIR[1], 0755) == -1 && errno != EEXIST) errExit("mkdir"); - check_subdir(parentfd, RUN_FIREJAIL_LIB_DIR+1, 1); + check_subdir(parentfd, &RUN_FIREJAIL_LIB_DIR[1], 1); // mount lib directory into the chroot - fd = openat(parentfd, RUN_FIREJAIL_LIB_DIR+1, O_PATH|O_DIRECTORY|O_NOFOLLOW|O_CLOEXEC); + fd = openat(parentfd, &RUN_FIREJAIL_LIB_DIR[1], O_PATH|O_DIRECTORY|O_NOFOLLOW|O_CLOEXEC); if (fd == -1) errExit("open"); if (asprintf(&proc, "/proc/self/fd/%d", fd) == -1) @@ -251,11 +251,11 @@ void fs_chroot(const char *rootdir) { close(fd); // create /run/firejail/mnt directory in chroot - if (mkdirat(parentfd, RUN_MNT_DIR+1, 0755) == -1 && errno != EEXIST) + if (mkdirat(parentfd, &RUN_MNT_DIR[1], 0755) == -1 && errno != EEXIST) errExit("mkdir"); - check_subdir(parentfd, RUN_MNT_DIR+1, 1); + check_subdir(parentfd, &RUN_MNT_DIR[1], 1); // mount the current mnt directory into the chroot - fd = openat(parentfd, RUN_MNT_DIR+1, O_PATH|O_DIRECTORY|O_NOFOLLOW|O_CLOEXEC); + fd = openat(parentfd, &RUN_MNT_DIR[1], O_PATH|O_DIRECTORY|O_NOFOLLOW|O_CLOEXEC); if (fd == -1) errExit("open"); if (asprintf(&proc, "/proc/self/fd/%d", fd) == -1) -- cgit v1.2.3-70-g09d2