From 21dc37aee5c37235f5c473fa86cb0df0a41fa840 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 1 Jul 2020 12:39:39 +0000
Subject: Make wayland socket names byte arrays

---
 src/main.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index 81f1b50..7b47d3c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -841,7 +841,7 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument::
                             expected: String::from("missing socket path"),
                         })?,
                 );
-            let mut name = "";
+            let mut name: &[u8] = b"";
             for c in components {
                 let mut kv = c.splitn(2, '=');
                 let (kind, value) = match (kv.next(), kv.next()) {
@@ -854,7 +854,7 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument::
                     }
                 };
                 match kind {
-                    "name" => name = value,
+                    "name" => name = value.as_bytes(),
                     _ => {
                         return Err(argument::Error::InvalidValue {
                             value: kind.to_owned(),
@@ -866,10 +866,10 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument::
             if cfg.wayland_socket_paths.contains_key(name) {
                 return Err(argument::Error::TooManyArguments(format!(
                     "wayland socket name already used: '{}'",
-                    name
+                    String::from_utf8_lossy(&name)
                 )));
             }
-            cfg.wayland_socket_paths.insert(name.to_string(), path);
+            cfg.wayland_socket_paths.insert(name.to_vec(), path);
         }
         "wayland-device-sock" => {
             let path = PathBuf::from(value.unwrap());
@@ -2190,7 +2190,7 @@ fn wl_cmd(mut args: std::env::Args) -> std::result::Result<(), ()> {
 
     let request = match subcommand {
         "add" => {
-            let name = args.next().unwrap();
+            let name = args.next().unwrap().as_bytes().to_vec();
             let path = args.next().unwrap().into();
             VmRequest::WlCommand(WlControlCommand::AddSocket { name, path })
         }
-- 
cgit 1.4.1