From 10deeaaf71179f82532d79835375d0f796d7574a Mon Sep 17 00:00:00 2001 From: sn0rt Date: Tue, 5 Oct 2021 18:53:36 +0800 Subject: [PATCH] lxcfs: fix lxcfs CLI -v and no arg output Signed-off-by: sn0rt --- src/lxcfs.c | 7 +++++++ src/macro.h | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/lxcfs.c b/src/lxcfs.c index 172140b..f94f170 100644 --- a/src/lxcfs.c +++ b/src/lxcfs.c @@ -1244,6 +1244,10 @@ int main(int argc, char *argv[]) case 'u': opts->swap_off = true; break; + case 'v': + case 'version': + lxcfs_info("%s", STRINGIFY(PROJECT_VERSION)); + exit(EXIT_SUCCESS); default: usage(); } @@ -1254,6 +1258,9 @@ int main(int argc, char *argv[]) new_argv = &argv[optind]; new_argc = argc - optind; + if (new_argc == 0) { + usage(); + } if (new_argc != 1) { lxcfs_error("Missing mountpoint"); goto out; diff --git a/src/macro.h b/src/macro.h index a7fe05d..b9abf11 100644 --- a/src/macro.h +++ b/src/macro.h @@ -145,4 +145,7 @@ #define __returns_twice __attribute__((returns_twice)) #endif +#define STRINGIFY(a) __STRINGIFY(a) +#define __STRINGIFY(a) #a + #endif /* __LXCFS_MACRO_H */ -- 2.39.2