Mercurial > hg > toybox
changeset 1713:58d9f1b61f0a draft
Patches from Elliott Hughes to add missing arguments to error_exit() calls.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sun, 01 Mar 2015 15:58:40 -0600 |
parents | 59a3fd32329c |
children | 0c8ef714cf03 |
files | lib/xwrap.c toys/lsb/mount.c toys/other/sysctl.c toys/posix/ln.c |
diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/xwrap.c Sun Mar 01 15:48:49 2015 -0600 +++ b/lib/xwrap.c Sun Mar 01 15:58:40 2015 -0600 @@ -24,7 +24,7 @@ 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); }
--- a/toys/lsb/mount.c Sun Mar 01 15:48:49 2015 -0600 +++ b/toys/lsb/mount.c Sun Mar 01 15:58:40 2015 -0600 @@ -144,7 +144,8 @@ 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; } }
--- a/toys/other/sysctl.c Sun Mar 01 15:48:49 2015 -0600 +++ b/toys/other/sysctl.c Sun Mar 01 15:58:40 2015 -0600 @@ -97,7 +97,7 @@ 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; }
--- a/toys/posix/ln.c Sun Mar 01 15:48:49 2015 -0600 +++ b/toys/posix/ln.c Sun Mar 01 15:58:40 2015 -0600 @@ -40,7 +40,7 @@ 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; }