From 70a84a356b1c56743618362867b9300007d11998 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sun, 1 Mar 2015 15:58:40 -0600
Subject: Patches from Elliott Hughes to add missing arguments to error_exit()
calls.
---
toys/lsb/mount.c | 3 ++-
toys/other/sysctl.c | 2 +-
toys/posix/ln.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'toys')
diff --git a/toys/lsb/mount.c b/toys/lsb/mount.c
index c334681c..4d6679d1 100644
--- a/toys/lsb/mount.c
+++ b/toys/lsb/mount.c
@@ -144,7 +144,8 @@ static void mount_filesystem(char *dev, char *dir, char *type,
if (getuid()) {
if (TT.okuser) TT.okuser = 0;
else {
- error_msg("'%s' not user mountable in fstab");
+ error_msg("'%s' not user mountable in fstab", dev);
+
return;
}
}
diff --git a/toys/other/sysctl.c b/toys/other/sysctl.c
index 8e57ca1d..d3c4d81d 100644
--- a/toys/other/sysctl.c
+++ b/toys/other/sysctl.c
@@ -97,7 +97,7 @@ static void process_key(char *key, char *value)
if (!value) value = split_key(key);
if ((toys.optflags & FLAG_w) && !value) {
- error_msg("'%s' not key=value");
+ error_msg("'%s' not key=value", key);
return;
}
diff --git a/toys/posix/ln.c b/toys/posix/ln.c
index 04b4f292..06700dd0 100644
--- a/toys/posix/ln.c
+++ b/toys/posix/ln.c
@@ -40,7 +40,7 @@ void ln_main(void)
if (((toys.optflags&FLAG_n) ? lstat : stat)(dest, &buf)
|| !S_ISDIR(buf.st_mode))
{
- if (toys.optc>1) error_exit("'%s' not a directory");
+ if (toys.optc>1) error_exit("'%s' not a directory", dest);
buf.st_mode = 0;
}
--
cgit v1.2.3