Merge branch 'busybox' into merge

35 files changed, 209 insertions, 73 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 1f1a18aab..ef7d1ccd9 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -650,7 +650,7 @@ static void check_suid(int applet_no)
                         /* same group / in group */
                         m >>= 3;
                 if (!(m & S_IXOTH)) /* is x bit not set? */
-                        bb_error_msg_and_die("you have no permission to run this applet");
+                        bb_simple_error_msg_and_die("you have no permission to run this applet");
 
                 /* We set effective AND saved ids. If saved-id is not set
                  * like we do below, seteuid(0) can still later succeed! */
@@ -662,7 +662,7 @@ static void check_suid(int applet_no)
                         rgid = sct->m_ugid.gid;
                 /* else: we will set egid = rgid, thus dropping sgid effect */
                 if (setresgid(-1, rgid, rgid))
-                        bb_perror_msg_and_die("setresgid");
+                        bb_simple_perror_msg_and_die("setresgid");
 
                 /* Are we directed to change uid
                  * (APPLET = s** USER.GROUP or APPLET = S** USER.GROUP)?
@@ -672,7 +672,7 @@ static void check_suid(int applet_no)
                         uid = sct->m_ugid.uid;
                 /* else: we will set euid = ruid, thus dropping suid effect */
                 if (setresuid(-1, uid, uid))
-                        bb_perror_msg_and_die("setresuid");
+                        bb_simple_perror_msg_and_die("setresuid");
 
                 goto ret;
         }
@@ -682,7 +682,7 @@ static void check_suid(int applet_no)
 
                 if (!onetime) {
                         onetime = 1;
-                        bb_error_msg("using fallback suid method");
+                        bb_simple_error_msg("using fallback suid method");
                 }
         }
 #   endif
@@ -692,7 +692,7 @@ static void check_suid(int applet_no)
                 /* Real uid is not 0. If euid isn't 0 too, suid bit
                  * is most probably not set on our executable */
                 if (geteuid())
-                        bb_error_msg_and_die("must be suid to work properly");
+                        bb_simple_error_msg_and_die("must be suid to work properly");
         } else if (APPLET_SUID(applet_no) == BB_SUID_DROP) {
                 /*
                  * Drop all privileges.
diff --git a/libbb/bb_getgroups.c b/libbb/bb_getgroups.c
index 59ae53738..5d83c729a 100644
--- a/libbb/bb_getgroups.c
+++ b/libbb/bb_getgroups.c
@@ -38,7 +38,7 @@ gid_t* FAST_FUNC bb_getgroups(int *ngroups, gid_t *group_array)
                         continue;
                 }
                 /* Some other error (should never happen on Linux) */
-                bb_perror_msg_and_die("getgroups");
+                bb_simple_perror_msg_and_die("getgroups");
         }
 
         if (ngroups)
diff --git a/libbb/bbunit.c b/libbb/bbunit.c
index 5f8d980a3..ccd909d78 100644
--- a/libbb/bbunit.c
+++ b/libbb/bbunit.c
@@ -60,6 +60,6 @@ int unit_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 return EXIT_FAILURE;
         }
 
-        bb_error_msg("All tests passed");
+        bb_simple_error_msg("All tests passed");
         return EXIT_SUCCESS;
 }
diff --git a/libbb/capability.c b/libbb/capability.c
index d0ae78b91..23afd8eb9 100644
--- a/libbb/capability.c
+++ b/libbb/capability.c
@@ -119,7 +119,7 @@ void FAST_FUNC getcaps(void *arg)
                         caps->u32s = _LINUX_CAPABILITY_U32S_3;
                         break;
                 default:
-                        bb_error_msg_and_die("unsupported capability version");
+                        bb_simple_error_msg_and_die("unsupported capability version");
         }
 
         if (capget(&caps->header, caps->data) != 0)
diff --git a/libbb/change_identity.c b/libbb/change_identity.c
index 20d7c5f2d..9ff741234 100644
--- a/libbb/change_identity.c
+++ b/libbb/change_identity.c
@@ -51,7 +51,7 @@ void FAST_FUNC change_identity(const struct passwd *pw)
                         return;
                 }
 
