summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2020-02-05 18:47:53 -0800
committerKaz Kylheku <kaz@kylheku.com>2020-02-05 18:47:53 -0800
commitf99ed67ea0eba3ce858eaf845f179570cd0e585b (patch)
tree34795879091c50c7fd290698d88685918795b088
parentb7a7370a921bbc02b54d87600ff74d5cb9efde28 (diff)
downloadtxr-f99ed67ea0eba3ce858eaf845f179570cd0e585b.tar.gz
txr-f99ed67ea0eba3ce858eaf845f179570cd0e585b.tar.bz2
txr-f99ed67ea0eba3ce858eaf845f179570cd0e585b.zip
chmod: type error in exception throw.
* sysif.c (chmod_wrap): The uw_throw expression contains an otal format specifier ~o which requires an integer argument; but the mode can be a string now. Split into two cases.
-rw-r--r--sysif.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/sysif.c b/sysif.c
index d117729b..4f5da7c5 100644
--- a/sysif.c
+++ b/sysif.c
@@ -713,8 +713,15 @@ inval:
if (err < 0) {
int eno = errno;
- uw_throwf(errno_to_file_error(eno), lit("~a ~a #o~o: ~d/~s"),
- self, target, mode, num(eno), string_utf8(strerror(eno)), nao);
+ val error = errno_to_file_error(eno);
+ val errstr = string_utf8(strerror(eno));
+
+ if (stringp(mode))
+ uw_throwf(error, lit("~a ~a ~a: ~d/~s"),
+ self, target, mode, num(eno), errstr, nao);
+ else
+ uw_throwf(error, lit("~a ~a #o~o: ~d/~s"),
+ self, target, mode, num(eno), errstr, nao);
}
return t;