sys: consistent sprintf

scivision · scivision · commit 3ac8455a4c9c · 2025-08-14T22:14:35.000-04:00
diff --git a/+stdlib/+python/hard_link_count.m b/+stdlib/+python/hard_link_count.m
@@ -3,8 +3,7 @@
 try
   c = double(py.os.stat(p).st_nlink);
 catch e
-  warning(e.identifier, "hard_link_count(%s) failed: %s", p, e.message);
-  c = 0;
+  c = [];
 end
 
 end
diff --git a/+stdlib/+sys/cpu_load.m b/+stdlib/+sys/cpu_load.m
@@ -1,4 +1,4 @@
-function L = cpu_load()
+function [L, cmd, m] = cpu_load()
 
 L = NaN;
 
@@ -12,7 +12,6 @@
 
 [status, m] = system(cmd);
 if status ~= 0
-  warning("stdlib:cpu_load:OSError", "Failed to get CPU load");
   return
 end
 
diff --git a/+stdlib/+sys/create_symlink.m b/+stdlib/+sys/create_symlink.m
@@ -1,21 +1,18 @@
 
-function ok = create_symlink(target, link)
+function [ok, cmd, m] = create_symlink(target, link)
 
 ok = false;
+m = '';
 
-if ~stdlib.exists(target) || stdlib.strempty(link) || stdlib.exists(link)
-  return
-end
-
-if ispc
-  cmd = sprintf('pwsh -c "New-Item -ItemType SymbolicLink -Path "%s" -Target "%s""', link, target);
+if ispc()
+  cmd = sprintf('pwsh -c "New-Item -ItemType SymbolicLink -Path ''%s'' -Target ''%s''"', link, target);
 else
   cmd = sprintf('ln -s "%s" "%s"', target, link);
 end
 
-% suppress output text on powershell
-[stat, ~] = system(cmd);
-
-ok = stat == 0;
+if stdlib.exists(target) && strlength(link) && ~stdlib.exists(link)
+  [stat, m] = system(cmd);
+  ok = stat == 0;
+end
 
 end
diff --git a/+stdlib/+sys/disk_available.m b/+stdlib/+sys/disk_available.m
@@ -1,9 +1,7 @@
-function t = disk_available(p)
+function [t, cmd] = disk_available(p)
 
 t = uint64([]);
 
-if ~stdlib.exists(p), return, end
-
 if ispc()
   dl = extractBefore(stdlib.absolute(p), 2);
   cmd = "pwsh -c (Get-Volume -DriveLetter " + dl + ").SizeRemaining";
@@ -13,9 +11,11 @@
   cmd = sprintf('df -B1 "%s" | awk ''NR==2 {print $4}''', p);
 end
 
-[s, t] = system(cmd);
-if s == 0
-  t = uint64(str2double(t));
+if stdlib.exists(p)
+  [s, t] = system(cmd);
+  if s == 0
+    t = uint64(str2double(t));
+  end
 end
 
 end
diff --git a/+stdlib/+sys/disk_capacity.m b/+stdlib/+sys/disk_capacity.m
@@ -1,21 +1,21 @@
-function t = disk_capacity(p)
+function [t, cmd] = disk_capacity(p)
 
 t = uint64([]);
 
-if ~stdlib.exists(p), return, end
-
 if ispc()
   dl = extractBefore(stdlib.absolute(p), 2);
-  cmd = "pwsh -c (Get-Volume -DriveLetter " + dl + ").Size";
+  cmd = sprintf('pwsh -c "(Get-Volume -DriveLetter ''%s'').Size"', dl);
 elseif ismac()
   cmd = sprintf('df -k "%s" | awk ''NR==2 {print $2*1024}''', p);
 else
   cmd = sprintf('df -B1 "%s" | awk ''NR==2 {print $2}''', p);
 end
 
-[s, t] = system(cmd);
-if s == 0
-  t = str2double(t);
+if stdlib.exists(p)
+  [s, t] = system(cmd);
+  if s == 0
+    t = str2double(t);
+  end
 end
 
 t = uint64(t);
diff --git a/+stdlib/+sys/file_checksum.m b/+stdlib/+sys/file_checksum.m
@@ -1,22 +1,22 @@
 %% SYS.FILE_CHECKSUM compute checksum of file
-function hash = file_checksum(file, hash_method)
+function [hash, cmd] = file_checksum(file, hash_method)
 
 switch lower(hash_method)
   case {"sha-256", "sha256"}
     if ismac()
-      cmd = "shasum --algorithm 256 --binary " + file;
+      cmd = sprintf('shasum --algorithm 256 --binary "%s"', file);
     elseif ispc()
-      cmd = "CertUtil -hashfile " + file + " SHA256";
+      cmd = sprintf('CertUtil -hashfile "%s" SHA256', file);
     else
-      cmd = "sha256sum --binary " + file;
+      cmd = sprintf('sha256sum --binary "%s"', file);
     end
   case "md5"
     if ismac()
-      cmd = "md5 -r " + file;
+      cmd = sprintf('md5 -r "%s"', file);
     elseif ispc()