-                bb_perror_msg_and_die("can't set groups");
+                bb_simple_perror_msg_and_die("can't set groups");
         }
 
         xsetgid(pw->pw_gid);
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 1dc515b07..9b10dda1f 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -333,7 +333,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                 ) {
                         security_context_t con;
                         if (getfscreatecon(&con) == -1) {
-                                bb_perror_msg("getfscreatecon");
+                                bb_simple_perror_msg("getfscreatecon");
                                 return -1;
                         }
                         if (con) {
diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index dd0517cd6..ae5c26999 100644
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -87,7 +87,7 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
                 rd = safe_read(src_fd, buffer,
                         size > buffer_size ? buffer_size : size);
                 if (rd < 0) {
-                        bb_perror_msg(bb_msg_read_error);
+                        bb_simple_perror_msg(bb_msg_read_error);
                         break;
                 }
  read_ok:
@@ -100,7 +100,7 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
                         ssize_t wr = full_write(dst_fd, buffer, rd);
                         if (wr < rd) {
                                 if (!continue_on_write_error) {
-                                        bb_perror_msg(bb_msg_write_error);
+                                        bb_simple_perror_msg(bb_msg_write_error);
                                         break;
                                 }
                                 dst_fd = -1;
@@ -151,7 +151,7 @@ void FAST_FUNC bb_copyfd_exact_size(int fd1, int fd2, off_t size)
         if (sz == (size >= 0 ? size : -size))
                 return;
         if (sz != -1)
-                bb_error_msg_and_die("short read");
+                bb_simple_error_msg_and_die("short read");
         /* if sz == -1, bb_copyfd_XX already complained */
         xfunc_die();
 }
diff --git a/libbb/die_if_bad_username.c b/libbb/die_if_bad_username.c
index 46f103340..e5e1160c4 100644
--- a/libbb/die_if_bad_username.c
+++ b/libbb/die_if_bad_username.c
@@ -57,5 +57,5 @@ void FAST_FUNC die_if_bad_username(const char *name)
          * including the terminating null byte.
          */
         if (name - start >= LOGIN_NAME_MAX)
-                bb_error_msg_and_die("name is too long");
+                bb_simple_error_msg_and_die("name is too long");
 }
diff --git a/libbb/dump.c b/libbb/dump.c
index b4b49d709..8029cca0e 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -199,7 +199,7 @@ static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs)
                                 pr->bcnt = fu->bcnt;
                                 if (fu->bcnt == 0) {
                                         if (!prec)
-                                                bb_error_msg_and_die("%%s needs precision or byte count");
+                                                bb_simple_error_msg_and_die("%%s needs precision or byte count");
                                         pr->bcnt = atoi(prec);
                                 }
                         } else
@@ -266,7 +266,7 @@ static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs)
 
                         /* only one conversion character if byte count */
                         if (!(pr->flags & F_ADDRESS) && fu->bcnt && nconv++) {
-                                bb_error_msg_and_die("byte count with multiple conversion characters");
+                                bb_simple_error_msg_and_die("byte count with multiple conversion characters");
                         }
                 }
                 /*
diff --git a/libbb/fflush_stdout_and_exit.c b/libbb/fflush_stdout_and_exit.c
index 4c689c0fb..5df74170e 100644
--- a/libbb/fflush_stdout_and_exit.c
+++ b/libbb/fflush_stdout_and_exit.c
@@ -15,7 +15,7 @@ void FAST_FUNC fflush_stdout_and_exit(int retval)
 {
         xfunc_error_retval = retval;
         if (fflush(stdout))
-                bb_perror_msg_and_die(bb_msg_standard_output);
+                bb_simple_perror_msg_and_die(bb_msg_standard_output);
         /* In case we are in NOFORK applet. Do not exit() directly,
          * but use xfunc_die() */
         xfunc_die();
diff --git a/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c
index 52debb171..0b6d5a206 100644
--- a/libbb/find_pid_by_name.c
+++ b/libbb/find_pid_by_name.c
@@ -95,7 +95,11 @@ pid_t* FAST_FUNC find_pid_by_name(const char *procName)
                 /* or we require argv0 to match (essential for matching reexeced /proc/self/exe)*/
                  || (p->argv0 && strcmp(bb_basename(p->argv0), procName) == 0)
                 /* or we require /proc/PID/exe link to match */
-                 || (p->exe && strcmp(bb_basename(p->exe), procName) == 0)
+                 || (p->exe && strcmp(
+                                        procName[0] == '/' ? p->exe /* support "pidof /path/to/binary" case too */
+                                                        : bb_basename(p->exe),
+                                        procName
+                                        ) == 0)
 #endif
                 ) {
                         pidList = xrealloc_vector(pidList, 2, i);
diff --git a/libbb/get_console.c b/libbb/get_console.c
index 0b53524aa..7f2c75332 100644
--- a/libbb/get_console.c
+++ b/libbb/get_console.c
@@ -62,7 +62,7 @@ int FAST_FUNC get_console_fd_or_die(void)
                 }
         }
 
-        bb_error_msg_and_die("can't open console");
+        bb_simple_error_msg_and_die("can't open console");
 }
 
 /* From <linux/vt.h> */
