more sprintf

Author: scivision

+stdlib/+sys/get_owner.m

@@ -4,7 +4,7 @@
 if ~stdlib.exists(p), return, end
 
 if ispc()
-  cmd = "pwsh -c (Get-Acl -Path '" + p + "').Owner";
+  cmd = sprintf('pwsh -c (Get-Acl -Path "%s").Owner', p);
 elseif ismac()
   cmd = sprintf('stat -f %%Su "%s"', p);
 else

+stdlib/+sys/get_username.m

@@ -3,12 +3,12 @@
 if ispc()
   cmd = "whoami";
 else
-  cmd = "id -un";  % POSIX compliant command to get username
+  cmd = "id -un";
 end
 [s, n] = system(cmd);
 
 if s == 0
-  n = string(strtrim(n));  % Remove any trailing newline or spaces
+  n = string(strtrim(n));
 else
   warning("Failed to get username from system %s: %s", cmd, n);
   n = string.empty;

+stdlib/+sys/is_admin.m

@@ -10,7 +10,7 @@
 if s ~= 0
   warning("stdlib:is_admin:RuntimeError", "Failed to execute command '%s': %s", cmd, r);
   y = false;
-  return;
+  return
 end
 
 r = string(strip(r));

+stdlib/+sys/is_mount.m

@@ -4,25 +4,26 @@
 if ispc()
   if any(ismember(filepath, ["/", "\"])) || ...
       (endsWith(filepath, ["/", "\"]) && isfolder(filepath) && filepath == stdlib.root(filepath))
-    y = true; 
+    y = true;
     return
   end
-  cmd = strcat('pwsh -c "(Get-Item -Path ''', filepath, ''').Attributes.ToString().Contains(''ReparsePoint'')"');
+  cmd = sprintf('pwsh -c "(Get-Item -Path ''%s'').Attributes.ToString().Contains(''ReparsePoint'')"', filepath);
 elseif ismac()
   if filepath == "/"
     y = true;
     return
   end
-  cmd = "[ $(stat -f %d " + filepath + ") != $(stat -f %d " + stdlib.parent(filepath) + ")]";
+  cmd = sprintf('[ $(stat -f %%d "%s") != $(stat -f %%d "%s")]', ...
+                filepath, stdlib.parent(filepath));
 else
-  cmd = "mountpoint -q " + filepath;
+  cmd = sprintf('mountpoint -q "%s"', filepath);
 end
 
 [s, m] = system(cmd);
 
 if ispc()
   y = s == 0 && m == "True";
-else 
+else
   y = s == 0;
 end
 

+stdlib/+sys/is_removable.m

@@ -4,7 +4,7 @@
 
 if ispc()
   drive = stdlib.root_name(filepath);
-  cmd1 = strcat('wmic logicaldisk where "DeviceID=''', drive, '''" get DriveType');
+  cmd1 = sprintf('wmic logicaldisk where "DeviceID=''%s''" get DriveType', drive);
 else
   cmd1 = sprintf('df "%s" | tail -n 1 | awk ''{print $1}''', filepath);
 end
@@ -22,18 +22,18 @@
 
 elseif ismac()
 
-  cmd2 = ['diskutil info ', m1];
+  cmd2 = sprintf('diskutil info "%s"', m1);
   [s2, m2] = system(cmd2);
   y = s2 == 0 && contains(m2, "Removable Media:" + whitespacePattern + "Removable");
 
 else
 
   dev = strtrim(extractAfter(m1, '/dev/'));
-  f1 = strcat('/sys/class/block/', dev, '/removable');
+  f1 = sprintf('/sys/class/block/%s/removable', dev);
   if isfile(f1)
     y = strtrim(fileread(f1)) == "1";
   end
 
 end
 
-end
+end

+stdlib/+sys/read_symlink.m

@@ -5,7 +5,7 @@
 if ~stdlib.is_symlink(p), return, end
 
 if isunix()
-  cmd = sprintf('readlink -fn %s', p);
+  cmd = sprintf('readlink -fn "%s"', p);
 else
   cmd = sprintf('pwsh -command "(Get-Item -Path %s).Target"', p);
 end

+stdlib/file_size.m

@@ -13,7 +13,7 @@
 s = [];
 
 if ~isfile(p)
-  return;
+  return
 end
 
 d = dir(p);