lxcfs, bindings: small improvements

- capitalize BASEDIR
- add missing newline to debug output

Signed-off-by: Christian Brauner <cbrauner@suse.de>

diff --git a/bindings.c b/bindings.c
index 8186ca9a7d8b234d55eebcbd9799affe0b8fe7bf..4cc3e82be9da48f1f8cf22738bf56508fb6bb42b 100644 (file)
--- a/bindings.c
+++ b/bindings.c
@@ -384,7 +384,7 @@ static void print_subsystems(void)
 {
        int i;
 
-       fprintf(stderr, "hierarchies:");
+       fprintf(stderr, "hierarchies:\n");
        for (i = 0; i < num_hierarchies; i++) {
                if (hierarchies[i])
                        fprintf(stderr, " %d: %s\n", i, hierarchies[i]);
@@ -435,10 +435,10 @@ bool cgfs_set_value(const char *controller, const char *cgroup, const char *file
 
        if (!tmpc)
                return false;
-       /* basedir / tmpc / cgroup / file \0 */
-       len = strlen(basedir) + strlen(tmpc) + strlen(cgroup) + strlen(file) + 4;
+       /* BASEDIR / tmpc / cgroup / file \0 */
+       len = strlen(BASEDIR) + strlen(tmpc) + strlen(cgroup) + strlen(file) + 4;
        fnam = alloca(len);
-       snprintf(fnam, len, "%s/%s/%s/%s", basedir, tmpc, cgroup, file);
+       snprintf(fnam, len, "%s/%s/%s/%s", BASEDIR, tmpc, cgroup, file);
 
        return write_string(fnam, value);
 }
@@ -486,10 +486,10 @@ int cgfs_create(const char *controller, const char *cg, uid_t uid, gid_t gid)
 
        if (!tmpc)
                return -EINVAL;
-       /* basedir / tmpc / cg \0 */
-       len = strlen(basedir) + strlen(tmpc) + strlen(cg) + 3;
+       /* BASEDIR / tmpc / cg \0 */
+       len = strlen(BASEDIR) + strlen(tmpc) + strlen(cg) + 3;
        dirnam = alloca(len);
-       snprintf(dirnam, len, "%s/%s/%s", basedir,tmpc, cg);
+       snprintf(dirnam, len, "%s/%s/%s", BASEDIR,tmpc, cg);
 
        if (mkdir(dirnam, 0755) < 0)
                return -errno;
@@ -576,10 +576,10 @@ bool cgfs_remove(const char *controller, const char *cg)
 
        if (!tmpc)
                return false;
-       /* basedir / tmpc / cg \0 */
-       len = strlen(basedir) + strlen(tmpc) + strlen(cg) + 3;
+       /* BASEDIR / tmpc / cg \0 */
+       len = strlen(BASEDIR) + strlen(tmpc) + strlen(cg) + 3;
        dirnam = alloca(len);
-       snprintf(dirnam, len, "%s/%s/%s", basedir,tmpc, cg);
+       snprintf(dirnam, len, "%s/%s/%s", BASEDIR,tmpc, cg);
        return recursive_rmdir(dirnam);
 }
 
@@ -590,10 +590,10 @@ bool cgfs_chmod_file(const char *controller, const char *file, mode_t mode)
 
        if (!tmpc)
                return false;
-       /* basedir / tmpc / file \0 */
-       len = strlen(basedir) + strlen(tmpc) + strlen(file) + 3;
+       /* BASEDIR / tmpc / file \0 */
+       len = strlen(BASEDIR) + strlen(tmpc) + strlen(file) + 3;
        pathname = alloca(len);
-       snprintf(pathname, len, "%s/%s/%s", basedir, tmpc, file);
+       snprintf(pathname, len, "%s/%s/%s", BASEDIR, tmpc, file);
        if (chmod(pathname, mode) < 0)
                return false;
        return true;
@@ -622,10 +622,10 @@ int cgfs_chown_file(const char *controller, const char *file, uid_t uid, gid_t g
 
        if (!tmpc)
                return -EINVAL;
-       /* basedir / tmpc / file \0 */
-       len = strlen(basedir) + strlen(tmpc) + strlen(file) + 3;
+       /* BASEDIR / tmpc / file \0 */
+       len = strlen(BASEDIR) + strlen(tmpc) + strlen(file) + 3;
        pathname = alloca(len);
-       snprintf(pathname, len, "%s/%s/%s", basedir, tmpc, file);
+       snprintf(pathname, len, "%s/%s/%s", BASEDIR, tmpc, file);
        if (chown(pathname, uid, gid) < 0)
                return -errno;
 
@@ -643,10 +643,10 @@ FILE *open_pids_file(const char *controller, const char *cgroup)
 
        if (!tmpc)
                return NULL;
-       /* basedir / tmpc / cgroup / "cgroup.procs" \0 */
-       len = strlen(basedir) + strlen(tmpc) + strlen(cgroup) + 4 + strlen("cgroup.procs");
+       /* BASEDIR / tmpc / cgroup / "cgroup.procs" \0 */
+       len = strlen(BASEDIR) + strlen(tmpc) + strlen(cgroup) + 4 + strlen("cgroup.procs");
        pathname = alloca(len);
-       snprintf(pathname, len, "%s/%s/%s/cgroup.procs", basedir, tmpc, cgroup);
+       snprintf(pathname, len, "%s/%s/%s/cgroup.procs", BASEDIR, tmpc, cgroup);
        return fopen(pathname, "w");
 }
 
@@ -666,10 +666,10 @@ static bool cgfs_iterate_cgroup(const char *controller, const char *cgroup, bool
        if (!tmpc)
                return false;
 
-       /* basedir / tmpc / cgroup \0 */
-       len = strlen(basedir) + strlen(tmpc) + strlen(cgroup) + 3;
+       /* BASEDIR / tmpc / cgroup \0 */
+       len = strlen(BASEDIR) + strlen(tmpc) + strlen(cgroup) + 3;
        dirname = alloca(len);
-       snprintf(dirname, len, "%s/%s/%s", basedir, tmpc, cgroup);
+       snprintf(dirname, len, "%s/%s/%s", BASEDIR, tmpc, cgroup);
 
        dir = opendir(dirname);
        if (!dir)
@@ -761,10 +761,10 @@ bool cgfs_get_value(const char *controller, const char *cgroup, const char *file
 
        if (!tmpc)
                return false;
-       /* basedir / tmpc / cgroup / file \0 */
-       len = strlen(basedir) + strlen(tmpc) + strlen(cgroup) + strlen(file) + 4;
+       /* BASEDIR / tmpc / cgroup / file \0 */
+       len = strlen(BASEDIR) + strlen(tmpc) + strlen(cgroup) + strlen(file) + 4;
        fnam = alloca(len);
-       snprintf(fnam, len, "%s/%s/%s/%s", basedir, tmpc, cgroup, file);
+       snprintf(fnam, len, "%s/%s/%s/%s", BASEDIR, tmpc, cgroup, file);
 
        *value = slurp_file(fnam);
        return *value != NULL;
@@ -787,12 +787,12 @@ struct cgfs_files *cgfs_get_key(const char *controller, const char *cgroup, cons
        if (file && index(file, '/'))
                return NULL;
 
-       /* basedir / tmpc / cgroup / file \0 */
-       len = strlen(basedir) + strlen(tmpc) + strlen(cgroup) + 3;
+       /* BASEDIR / tmpc / cgroup / file \0 */
+       len = strlen(BASEDIR) + strlen(tmpc) + strlen(cgroup) + 3;
        if (file)
                len += strlen(file) + 1;
        fnam = alloca(len);
-       snprintf(fnam, len, "%s/%s/%s%s%s", basedir, tmpc, cgroup,
+       snprintf(fnam, len, "%s/%s/%s%s%s", BASEDIR, tmpc, cgroup,
                file ? "/" : "", file ? file : "");
 
        ret = stat(fnam, &sb);
@@ -838,10 +838,10 @@ bool is_child_cgroup(const char *controller, const char *cgroup, const char *f)
 
        if (!tmpc)
                return false;
-       /* basedir / tmpc / cgroup / f \0 */
-       len = strlen(basedir) + strlen(tmpc) + strlen(cgroup) + strlen(f) + 4;
+       /* BASEDIR / tmpc / cgroup / f \0 */
+       len = strlen(BASEDIR) + strlen(tmpc) + strlen(cgroup) + strlen(f) + 4;
        fnam = alloca(len);
-       snprintf(fnam, len, "%s/%s/%s/%s", basedir, tmpc, cgroup, f);
+       snprintf(fnam, len, "%s/%s/%s/%s", BASEDIR, tmpc, cgroup, f);
 
        ret = stat(fnam, &sb);
        if (ret < 0 || !S_ISDIR(sb.st_mode))

diff --git a/bindings.h b/bindings.h
index 3d3bf41f6714c3aa4d37b8eeb91c22df142f08d5..5ac26fbc35548856e365a7aa2b898295df5033f7 100644 (file)
--- a/bindings.h
+++ b/bindings.h
@@ -1,5 +1,5 @@
 /* directory under which we mount the controllers - /run/lxcfs/controllers */
-#define basedir RUNTIME_PATH "/lxcfs/controllers"
+#define BASEDIR RUNTIME_PATH "/lxcfs/controllers"
 
 extern int cg_write(const char *path, const char *buf, size_t size, off_t offset,
             struct fuse_file_info *fi);

diff --git a/lxcfs.c b/lxcfs.c
index 1d19a1098d457b24ba5d7700928482cfc4bd8d0a..14c694e2c3a7404c13d2f4c8e4717218785135f8 100644 (file)
--- a/lxcfs.c
+++ b/lxcfs.c
@@ -789,8 +789,8 @@ static bool mkdir_p(const char *dir, mode_t mode)
 
 static bool umount_if_mounted(void)
 {
-       if (umount2(basedir, MNT_DETACH) < 0 && errno != EINVAL) {
-               fprintf(stderr, "failed to umount %s: %s\n", basedir,
+       if (umount2(BASEDIR, MNT_DETACH) < 0 && errno != EINVAL) {
+               fprintf(stderr, "failed to umount %s: %s\n", BASEDIR,
                        strerror(errno));
                return false;
        }
@@ -799,7 +799,7 @@ static bool umount_if_mounted(void)
 
 static bool setup_cgfs_dir(void)
 {
-       if (!mkdir_p(basedir, 0700)) {
+       if (!mkdir_p(BASEDIR, 0700)) {
                fprintf(stderr, "Failed to create lxcfs cgdir\n");
                return false;
        }
@@ -807,7 +807,7 @@ static bool setup_cgfs_dir(void)
                fprintf(stderr, "Failed to clean up old lxcfs cgdir\n");
                return false;
        }
-       if (mount("tmpfs", basedir, "tmpfs", 0, "size=100000,mode=700") < 0) {
+       if (mount("tmpfs", BASEDIR, "tmpfs", 0, "size=100000,mode=700") < 0) {
                fprintf(stderr, "Failed to mount tmpfs for private controllers\n");
                return false;
        }
@@ -820,9 +820,9 @@ static bool do_mount_cgroup(char *controller)
        size_t len;
        int ret;
 
-       len = strlen(basedir) + strlen(controller) + 2;
+       len = strlen(BASEDIR) + strlen(controller) + 2;
        target = alloca(len);
-       ret = snprintf(target, len, "%s/%s", basedir, controller);
+       ret = snprintf(target, len, "%s/%s", BASEDIR, controller);
        if (ret < 0 || ret >= len)
                return false;
        if (mkdir(target, 0755) < 0 && errno != EEXIST)