diff --git a/libbb/get_volsize.c b/libbb/get_volsize.c
index 241ceda9b..087efb3c7 100644
--- a/libbb/get_volsize.c
+++ b/libbb/get_volsize.c
@@ -18,7 +18,7 @@ uoff_t FAST_FUNC get_volume_size_in_bytes(int fd,
         if (override) {
                 result = XATOOFF(override);
                 if (result >= (uoff_t)(MAXINT(off_t)) / override_units)
-                        bb_error_msg_and_die("image size is too big");
+                        bb_simple_error_msg_and_die("image size is too big");
                 result *= override_units;
                 /* seek past end fails on block devices but works on files */
                 if (lseek(fd, result - 1, SEEK_SET) != (off_t)-1) {
@@ -42,7 +42,7 @@ uoff_t FAST_FUNC get_volume_size_in_bytes(int fd,
          *
          * Picked 16k arbitrarily: */
         if (result < 16*1024)
-                bb_error_msg_and_die("image is too small");
+                bb_simple_error_msg_and_die("image is too small");
 
         return result;
 }
diff --git a/libbb/getpty.c b/libbb/getpty.c
index 5d24ca930..9ec6265ad 100644
--- a/libbb/getpty.c
+++ b/libbb/getpty.c
@@ -23,14 +23,14 @@ int FAST_FUNC xgetpty(char *line)
                         const char *name;
                         name = ptsname(p); /* find out the name of slave pty */
                         if (!name) {
-                                bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
+                                bb_simple_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
                         }
                         safe_strncpy(line, name, GETPTY_BUFSIZE);
                 }
 # else
                 /* find out the name of slave pty */
                 if (ptsname_r(p, line, GETPTY_BUFSIZE-1) != 0) {
-                        bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
+                        bb_simple_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
                 }
                 line[GETPTY_BUFSIZE-1] = '\0';
 # endif
@@ -61,5 +61,5 @@ int FAST_FUNC xgetpty(char *line)
                 }
         }
 #endif /* FEATURE_DEVPTS */
-        bb_error_msg_and_die("can't find free pty");
+        bb_simple_error_msg_and_die("can't find free pty");
 }
diff --git a/libbb/herror_msg.c b/libbb/herror_msg.c
index d041076e0..a7dd98679 100644
--- a/libbb/herror_msg.c
+++ b/libbb/herror_msg.c
@@ -26,3 +26,13 @@ void FAST_FUNC bb_herror_msg_and_die(const char *s, ...)
         va_end(p);
         xfunc_die();
 }
+
+void FAST_FUNC bb_simple_herror_msg(const char *s)
+{
+        bb_herror_msg("%s", s);
+}
+
+void FAST_FUNC bb_simple_herror_msg_and_die(const char *s)
+{
+        bb_herror_msg_and_die("%s", s);
+}
diff --git a/libbb/loop.c b/libbb/loop.c
index c78535a20..ada0c7638 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -78,6 +78,24 @@ int FAST_FUNC del_loop(const char *device)
         return rc;
 }
 
+/* Obtain an unused loop device number */
+int FAST_FUNC get_free_loop(void)
+{
+        int fd;
+        int loopdevno;
+
+        fd = open("/dev/loop-control", O_RDWR | O_CLOEXEC);
+        if (fd == -1)
+                return fd - 1; /* -2: "no /dev/loop-control" */
+
+#ifndef LOOP_CTL_GET_FREE
+# define LOOP_CTL_GET_FREE 0x4C82
+#endif
+        loopdevno = ioctl(fd, LOOP_CTL_GET_FREE);
+        close(fd);
+        return loopdevno; /* can be -1 if error */
+}
+
 /* Returns opened fd to the loop device, <0 on error.
  * *device is loop device to use, or if *device==NULL finds a loop device to
  * mount it on and sets *device to a strdup of that loop device name.  This
@@ -106,12 +124,24 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
                 return -errno;
         }
 
-//TODO: use LOOP_CTL_GET_FREE instead of trying every loopN in sequence? a-la:
-// fd = open("/dev/loop-control", O_RDWR);
-// loopN = ioctl(fd, LOOP_CTL_GET_FREE);
-//
+        try = *device;
+        if (!try) {
+                i = get_free_loop();
+                if (i == -2) { /* no /dev/loop-control */
+                        i = 0;
+                        try = dev;
+                        goto old_style;
+                }
+                if (i == -1) {
+                        close(ffd);
+                        return -1; /* no free loop devices */
+                }
+                try = *device = xasprintf(LOOP_FORMAT, i);
+                goto try_to_open;
+        }
+
+ old_style:
         /* Find a loop device.  */
