From: Rob Landley <rob@landley.net>
Date: Sun, 1 Mar 2015 21:58:40 +0000 (-0600)
Subject: Patches from Elliott Hughes to add missing arguments to error_exit() calls.
X-Git-Tag: android-x86-6.0-r1~164^2~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=70a84a356b1c56743618362867b9300007d11998;p=android-x86%2Fexternal-toybox.git

Patches from Elliott Hughes to add missing arguments to error_exit() calls.
---

diff --git a/lib/xwrap.c b/lib/xwrap.c
index 0a2b38ff..14703a72 100644
--- a/lib/xwrap.c
+++ b/lib/xwrap.c
@@ -24,7 +24,7 @@ void xstrncat(char *dest, char *src, size_t size)
   long len = strlen(src);
 
   if (len+strlen(dest)+1 > size)
-    error_exit("'%s%s' > %ld bytes", src, (long)size);
+    error_exit("'%s%s' > %ld bytes", dest, src, (long)size);
   strcpy(dest+len, src);
 }
 
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;
   }