Changeset 37d4c91 in mainline for uspace/app/fontviewer/fontviewer.c

Timestamp:

2020-07-17T18:56:37Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3541cb9, 7a873f0

Parents:

583c2a3

Message:

Fix fontviewer not accepting font argument

File:

• uspace/app/fontviewer/fontviewer.c (modified) (3 diffs)

uspace/app/fontviewer/fontviewer.c

@@ -248 +248 @@
 static void print_syntax(void)
 {
-        printf("Syntax: %s [-d <display>]\n", NAME);
+        printf("Syntax: %s [-d <display>] [<font-file>]\n", NAME);
 }
 
@@ -257 +257 @@
 
         i = 1;
-        while (i < argc) {
+        while (i < argc && argv[i][0] == '-') {
                 if (str_cmp(argv[i], "-d") == 0) {
                         ++i;
@@ -275 +275 @@
 
         if (i < argc) {
+                font_path = argv[i];
+        } else {
                 font_path = NULL;
-        } else {
-                font_path = argv[i];
         }