Don't read stdin if -d specified

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>

diff --git a/src/loadkeys.c b/src/loadkeys.c
index f92a765..fe05609 100644 (file)
--- a/src/loadkeys.c
+++ b/src/loadkeys.c
@@ -3006,6 +3006,10 @@ int main(int argc, char *argv[])
                        exit(EXIT_FAILURE);
                }
                parse_keymap(f);
+
+       } else if (optind == argc) {
+               strcpy(pathname, "<stdin>");
+               parse_keymap(stdin);
        }
 
        for (i = optind; argv[i]; i++) {
@@ -3021,11 +3025,6 @@ int main(int argc, char *argv[])
                parse_keymap(f);
        }
 
-       if (optind == argc) {
-               strcpy(pathname, "<stdin>");
-               parse_keymap(stdin);
-       }
-
        do_constant();
 
        if (optb)

diff --git a/src/loadkeys.y b/src/loadkeys.y
index 1a32440..2b07328 100644 (file)
--- a/src/loadkeys.y
+++ b/src/loadkeys.y
@@ -1195,6 +1195,10 @@ int main(int argc, char *argv[])
                        exit(EXIT_FAILURE);
                }
                parse_keymap(f);
+
+       } else if (optind == argc) {
+               strcpy(pathname, "<stdin>");
+               parse_keymap(stdin);
        }
 
        for (i = optind; argv[i]; i++) {
@@ -1210,11 +1214,6 @@ int main(int argc, char *argv[])
                parse_keymap(f);
        }
 
-       if (optind == argc) {
-               strcpy(pathname, "<stdin>");
-               parse_keymap(stdin);
-       }
-
        do_constant();
 
        if (optb)