lxcfs: fix lxcfs CLI -v and no arg output

Signed-off-by: sn0rt <wangguohao.2009@gmail.com>

diff --git a/src/lxcfs.c b/src/lxcfs.c
index 172140b84141971cc95df24053b9676041aa56a4..f94f170e2af30e6fff92cbb840db4eecd73e479e 100644 (file)
--- 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 a7fe05d26ebd156ce7c237a15a1e0a5cba17eaa9..b9abf11a207429d4e31799c12ae7265319ba68c6 100644 (file)
--- 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 */