-        try = *device ? *device : dev;
         /* 1048575 (0xfffff) is a max possible minor number in Linux circa 2010 */
         for (i = 0; rc && i < 1048576; i++) {
                 sprintf(dev, LOOP_FORMAT, i);
@@ -170,7 +200,7 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
                                         rc = ioctl(dfd, BB_LOOP_SET_STATUS, &loopinfo);
                                 }
                                 if (rc != 0) {
-                                        ioctl(dfd, LOOP_CLR_FD, 0);
+                                        ioctl(dfd, LOOP_CLR_FD, 0); // actually, 0 param is unnecessary
                                 }
                         }
                 } else {
diff --git a/libbb/mtab.c b/libbb/mtab.c
index 131705ddb..aa1a2a103 100644
--- a/libbb/mtab.c
+++ b/libbb/mtab.c
@@ -21,7 +21,7 @@ void FAST_FUNC erase_mtab(const char *name)
         /* Bummer. Fall back on trying the /proc filesystem */
         if (!mountTable) mountTable = setmntent("/proc/mounts", "r");
         if (!mountTable) {
-                bb_perror_msg(bb_path_mtab_file);
+                bb_simple_perror_msg(bb_path_mtab_file);
                 return;
         }
 
@@ -49,6 +49,6 @@ void FAST_FUNC erase_mtab(const char *name)
                 }
                 endmntent(mountTable);
         } else if (errno != EROFS)
-                bb_perror_msg(bb_path_mtab_file);
+                bb_simple_perror_msg(bb_path_mtab_file);
 }
 #endif
diff --git a/libbb/perror_nomsg.c b/libbb/perror_nomsg.c
index a2a11cc8e..d7d53de44 100644
--- a/libbb/perror_nomsg.c
+++ b/libbb/perror_nomsg.c
@@ -12,11 +12,11 @@
  * instead of including libbb.h */
 //#include "libbb.h"
 #include "platform.h"
-extern void bb_perror_msg(const char *s, ...) FAST_FUNC;
+extern void bb_simple_perror_msg(const char *s) FAST_FUNC;
 
 /* suppress gcc "no previous prototype" warning */
 void FAST_FUNC bb_perror_nomsg(void);
 void FAST_FUNC bb_perror_nomsg(void)
 {
-        bb_perror_msg(0);
+        bb_simple_perror_msg(0);
 }
diff --git a/libbb/perror_nomsg_and_die.c b/libbb/perror_nomsg_and_die.c
index 543ff5178..bea5f25a5 100644
--- a/libbb/perror_nomsg_and_die.c
+++ b/libbb/perror_nomsg_and_die.c
@@ -12,11 +12,11 @@
  * instead of including libbb.h */
 //#include "libbb.h"
 #include "platform.h"
-extern void bb_perror_msg_and_die(const char *s, ...) FAST_FUNC;
+extern void bb_simple_perror_msg_and_die(const char *s) FAST_FUNC;
 
 /* suppress gcc "no previous prototype" warning */
 void FAST_FUNC bb_perror_nomsg_and_die(void);
 void FAST_FUNC bb_perror_nomsg_and_die(void)
 {
-        bb_perror_msg_and_die(0);
+        bb_simple_perror_msg_and_die(0);
 }
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
index 86455cd0d..47c20690f 100644
--- a/libbb/pw_encrypt.c
+++ b/libbb/pw_encrypt.c
@@ -6,7 +6,9 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+#if !ENABLE_USE_BB_CRYPT
 #include <crypt.h>
+#endif
 #include "libbb.h"
 
 /* static const uint8_t ascii64[] ALIGN1 =
diff --git a/libbb/read_printf.c b/libbb/read_printf.c
index 1e67d6542..379dd2448 100644
--- a/libbb/read_printf.c
+++ b/libbb/read_printf.c
@@ -222,7 +222,7 @@ void FAST_FUNC xread(int fd, void *buf, size_t count)
         if (count) {
                 ssize_t size = full_read(fd, buf, count);
                 if ((size_t)size != count)
-                        bb_error_msg_and_die("short read");
+                        bb_simple_error_msg_and_die("short read");
         }
 }
 
diff --git a/libbb/safe_poll.c b/libbb/safe_poll.c
index cf93a9774..a07e785f3 100644
--- a/libbb/safe_poll.c
+++ b/libbb/safe_poll.c
@@ -27,7 +27,7 @@ int FAST_FUNC safe_poll(struct pollfd *ufds, nfds_t nfds, int timeout)
                 /* I doubt many callers would handle this correctly! */
                 if (errno == ENOMEM)
                         continue;
-                bb_perror_msg("poll");
+                bb_simple_perror_msg("poll");
                 return n;
         }
 }
diff --git a/libbb/selinux_common.c b/libbb/selinux_common.c
index c2585557f..f917a1c6a 100644
--- a/libbb/selinux_common.c
+++ b/libbb/selinux_common.c
@@ -48,7 +48,7 @@ void FAST_FUNC selinux_preserve_fcontext(int fdesc)
         if (fgetfilecon(fdesc, &context) < 0) {
                 if (errno == ENODATA || errno == ENOTSUP)
                         return;
-                bb_perror_msg_and_die("fgetfilecon failed");
+                bb_simple_perror_msg_and_die("fgetfilecon failed");
         }
         setfscreatecon_or_die(context);
         freecon(context);
