Changeset 68b5dd11 in mainline for uspace/lib/clui/nchoice.c

Timestamp:

2015-10-20T10:08:15Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b598460a

Parents:

44fe800

Message:

Provide some default options.

File:

• uspace/lib/clui/nchoice.c (modified) (4 diffs)

uspace/lib/clui/nchoice.c

@@ -35 +35 @@
 #include <errno.h>
 #include <nchoice.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <str.h>
@@ -94 +95 @@
 }
 
-#include <stdio.h>
 /** Add option to numerical choice */
-int nchoice_add(nchoice_t *choice, const char *opttext, void *arg)
+int nchoice_add(nchoice_t *choice, const char *opttext, void *arg,
+    nchoice_flag_t flags)
 {
         nchoice_opt_t *opt;
@@ -114 +115 @@
         opt->arg = arg;
         list_append(&opt->lchoice, &choice->opts);
+
+        if ((flags & ncf_default) != 0) {
+                /* Set this option as the default */
+                assert(choice->def_opt == NULL);
+
+                choice->def_opt = opt;
+        }
+
         return EOK;
 }
@@ -125 +134 @@
         unsigned long c;
         char *eptr;
+        char *istr;
+        int def_i;
 
 again:
         printf("%s\n", choice->prompt);
 
+        def_i = 0;
         i = 1;
         list_foreach(choice->opts, lchoice, nchoice_opt_t, opt) {
-                printf("%d: %s\n", i, opt->text);
+                printf("%d: %s%s\n", i, opt->text, opt == choice->def_opt ?
+                    " [default]" : "");
+                if (opt == choice->def_opt)
+                        def_i = i;
                 ++i;
         }
 
-        rc = tinput_read(choice->tinput, &str);
+        if (def_i > 0) {
+                rc = asprintf(&istr, "%d", def_i);
+                if (rc < 0)
+                        return ENOMEM;
+        } else {
+                istr = str_dup("");
+                if (istr == NULL)
+                        return ENOMEM;
+        }
+
+        rc = tinput_read_i(choice->tinput, istr, &str);
+        free(istr);
+
         if (rc != EOK) {
                 assert(rc == EIO || rc == ENOENT);