-      cmd = "CertUtil -hashfile " + file + " MD5";
+      cmd = sprintf('CertUtil -hashfile "%s" MD5', file);
     else
-      cmd = "md5sum " + file;
+      cmd = sprintf('md5sum "%s"', file);
     end
   otherwise, error('unhandled hash method %s', hash_method)
 end
diff --git a/+stdlib/+sys/filesystem_type.m b/+stdlib/+sys/filesystem_type.m
@@ -1,21 +1,21 @@
-function t = filesystem_type(p)
+function [t, cmd] = filesystem_type(p)
 
 t = '';
 
-if ~stdlib.exists(p), return, end
-
 if ispc()
   dl = extractBefore(stdlib.absolute(p), 2);
-  cmd = sprintf('pwsh -c (Get-Volume -DriveLetter "%s").FileSystem', dl);
+  cmd = sprintf('pwsh -c "(Get-Volume -DriveLetter ''%s'').FileSystem"', dl);
 elseif ismac()
   cmd = sprintf('df -aHY "%s" | awk ''NR==2 {print $2}''', p);
 else
   cmd = sprintf('df --output=fstype "%s" | tail -n 1', p);
 end
 
-[s, t] = system(cmd);
-if s == 0
-  t = strip(t);
+if stdlib.exists(p)
+  [s, t] = system(cmd);
+  if s == 0
+    t = strip(t);
+  end
 end
 
 end
diff --git a/+stdlib/+sys/get_hostname.m b/+stdlib/+sys/get_hostname.m
@@ -1,4 +1,4 @@
-function n = get_hostname()
+function [n, cmd] = get_hostname()
 
 cmd = 'hostname';
 [s, n] = system(cmd);
diff --git a/+stdlib/+sys/get_owner.m b/+stdlib/+sys/get_owner.m
@@ -1,9 +1,6 @@
-function o = get_owner(p)
+function [o, cmd] = get_owner(p)
 
 o = "";
-if ~stdlib.exists(p)
-  return
-end
 
 if ispc()
   cmd = sprintf('pwsh -c "if($x=Get-Acl -Path ''%s'') {$x.Owner}"', p);
@@ -13,9 +10,11 @@
   cmd = sprintf('stat -c %%U "%s"', p);
 end
 
-[s, m] = system(cmd);
-if s == 0
-  o = string(strip(m));
+if stdlib.exists(p)
+  [s, m] = system(cmd);
+  if s == 0
+    o = string(strip(m));
+  end
 end
 
 end
diff --git a/+stdlib/+sys/get_username.m b/+stdlib/+sys/get_username.m
@@ -1,4 +1,4 @@
-function n = get_username()
+function [n, cmd] = get_username()
 
 if ispc()
   cmd = 'whoami';
diff --git a/+stdlib/+sys/hard_link_count.m b/+stdlib/+sys/hard_link_count.m
@@ -2,12 +2,9 @@
 %
 % Powershell is 0, 1, or 2
 
-function n = hard_link_count(file)
+function [n, cmd] = hard_link_count(file)
 
-if ~stdlib.exists(file)
-  n = 0;
-  return
-end
+n = [];
 
 if ispc()
   cmd = sprintf('pwsh -c "(Get-Item ''%s'').LinkType"', file);
@@ -17,12 +14,14 @@
   cmd = sprintf('stat -c %%h ''%s''', file);
 end
 
-[status, output] = system(cmd);
-if status == 0
-  if ispc()
-    n = 1 + startsWith(output, "HardLink");
-  else
-    n = str2double(output);
+if stdlib.exists(file)
+  [status, output] = system(cmd);
+  if status == 0
+    if ispc()
+      n = 1 + startsWith(output, "HardLink");
+    else
+      n = str2double(output);
+    end
   end
 end
 
diff --git a/+stdlib/+sys/inode.m b/+stdlib/+sys/inode.m
@@ -1,6 +1,6 @@
 %% SYS.INODE get file inode
 
-function i = inode(p)
+function [i, cmd] = inode(p)
 
 i = [];
 
diff --git a/+stdlib/+sys/is_char_device.m b/+stdlib/+sys/is_char_device.m
@@ -1,4 +1,6 @@
-function ok = is_char_device(file)
+function [ok, cmd] = is_char_device(file)
+
+cmd = '';
 
 if ispc()
   % https://learn.microsoft.com/en-us/windows/console/console-handles
diff --git a/+stdlib/+sys/is_mount.m b/+stdlib/+sys/is_mount.m
@@ -1,5 +1,6 @@
-function y = is_mount(filepath)
+function [y, cmd] = is_mount(filepath)
 
+cmd = '';
 y = logical.empty;
 if ~stdlib.exists(filepath), return, end
 
diff --git a/+stdlib/+sys/is_removable.m b/+stdlib/+sys/is_removable.m
@@ -12,13 +12,13 @@
   psFile = fullfile(fileparts(mfilename('fullpath')), "isRemovableDrive.ps1");
   mustBeFile(psFile)
 
