From f5129add0eb16c9511c9cb80433fb4568f1e2703 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Mon, 11 Jul 2016 22:05:45 -0400
Subject: use an associative array to build bsdcpio options

This prevents having unquoted expansion in the bsdcpio commandline
---
 lsinitcpio | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/lsinitcpio b/lsinitcpio
index f54fa25..faad720 100755
--- a/lsinitcpio
+++ b/lsinitcpio
@@ -6,9 +6,15 @@
 shopt -s extglob
 
 _list='--list'
-_optcolor=1 _optverbose=
+_optcolor=1
 _f_functions=functions
 
+declare -A bsdcpio_options=(
+    [list]='--list'
+    [input]='-i'
+    [quiet]='--quiet'
+)
+
 usage() {
     cat<<USAGE
 lsinitcpio %VERSION%
@@ -237,26 +243,35 @@ unset _opt_short _opt_long OPTRET
 while :; do
     case $1 in
         -a|--analyze)
-            _optanalyze=1 ;;
+            _optanalyze=1
+            ;;
         -c|--config)
-            _optshowconfig=1 ;;
+            _optshowconfig=1
+            ;;
         -h|--help)
             usage
-            exit 0 ;;
+            exit 0
+            ;;
         -l|--list)
-            _optlistcontents=1 ;;
+            _optlistcontents=1
+            ;;
         -n|--nocolor)
-            _optcolor=0 ;;
+            _optcolor=0
+            ;;
         -V|--version)
             version
-            exit 0 ;;
+            exit 0
+            ;;
         -v|--verbose)
-            _optverbose='--verbose' ;;
+            bsdcpio_options['verbose']='--verbose'
+            ;;
         -x|--extract)
-            unset _list ;;
+            unset 'bsdcpio_options[list]'
+            ;;
         --)
             shift
-            break 2 ;;
+            break 2
+            ;;
     esac
     shift
 done
@@ -287,7 +302,7 @@ elif (( _optshowconfig )); then
     decomp "$_image" | bsdtar xOf - buildconfig 2>/dev/null ||
         die 'Failed to extract config from image (mkinitcpio too old?)'
 else
-    decomp "$_image" | bsdcpio -i --quiet $_optverbose $_list
+    decomp "$_image" | bsdcpio "${bsdcpio_options[@]}"
 fi
 
 # vim: set ft=sh ts=4 sw=4 et:
-- 
cgit v1.2.3-24-g4f1b