diff --git a/libbb/time.c b/libbb/time.c
index f9b8da0b3..cab0ad602 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -258,7 +258,7 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp)
 static void get_mono(struct timespec *ts)
 {
         if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
-                bb_error_msg_and_die("clock_gettime(MONOTONIC) failed");
+                bb_simple_error_msg_and_die("clock_gettime(MONOTONIC) failed");
 }
 unsigned long long FAST_FUNC monotonic_ns(void)
 {
diff --git a/libbb/unicode.c b/libbb/unicode.c
index 89d42179b..79481f159 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -674,14 +674,20 @@ int FAST_FUNC wcwidth(unsigned ucs)
                 (  (/*ucs >= 0x1100 &&*/ ucs <= 0x115f) /* Hangul Jamo init. consonants */
                 || ucs == 0x2329 /* left-pointing angle bracket; also CJK punct. char */
                 || ucs == 0x232a /* right-pointing angle bracket; also CJK punct. char */
+#   if CONFIG_LAST_SUPPORTED_WCHAR >= 0x2e80
                 || (ucs >= 0x2e80 && ucs <= 0xa4cf && ucs != 0x303f) /* CJK ... Yi */
+#   endif
 #   if CONFIG_LAST_SUPPORTED_WCHAR >= 0xac00
                 || (ucs >= 0xac00 && ucs <= 0xd7a3) /* Hangul Syllables */
+#   endif
+#   if CONFIG_LAST_SUPPORTED_WCHAR >= 0xf900
                 || (ucs >= 0xf900 && ucs <= 0xfaff) /* CJK Compatibility Ideographs */
                 || (ucs >= 0xfe10 && ucs <= 0xfe19) /* Vertical forms */
                 || (ucs >= 0xfe30 && ucs <= 0xfe6f) /* CJK Compatibility Forms */
                 || (ucs >= 0xff00 && ucs <= 0xff60) /* Fullwidth Forms */
                 || (ucs >= 0xffe0 && ucs <= 0xffe6)
+#   endif
+#   if CONFIG_LAST_SUPPORTED_WCHAR >= 0x20000
                 || ((ucs >> 17) == (2 >> 1)) /* 20000..3ffff: Supplementary and Tertiary Ideographic Planes */
 #   endif
                 );
diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c
index 95423d19b..c605c4c64 100644
--- a/libbb/update_passwd.c
+++ b/libbb/update_passwd.c
@@ -25,7 +25,7 @@ static void check_selinux_update_passwd(const char *username)
                 return;  /* No need to check */
 
         if (getprevcon_raw(&context) < 0)
-                bb_perror_msg_and_die("getprevcon failed");
+                bb_simple_perror_msg_and_die("getprevcon failed");
         seuser = strtok(context, ":");
         if (!seuser)
                 bb_error_msg_and_die("invalid context '%s'", context);
@@ -42,7 +42,7 @@ static void check_selinux_update_passwd(const char *username)
 
                 if (selinux_check_passwd_access(av) != 0)
  die:
-                        bb_error_msg_and_die("SELinux: access denied");
+                        bb_simple_error_msg_and_die("SELinux: access denied");
         }
         if (ENABLE_FEATURE_CLEAN_UP)
                 freecon(context);
@@ -270,10 +270,16 @@ int FAST_FUNC update_passwd(const char *filename,
                         if (shadow && *cp == ':') {
                                 /* /etc/shadow's field 3 (passwd change date) needs updating */
                                 /* move past old change date */
+                                unsigned time_days = (unsigned long)(time(NULL)) / (24*60*60);
+
+                                if (time_days == 0) {
+                                        /* 0 as change date has special meaning, avoid it */
+                                        time_days = 1;
+                                }
                                 cp = strchrnul(cp + 1, ':');
                                 /* "name:" + "new_passwd" + ":" + "change date" + ":rest of line" */
                                 fprintf(new_fp, "%s%s:%u%s\n", name_colon, new_passwd,
-                                        (unsigned)(time(NULL)) / (24*60*60), cp);
+                                        time_days, cp);
                         } else {
                                 /* "name:" + "new_passwd" + ":rest of line" */
                                 fprintf(new_fp, "%s%s%s\n", name_colon, new_passwd, cp);
diff --git a/libbb/uuencode.c b/libbb/uuencode.c
index f32a3da7d..d36b34f63 100644
--- a/libbb/uuencode.c
+++ b/libbb/uuencode.c
@@ -213,7 +213,7 @@ void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags)
                         if (*in_tail == '\0')
                                 return;
                         /* No */
-                        bb_error_msg_and_die("truncated base64 input");
+                        bb_simple_error_msg_and_die("truncated base64 input");
                 }
 
                 /* It was partial decode */
diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c
index 6d3459905..71512aee2 100644
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -197,4 +197,19 @@ void FAST_FUNC bb_info_msg(const char *s, ...)
         bb_vinfo_msg(s, p);
         va_end(p);
 }
+
+void FAST_FUNC bb_simple_info_msg(const char *s)
+{
+        bb_info_msg("%s", s);
+}
 #endif
+
+void FAST_FUNC bb_simple_error_msg(const char *s)
+{
+        bb_error_msg("%s", s);
+}
+
+void FAST_FUNC bb_simple_error_msg_and_die(const char *s)
+{
+        bb_error_msg_and_die("%s", s);
+}
diff --git a/libbb/warn_ignoring_args.c b/libbb/warn_ignoring_args.c
index 3f3025c03..b24546e41 100644
--- a/libbb/warn_ignoring_args.c
+++ b/libbb/warn_ignoring_args.c
@@ -12,7 +12,7 @@
 void FAST_FUNC bb_warn_ignoring_args(char *arg)
 {
         if (arg) {
-                bb_error_msg("ignoring all arguments");
+                bb_simple_error_msg("ignoring all arguments");
         }
 }
 #endif
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index a6127508b..38faef38e 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -11,6 +11,9 @@
 #include <netinet/in.h>
 #include <net/if.h>
 #include <sys/un.h>
+#if ENABLE_IFPLUGD || ENABLE_FEATURE_MDEV_DAEMON || ENABLE_UEVENT
+# include <linux/netlink.h>
+#endif
 #include "libbb.h"
 
 int FAST_FUNC setsockopt_int(int fd, int level, int optname, int optval)
@@ -63,7 +66,7 @@ int FAST_FUNC setsockopt_bindtodevice(int fd, const char *iface)
 int FAST_FUNC setsockopt_bindtodevice(int fd UNUSED_PARAM,
                 const char *iface UNUSED_PARAM)
 {
-        bb_error_msg("SO_BINDTODEVICE is not supported on this system");
+        bb_simple_error_msg("SO_BINDTODEVICE is not supported on this system");
         return -1;
 }
 #endif
@@ -108,7 +111,7 @@ void FAST_FUNC xconnect(int s, const struct sockaddr *saddr, socklen_t addrlen)
                         bb_perror_msg_and_die("%s (%s)",
                                 "can't connect to remote host",
                                 inet_ntoa(((struct sockaddr_in *)saddr)->sin_addr));
-                bb_perror_msg_and_die("can't connect to remote host");
+                bb_simple_perror_msg_and_die("can't connect to remote host");
         }
 }
 
@@ -132,6 +135,7 @@ unsigned FAST_FUNC bb_lookup_port(const char *port, const char *protocol, unsign
                         port_nr = default_port;
                         if (tserv)
                                 port_nr = ntohs(tserv->s_port);
+//FIXME: else: port string was garbage, but we don't report that???
                 }
                 errno = old_errno;
         }
@@ -418,6 +422,38 @@ int FAST_FUNC create_and_bind_dgram_or_die(const char *bindaddr, int port)
 }
 
 
+#if ENABLE_IFPLUGD || ENABLE_FEATURE_MDEV_DAEMON || ENABLE_UEVENT
+int FAST_FUNC create_and_bind_to_netlink(int proto, int grp, unsigned rcvbuf)
+{
+        struct sockaddr_nl sa;
+        int fd;
+
+        memset(&sa, 0, sizeof(sa));
+        sa.nl_family = AF_NETLINK;
+        sa.nl_pid = getpid();
+        sa.nl_groups = grp;
+        fd = xsocket(AF_NETLINK, SOCK_DGRAM, proto);
+        xbind(fd, (struct sockaddr *) &sa, sizeof(sa));
+        close_on_exec_on(fd);
+
+        if (rcvbuf != 0) {
+                // SO_RCVBUFFORCE (root only) can go above net.core.rmem_max sysctl
+                setsockopt_SOL_SOCKET_int(fd, SO_RCVBUF,      rcvbuf);
+                setsockopt_SOL_SOCKET_int(fd, SO_RCVBUFFORCE, rcvbuf);
+# if 0
+                {
+                        int z;
+                        socklen_t zl = sizeof(z);
+                        getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &z, &zl);
+                        bb_error_msg("SO_RCVBUF:%d", z);
+                }
+# endif
+        }
+
+        return fd;
+}
+#endif
+
 int FAST_FUNC create_and_connect_stream_or_die(const char *peer, int port)
 {
         int fd;
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 57bda6204..c92436683 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -430,6 +430,6 @@ int FAST_FUNC wait_for_exitstatus(pid_t pid)
 
         n = safe_waitpid(pid, &exit_status, 0);
         if (n < 0)
-                bb_perror_msg_and_die("waitpid");
+                bb_simple_perror_msg_and_die("waitpid");
         return exit_status;
 }
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index a0db2b86e..cfe062a47 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -27,7 +27,7 @@
 
 void FAST_FUNC bb_die_memory_exhausted(void)
 {
-        bb_error_msg_and_die(bb_msg_memory_exhausted);
+        bb_simple_error_msg_and_die(bb_msg_memory_exhausted);
 }
 
 #ifndef DMALLOC