-  psCmd = sprintf(". '%s'; IsRemovableDrive -DriveLetter '%s'", psFile, r);
+  psCmd = sprintf('. ''%s''; IsRemovableDrive -DriveLetter ''%s''', psFile, r);
 
-  cmd1 = sprintf('powershell -ExecutionPolicy Bypass -Command "& {%s}"', psCmd);
+  cmd = sprintf('powershell -ExecutionPolicy Bypass -Command "& {%s}"', psCmd);
 else
-  cmd1 = sprintf('df "%s" | tail -n 1 | awk ''{print $1}''', filepath);
+  cmd = sprintf('df "%s" | tail -n 1 | awk ''{print $1}''', filepath);
 end
-[s1, m1] = system(cmd1);
+[s1, m1] = system(cmd);
 if s1 ~= 0
   warning('stdlib:is_removable:OSError', '%s', m1)
   return
diff --git a/+stdlib/+sys/is_symlink.m b/+stdlib/+sys/is_symlink.m
@@ -1,15 +1,20 @@
-function ok = is_symlink(p)
+function [ok, cmd] = is_symlink(p)
 
 ok = false;
 
-if strlength(p) < 1, return, end
-
 if ispc()
-  [s, m] = system(sprintf('pwsh -command "(Get-Item -Path %s).Attributes"', p));
-  ok = s == 0 && contains(m, 'ReparsePoint');
+  cmd = sprintf('pwsh -command "(Get-Item -Path ''%s'').Attributes"', p);
 else
-  [s, ~] = system(sprintf('test -L %s', p));
+  cmd = sprintf('test -L "%s"', p);
+end
+
+if strlength(p)
+  [s, m] = system(cmd);
   ok = s == 0;
+
+  if ispc()
+    ok = ok && contains(m, 'ReparsePoint');
+  end
 end
 
 end
diff --git a/+stdlib/+sys/ram_free.m b/+stdlib/+sys/ram_free.m
@@ -1,4 +1,4 @@
-function bytes = ram_free()
+function [bytes, cmd] = ram_free()
 
 bytes = [];
 
diff --git a/+stdlib/+sys/ram_total.m b/+stdlib/+sys/ram_total.m
@@ -1,4 +1,4 @@
-function bytes = ram_total()
+function [bytes, cmd] = ram_total()
 
 bytes = [];
 
diff --git a/+stdlib/+sys/read_symlink.m b/+stdlib/+sys/read_symlink.m
@@ -1,20 +1,20 @@
-function r = read_symlink(p)
+function [r, cmd] = read_symlink(p)
 
 r = "";
 
-if ~stdlib.is_symlink(p), return, end
-
 if isunix()
   cmd = sprintf('readlink -fn "%s"', p);
 else
-  cmd = sprintf('pwsh -c "(Get-Item -Path %s).Target"', p);
+  cmd = sprintf('pwsh -c "(Get-Item -Path ''%s'').Target"', p);
 end
 
-[s, m] = system(cmd);
-if s == 0
-  m = strip(string(m));
-  if strlength(m) > 0
-    r = m;
+if stdlib.is_symlink(p)
+  [s, m] = system(cmd);
+  if s == 0
+    m = strip(string(m));
+    if strlength(m) > 0
+      r = m;
+    end
   end
 end
 
diff --git a/+stdlib/+sys/set_modtime.m b/+stdlib/+sys/set_modtime.m
@@ -1,23 +1,19 @@
-function ok = set_modtime(file, dt)
+function [ok, cmd] = set_modtime(file, dt)
 
 ok = false;
 
-if ~isfile(file), return, end
-
 if ispc()
   cmd = sprintf('pwsh -c "(Get-Item ''%s'').LastWriteTime = ''%s''"', file, string(dt, "yyyy-MM-dd HH:mm:ss"));
 elseif ismac()
-  cmd = sprintf("touch -mt %s %s", string(dt, "yyyyMMddHHmm"), file);
+  cmd = sprintf('touch -mt %s "%s"', string(dt, "yyyyMMddHHmm"), file);
 else
-  % https://man7.org/linux/man-pages/man1/touch.1.html
-  cmd = sprintf("touch -t %s %s", string(dt, "yyyyMMddHHmm"), file);
+  cmd = sprintf('touch -t %s "%s"', string(dt, "yyyyMMddHHmm"), file);
 end
+% https://man7.org/linux/man-pages/man1/touch.1.html
 
-[s, m] = system(cmd);
-ok = s == 0;
-
-if ~ok
-  warning("stdlib:set_modtime:ValueError", "%s   set modification time of %s: %s", cmd, file, m);
+if isfile(file)
+  [s, ~] = system(cmd);
+  ok = s == 0;
 end
 
 end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function n = get_hostname()`
	`1`	`+function [n, cmd] = get_hostname()`
`2`	`2`
`3`	`3`	`cmd = 'hostname';`
`4`	`4`	`[s, n] = system(cmd);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function n = get_username()`
	`1`	`+function [n, cmd] = get_username()`
`2`	`2`
`3`	`3`	`if ispc()`
`4`	`4`	`cmd = 'whoami';`