aboutsummaryrefslogtreecommitdiffstats
path: root/swaygrab
diff options
context:
space:
mode:
authorLibravatar Christoph Gysin <christoph.gysin@gmail.com>2015-11-28 16:35:44 +0200
committerLibravatar Christoph Gysin <christoph.gysin@gmail.com>2015-11-28 23:50:44 +0200
commit923c3245ace71ea0e26a0b12746a699fa499f759 (patch)
treeb3fe2cdbd20aa595dc4d4d4c5093172cce1d4054 /swaygrab
parentswaymsg: Add --help option that prints usage (diff)
downloadsway-923c3245ace71ea0e26a0b12746a699fa499f759.tar.gz
sway-923c3245ace71ea0e26a0b12746a699fa499f759.tar.zst
sway-923c3245ace71ea0e26a0b12746a699fa499f759.zip
Fix option parsing
Using 'flag' results in duplicate code paths for short and long options. This broke the -q short option in swaymsg, because there was: {"quiet", no_argument, &quiet, 'q'} Which will set quiet to 'q' and return 0, not 'q'.
Diffstat (limited to 'swaygrab')
-rw-r--r--swaygrab/main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/swaygrab/main.c b/swaygrab/main.c
index ae17155f..681a6da4 100644
--- a/swaygrab/main.c
+++ b/swaygrab/main.c
@@ -128,10 +128,10 @@ int main(int argc, char **argv) {
128 128
129 static struct option long_options[] = { 129 static struct option long_options[] = {
130 {"help", no_argument, NULL, 'h'}, 130 {"help", no_argument, NULL, 'h'},
131 {"capture", no_argument, &capture, 'c'}, 131 {"capture", no_argument, NULL, 'c'},
132 {"version", no_argument, NULL, 'v'}, 132 {"version", no_argument, NULL, 'v'},
133 {"socket", required_argument, NULL, 's'}, 133 {"socket", required_argument, NULL, 's'},
134 {"raw", no_argument, &raw, 'r'}, 134 {"raw", no_argument, NULL, 'r'},
135 {"rate", required_argument, NULL, 'R'}, 135 {"rate", required_argument, NULL, 'R'},
136 {0, 0, 0, 0} 136 {0, 0, 0, 0}
137 }; 137 };
@@ -154,8 +154,6 @@ int main(int argc, char **argv) {
154 break; 154 break;
155 } 155 }
156 switch (c) { 156 switch (c) {
157 case 0: // Flag
158 break;
159 case 's': // Socket 157 case 's': // Socket
160 socket_path = strdup(optarg); 158 socket_path = strdup(optarg);
161 break; 159 break;