@@ -40,7 +40,7 @@ void* FAST_FUNC malloc_or_warn(size_t size)
 {
         void *ptr = malloc(size);
         if (ptr == NULL && size != 0)
-                bb_error_msg(bb_msg_memory_exhausted);
+                bb_simple_error_msg(bb_msg_memory_exhausted);
         return ptr;
 }
 
@@ -97,7 +97,7 @@ char* FAST_FUNC xstrndup(const char *s, int n)
         char *t;
 
         if (ENABLE_DEBUG && s == NULL)
-                bb_error_msg_and_die("xstrndup bug");
+                bb_simple_error_msg_and_die("xstrndup bug");
 
         /* We can just xmalloc(n+1) and strncpy into it, */
         /* but think about xstrndup("abc", 10000) wastage! */
@@ -215,13 +215,13 @@ int FAST_FUNC rename_or_warn(const char *oldpath, const char *newpath)
 void FAST_FUNC xpipe(int filedes[2])
 {
         if (pipe(filedes))
-                bb_perror_msg_and_die("can't create pipe");
+                bb_simple_perror_msg_and_die("can't create pipe");
 }
 
 void FAST_FUNC xdup2(int from, int to)
 {
         if (dup2(from, to) != to)
-                bb_perror_msg_and_die("can't duplicate file descriptor");
+                bb_simple_perror_msg_and_die("can't duplicate file descriptor");
                 //              " %d to %d", from, to);
 }
 
@@ -245,7 +245,7 @@ void FAST_FUNC xwrite(int fd, const void *buf, size_t count)
                          * or some writes succeeded, then we hit an error.
                          * In either case, errno is set.
                          */
-                        bb_perror_msg_and_die(
+                        bb_simple_perror_msg_and_die(
                                 size >= 0 ? "short write" : "write error"
                         );
                 }
@@ -259,7 +259,7 @@ void FAST_FUNC xwrite_str(int fd, const char *str)
 void FAST_FUNC xclose(int fd)
 {
         if (close(fd))
-                bb_perror_msg_and_die("close failed");
+                bb_simple_perror_msg_and_die("close failed");
 }
 
 // Die with an error message if we can't lseek to the right spot.
@@ -267,9 +267,7 @@ off_t FAST_FUNC xlseek(int fd, off_t offset, int whence)
 {
         off_t off = lseek(fd, offset, whence);
         if (off == (off_t)-1) {
-                if (whence == SEEK_SET)
-                        bb_perror_msg_and_die("lseek(%"OFF_FMT"u)", offset);
-                bb_perror_msg_and_die("lseek");
+                bb_perror_msg_and_die("lseek(%"OFF_FMT"u, %d)", offset, whence);
         }
         return off;
 }
@@ -384,23 +382,23 @@ void FAST_FUNC bb_unsetenv_and_free(char *var)
 // setgid() will fail and we'll _still_be_root_, which is bad.)
 void FAST_FUNC xsetgid(gid_t gid)
 {
-        if (setgid(gid)) bb_perror_msg_and_die("setgid");
+        if (setgid(gid)) bb_simple_perror_msg_and_die("setgid");
 }
 
 // Die with an error message if we can't set uid.  (See xsetgid() for why.)
 void FAST_FUNC xsetuid(uid_t uid)
 {
-        if (setuid(uid)) bb_perror_msg_and_die("setuid");
+        if (setuid(uid)) bb_simple_perror_msg_and_die("setuid");
 }
 
 void FAST_FUNC xsetegid(gid_t egid)
 {
-        if (setegid(egid)) bb_perror_msg_and_die("setegid");
+        if (setegid(egid)) bb_simple_perror_msg_and_die("setegid");
 }
 
 void FAST_FUNC xseteuid(uid_t euid)
 {
-        if (seteuid(euid)) bb_perror_msg_and_die("seteuid");
+        if (seteuid(euid)) bb_simple_perror_msg_and_die("seteuid");
 }
 
 // Die if we can't chdir to a new path.
@@ -413,7 +411,7 @@ void FAST_FUNC xchdir(const char *path)
 void FAST_FUNC xfchdir(int fd)
 {
         if (fchdir(fd))
-                bb_perror_msg_and_die("fchdir");
+                bb_simple_perror_msg_and_die("fchdir");
 }
 
 void FAST_FUNC xchroot(const char *path)
@@ -463,7 +461,7 @@ int FAST_FUNC xsocket(int domain, int type, int protocol)
 IF_FEATURE_IPV6(if (domain == AF_INET6) s = "INET6";)
                 bb_perror_msg_and_die("socket(AF_%s,%d,%d)", s, type, protocol);
 #else
