[src/trunk]: src/usr.sbin/sysinst Split positional argument string expansion ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/55ec8af2b7d0
branches:  trunk
changeset: 445990:55ec8af2b7d0
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 19 17:17:43 2018 +0000

description:
Split positional argument string expansion from msg display, we can make
good use of it elsewhere too.

diffstat:

 usr.sbin/sysinst/defs.h |   3 +-
 usr.sbin/sysinst/util.c |  68 ++++++++++++++++++++++++++++--------------------
 2 files changed, 42 insertions(+), 29 deletions(-)

diffs (132 lines):

diff -r 0cda376a6786 -r 55ec8af2b7d0 usr.sbin/sysinst/defs.h
--- a/usr.sbin/sysinst/defs.h   Mon Nov 19 15:43:32 2018 +0000
+++ b/usr.sbin/sysinst/defs.h   Mon Nov 19 17:17:43 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.26 2018/11/15 10:23:32 martin Exp $ */
+/*     $NetBSD: defs.h,v 1.27 2018/11/19 17:17:43 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -553,6 +553,7 @@
 void   restore_etc(void);
 
 /* from util.c */
+char*  str_arg_subst(const char *, size_t, const char **);
 void   msg_display_subst(const char *, size_t, ...);
 int    ask_yesno(const char *);
 int    ask_noyes(const char *);
diff -r 0cda376a6786 -r 55ec8af2b7d0 usr.sbin/sysinst/util.c
--- a/usr.sbin/sysinst/util.c   Mon Nov 19 15:43:32 2018 +0000
+++ b/usr.sbin/sysinst/util.c   Mon Nov 19 17:17:43 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.17 2018/11/15 10:23:32 martin Exp $ */
+/*     $NetBSD: util.c,v 1.18 2018/11/19 17:17:43 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1795,29 +1795,17 @@
 }
 
 /*
- * Replace positional arguments (encoded as $0 .. $N) in the
- * message by the strings passed as ...
+ * Replace positional arguments (encoded as $0 .. $N) in the string
+ * passed by the contents of the passed argument array.
+ * Caller must free() the result string.
  */
-void
-msg_display_subst(const char *master, size_t argc, ...)
+char*
+str_arg_subst(const char *src, size_t argc, const char **argv)
 {
-       va_list ap;
-       const char **args, **arg;
-       const char *src, *p, *last;
+       const char *p, *last;
        char *out, *t;
        size_t len;
 
-       args = malloc(sizeof(const char *)*argc);
-       if (args == NULL)
-               return;
-
-       arg = args;
-       va_start(ap, argc);
-       for (size_t i = 0; i < argc; i++)
-               *arg++ = va_arg(ap, const char*);
-       va_end(ap);
-
-       src = msg_string(master);
        len = strlen(src);
        for (p = strchr(src, '$'); p; p = strchr(p+1, '$')) {
                char *endp = NULL;
@@ -1827,17 +1815,15 @@
                /* $ followed by a correct numeric position? */
                n = strtou(p+1, &endp, 10, 0, INT_MAX, &e);
                if ((e == 0 || e == ENOTSUP) && n < argc) {
-                       len += strlen(args[n]);
+                       len += strlen(argv[n]);
                        len -= endp-p;
                        p = endp-1;
                }
        }
 
        out = malloc(len+1);
-       if (out == NULL) {
-               free(args);
-               return;
-       }
+       if (out == NULL)
+               return NULL;
 
        t = out;
        for (last = src, p = strchr(src, '$'); p; p = strchr(p+1, '$')) {
@@ -1851,8 +1837,8 @@
                        size_t l = p-last;
                        memcpy(t, last, l);
                        t += l;
-                       strcpy(t, args[n]);
-                       t += strlen(args[n]);
+                       strcpy(t, argv[n]);
+                       t += strlen(argv[n]);
                        last = endp;
                }
        }
@@ -1864,9 +1850,35 @@
        }
        assert((size_t)(t-out) == len);
 
-       msg_display(out);
+       return out;
+}
+
+/*
+ * Replace positional arguments (encoded as $0 .. $N) in the
+ * message by the strings passed as ...
+ */
+void
+msg_display_subst(const char *master, size_t argc, ...)
+{
+       va_list ap;
+       const char **args, **arg;
+       char *out;
 
-       free(out);
+       args = malloc(sizeof(const char *)*argc);
+       if (args == NULL)
+               return;
+
+       arg = args;
+       va_start(ap, argc);
+       for (size_t i = 0; i < argc; i++)
+               *arg++ = va_arg(ap, const char*);
+       va_end(ap);
+
+       out = str_arg_subst(msg_string(master), argc, args);
+       if (out != NULL) {
+               msg_display(out);
+               free(out);
+       }
        free(args);
 }