Merge pull request #269 from christophgysin/usage

Add --help to print usage

1 files changed, 27 insertions, 8 deletions

diff --git a/sway/main.c b/sway/main.c
index dd609214..1261a7ce 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -55,25 +55,41 @@ int main(int argc, char **argv) {
         static int verbose = 0, debug = 0, validate = 0;
 
         static struct option long_options[] = {
+                {"help", no_argument, NULL, 'h'},
                 {"config", required_argument, NULL, 'c'},
-                {"validate", no_argument, &validate, 1},
-                {"debug", no_argument, &debug, 1},
+                {"validate", no_argument, NULL, 'C'},
+                {"debug", no_argument, NULL, 'd'},
                 {"version", no_argument, NULL, 'v'},
-                {"verbose", no_argument, &verbose, 1},
+                {"verbose", no_argument, NULL, 'V'},
                 {"get-socketpath", no_argument, NULL, 'p'},
                 {0, 0, 0, 0}
         };
 
         char *config_path = NULL;
+
+        const char* usage =
+                "Usage: sway [options] [command]\n"
+                "\n"
+                "  -h, --help             Show help message and quit.\n"
+                "  -c, --config <config>  Specify a config file.\n"
+                "  -C, --validate         Check the validity of the config file, then exit.\n"
+                "  -d, --debug            Enables full logging, including debug information.\n"
+                "  -v, --version          Show the version number and quit.\n"
+                "  -V, --verbose          Enables more verbose logging.\n"
+                "      --get-socketpath   Gets the IPC socket path and prints it, then exits.\n"
+                "\n";
+
         int c;
         while (1) {
                 int option_index = 0;
-                c = getopt_long(argc, argv, "CdvVpc:", long_options, &option_index);
+                c = getopt_long(argc, argv, "hCdvVpc:", long_options, &option_index);
                 if (c == -1) {
                         break;
                 }
                 switch (c) {
-                case 0: // Flag
+                case 'h': // help
+                        fprintf(stdout, "%s", usage);
+                        exit(EXIT_SUCCESS);
                         break;
                 case 'c': // config
                         config_path = strdup(optarg);
@@ -90,7 +106,7 @@ int main(int argc, char **argv) {
 #else
                         fprintf(stdout, "version not detected\n");
 #endif
-                        exit(0);
+                        exit(EXIT_SUCCESS);
                         break;
                 case 'V': // verbose
                         verbose = 1;
@@ -98,12 +114,15 @@ int main(int argc, char **argv) {
                 case 'p': ; // --get-socketpath
                         if (getenv("SWAYSOCK")) {
                                 fprintf(stdout, "%s\n", getenv("SWAYSOCK"));
-                                exit(0);
+                                exit(EXIT_SUCCESS);
                         } else {
                                 fprintf(stderr, "sway socket not detected.\n");
-                                exit(1);
+                                exit(EXIT_FAILURE);
                         }
                         break;
+                default:
+                        fprintf(stderr, "%s", usage);
+                        exit(EXIT_FAILURE);
                 }
         }