-                bb_perror_msg_and_die("socket");
+                bb_simple_perror_msg_and_die("socket");
 #endif
         }
 
@@ -473,13 +471,13 @@ IF_FEATURE_IPV6(if (domain == AF_INET6) s = "INET6";)
 // Die with an error message if we can't bind a socket to an address.
 void FAST_FUNC xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen)
 {
-        if (bind(sockfd, my_addr, addrlen)) bb_perror_msg_and_die("bind");
+        if (bind(sockfd, my_addr, addrlen)) bb_simple_perror_msg_and_die("bind");
 }
 
 // Die with an error message if we can't listen for connections on a socket.
 void FAST_FUNC xlisten(int s, int backlog)
 {
-        if (listen(s, backlog)) bb_perror_msg_and_die("listen");
+        if (listen(s, backlog)) bb_simple_perror_msg_and_die("listen");
 }
 
 /* Die with an error message if sendto failed.
@@ -491,7 +489,7 @@ ssize_t FAST_FUNC xsendto(int s, const void *buf, size_t len, const struct socka
         if (ret < 0) {
                 if (ENABLE_FEATURE_CLEAN_UP)
                         close(s);
-                bb_perror_msg_and_die("sendto");
+                bb_simple_perror_msg_and_die("sendto");
         }
         return ret;
 }
@@ -520,12 +518,12 @@ void FAST_FUNC selinux_or_die(void)
 #if ENABLE_SELINUX
         int rc = is_selinux_enabled();
         if (rc == 0) {
-                bb_error_msg_and_die("SELinux is disabled");
+                bb_simple_error_msg_and_die("SELinux is disabled");
         } else if (rc < 0) {
-                bb_error_msg_and_die("is_selinux_enabled() failed");
+                bb_simple_error_msg_and_die("is_selinux_enabled() failed");
         }
 #else
-        bb_error_msg_and_die("SELinux support is disabled");
+        bb_simple_error_msg_and_die("SELinux support is disabled");
 #endif
 }
 
@@ -676,7 +674,7 @@ pid_t FAST_FUNC xfork(void)
         pid_t pid;
         pid = fork();
         if (pid < 0) /* wtf? */
-                bb_perror_msg_and_die("vfork"+1);
+                bb_simple_perror_msg_and_die("vfork"+1);
         return pid;
 }
 #endif
diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c
index 7f9088bda..f4e768982 100644
--- a/libbb/xgetcwd.c
+++ b/libbb/xgetcwd.c
@@ -33,7 +33,7 @@ xrealloc_getcwd_or_warn(char *cwd)
                         if (errno == ERANGE)
                                 continue;
                         free(cwd);
-                        bb_perror_msg("getcwd");
+                        bb_simple_perror_msg("getcwd");
                         return NULL;
                 }
                 cwd = xrealloc(cwd, strlen(cwd) + 1);
diff --git a/libbb/xgethostbyname.c b/libbb/xgethostbyname.c
index 89d0329cc..9446daba7 100644
--- a/libbb/xgethostbyname.c
+++ b/libbb/xgethostbyname.c
@@ -12,6 +12,6 @@ struct hostent* FAST_FUNC xgethostbyname(const char *name)
 {
         struct hostent *retval = gethostbyname(name);
         if (!retval)
-                bb_herror_msg_and_die("%s", name);
+                bb_simple_herror_msg_and_die(name);
         return retval;
 }
diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index 9ae70de99..ca53e12d3 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -147,6 +147,35 @@ char* FAST_FUNC xmalloc_realpath_coreutils(const char *path)
                                 buf[len++] = '/';
                                 strcpy(buf + len, last_slash);
                         }
+                } else {
+                        char *target = xmalloc_readlink(path);
+                        if (target) {
+                                char *cwd;
+                                if (target[0] == '/') {
+                                        /*
+                                         * $ ln -s /bin/qwe symlink  # note: /bin is a link to /usr/bin
+                                         * $ readlink -f symlink
+                                         * /usr/bin/qwe/target_does_not_exist
+                                         * $ realpath symlink
+                                         * /usr/bin/qwe/target_does_not_exist
+                                         */
+                                        buf = xmalloc_realpath_coreutils(target);
+                                        free(target);
+                                        return buf;
+                                }
+                                /*
+                                 * $ ln -s target_does_not_exist symlink
+                                 * $ readlink -f symlink
+                                 * /CURDIR/target_does_not_exist
+                                 * $ realpath symlink
+                                 * /CURDIR/target_does_not_exist
+                                 */
+                                cwd = xrealloc_getcwd_or_warn(NULL);
+                                buf = concat_path_file(cwd, target);
+                                free(cwd);
+                                free(target);
+                                return buf;
+                        }
                 }
         }