12 files changed, 105 insertions, 205 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 0c675db4d..116e275be 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -632,7 +632,10 @@ static int busybox_main(char **argv)
                        "See source distribution for full notice.\n"
                        "\n"
                        "Usage: busybox [function] [arguments]...\n"
-                        "   or: busybox --list[-full]\n"
+                        "   or: busybox --list"IF_FEATURE_INSTALLER("[-full]")"\n"
+                        IF_FEATURE_INSTALLER(
+                        "   or: busybox --install [-s] [DIR]\n"
+                        )
                        "   or: function [arguments]...\n"
                        "\n"
                        "\tBusyBox is a multi-call binary that combines many common Unix\n"
@@ -672,7 +675,7 @@ static int busybox_main(char **argv)
                dup2(1, 2);
                while (*a) {
 # if ENABLE_FEATURE_INSTALLER
-                        if (argv[1][6]) /* --list-path? */
+                        if (argv[1][6]) /* --list-full? */
                                full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
 # endif
                        full_write2_str(a);
@@ -702,7 +705,7 @@ static int busybox_main(char **argv)
                 * -s: make symlinks
                 * DIR: directory to install links to
                 */
-                use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && argv++);
+                use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && ++argv);
                install_links(busybox, use_symbolic_links, argv[2]);
                return 0;
        }
diff --git a/libbb/bb_strtonum.c b/libbb/bb_strtonum.c
index c66c774f4..949f26bee 100644
--- a/libbb/bb_strtonum.c
+++ b/libbb/bb_strtonum.c
@@ -36,14 +36,14 @@ static unsigned long long ret_ERANGE(void)
        return ULLONG_MAX;
 }
-static unsigned long long handle_errors(unsigned long long v, char **endp, char *endptr)
+static unsigned long long handle_errors(unsigned long long v, char **endp)
 {
-        if (endp) *endp = endptr;
+        char next_ch = **endp;
        /* errno is already set to ERANGE by strtoXXX if value overflowed */
-        if (endptr[0]) {
+        if (next_ch) {
                /* "1234abcg" or out-of-range? */
-                if (isalnum(endptr[0]) || errno)
+                if (isalnum(next_ch) || errno)
                        return ret_ERANGE();
                /* good number, just suspicious terminator */
                errno = EINVAL;
@@ -57,30 +57,37 @@ unsigned long long FAST_FUNC bb_strtoull(const char *arg, char **endp, int base)
        unsigned long long v;
        char *endptr;
+        if (!endp) endp = &endptr;
+        *endp = (char*) arg;
        /* strtoul("  -4200000000") returns 94967296, errno 0 (!) */
        /* I don't think that this is right. Preventing this... */
        if (!isalnum(arg[0])) return ret_ERANGE();
        /* not 100% correct for lib func, but convenient for the caller */
        errno = 0;
-        v = strtoull(arg, &endptr, base);
+        v = strtoull(arg, endp, base);
-        return handle_errors(v, endp, endptr);
+        return handle_errors(v, endp);
 }
 long long FAST_FUNC bb_strtoll(const char *arg, char **endp, int base)
 {
        unsigned long long v;
        char *endptr;
+        char first;
+        if (!endp) endp = &endptr;
+        *endp = (char*) arg;
        /* Check for the weird "feature":
         * a "-" string is apparently a valid "number" for strto[u]l[l]!
         * It returns zero and errno is 0! :( */
-        char first = (arg[0] != '-' ? arg[0] : arg[1]);
+        first = (arg[0] != '-' ? arg[0] : arg[1]);
        if (!isalnum(first)) return ret_ERANGE();
        errno = 0;
-        v = strtoll(arg, &endptr, base);
+        v = strtoll(arg, endp, base);
-        return handle_errors(v, endp, endptr);
+        return handle_errors(v, endp);
 }
 #if ULONG_MAX != ULLONG_MAX
@@ -89,23 +96,30 @@ unsigned long FAST_FUNC bb_strtoul(const char *arg, char **endp, int base)
        unsigned long v;
        char *endptr;
+        if (!endp) endp = &endptr;
+        *endp = (char*) arg;
        if (!isalnum(arg[0])) return ret_ERANGE();
        errno = 0;
-        v = strtoul(arg, &endptr, base);
+        v = strtoul(arg, endp, base);
-        return handle_errors(v, endp, endptr);
+        return handle_errors(v, endp);
 }
 long FAST_FUNC bb_strtol(const char *arg, char **endp, int base)
 {
        long v;
        char *endptr;
+        char first;
-        char first = (arg[0] != '-' ? arg[0] : arg[1]);
+        if (!endp) endp = &endptr;
+        *endp = (char*) arg;
+        first = (arg[0] != '-' ? arg[0] : arg[1]);
        if (!isalnum(first)) return ret_ERANGE();
        errno = 0;
-        v = strtol(arg, &endptr, base);
+        v = strtol(arg, endp, base);
-        return handle_errors(v, endp, endptr);
+        return handle_errors(v, endp);
 }
 #endif
@@ -115,25 +129,32 @@ unsigned FAST_FUNC bb_strtou(const char *arg, char **endp, int base)
        unsigned long v;
        char *endptr;
+        if (!endp) endp = &endptr;
+        *endp = (char*) arg;
        if (!isalnum(arg[0])) return ret_ERANGE();
        errno = 0;
-        v = strtoul(arg, &endptr, base);
+        v = strtoul(arg, endp, base);
        if (v > UINT_MAX) return ret_ERANGE();
-        return handle_errors(v, endp, endptr);
+        return handle_errors(v, endp);
 }
 int FAST_FUNC bb_strtoi(const char *arg, char **endp, int base)
 {
        long v;
        char *endptr;
+        char first;
+        if (!endp) endp = &endptr;
+        *endp = (char*) arg;
-        char first = (arg[0] != '-' ? arg[0] : arg[1]);
+        first = (arg[0] != '-' ? arg[0] : arg[1]);
        if (!isalnum(first)) return ret_ERANGE();
        errno = 0;
-        v = strtol(arg, &endptr, base);
+        v = strtol(arg, endp, base);
        if (v > INT_MAX) return ret_ERANGE();
        if (v < INT_MIN) return ret_ERANGE();
-        return handle_errors(v, endp, endptr);
+        return handle_errors(v, endp);
 }
 #endif
diff --git a/libbb/dump.c b/libbb/dump.c
index 919fe135c..7e435643b 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -71,7 +71,8 @@ static NOINLINE int bb_dump_size(FS *fs)
                         * skip any special chars -- save precision in
                         * case it's a %s format.
                         */
-                        while (strchr(index_str + 1, *++fmt));
+                        while (strchr(index_str + 1, *++fmt))
+                                continue;
                        if (*fmt == '.' && isdigit(*++fmt)) {
                                prec = atoi(fmt);
                                while (isdigit(*++fmt))
@@ -99,8 +100,8 @@ static NOINLINE int bb_dump_size(FS *fs)
 static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs)
 {
        enum { NOTOKAY, USEBCNT, USEPREC } sokay;
-        PR *pr;
        FU *fu;
+        PR *pr;
        char *p1, *p2, *p3;
        char savech, *fmtp;
        const char *byte_count_str;
@@ -292,16 +293,18 @@ static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs)
         * interprets any data at all, and has no iteration count,
         * repeat it as necessary.
         *
-         * if, rep count is greater than 1, no trailing whitespace
+         * if rep count is greater than 1, no trailing whitespace
         * gets output from the last iteration of the format unit.
         */
        for (fu = fs->nextfu; fu; fu = fu->nextfu) {
-                if (!fu->nextfu && fs->bcnt < dumper->blocksize
+                if (!fu->nextfu
-                 && !(fu->flags & F_SETREP) && fu->bcnt
+                 && fs->bcnt < dumper->blocksize
+                 && !(fu->flags & F_SETREP)
+                 && fu->bcnt
                ) {
                        fu->reps += (dumper->blocksize - fs->bcnt) / fu->bcnt;
                }
-                if (fu->reps > 1) {
+                if (fu->reps > 1 && fu->nextpr) {
                        for (pr = fu->nextpr;; pr = pr->nextpr)
                                if (!pr->nextpr)
                                        break;
@@ -721,7 +724,7 @@ void FAST_FUNC bb_dump_add(dumper_t* pub_dumper, const char *fmt)
        p = fmt;
        for (;;) {
                p = skip_whitespace(p);
-                if (!*p) {
+                if (*p == '\0') {
                        break;
                }
@@ -749,7 +752,7 @@ void FAST_FUNC bb_dump_add(dumper_t* pub_dumper, const char *fmt)
                /* skip slash and trailing white space */
                if (*p == '/') {
-                        p = skip_whitespace(++p);
+                        p = skip_whitespace(p + 1);
                }
                /* byte count */
@@ -763,7 +766,7 @@ void FAST_FUNC bb_dump_add(dumper_t* pub_dumper, const char *fmt)
                        }
                        tfu->bcnt = atoi(savep);
                        /* skip trailing white space */
-                        p = skip_whitespace(++p);
+                        p = skip_whitespace(p + 1);
                }
                /* format */
@@ -771,7 +774,7 @@ void FAST_FUNC bb_dump_add(dumper_t* pub_dumper, const char *fmt)
                        bb_error_msg_and_die("bad format {%s}", fmt);
                }
                for (savep = ++p; *p != '"';) {
-                        if (*p++ == 0) {
+                        if (*p++ == '\0') {
                                bb_error_msg_and_die("bad format {%s}", fmt);
                        }
                }
@@ -782,7 +785,7 @@ void FAST_FUNC bb_dump_add(dumper_t* pub_dumper, const char *fmt)
                /* alphabetic escape sequences have to be done in place */
                for (p2 = p1;; ++p1, ++p2) {
-                        if (!*p1) {
+                        if (*p1 == '\0') {
                                *p2 = *p1;
                                break;
                        }
diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c
index 56637ad92..9676b5f52 100644
--- a/libbb/find_mount_point.c
+++ b/libbb/find_mount_point.c
@@ -30,7 +30,8 @@ struct mntent* FAST_FUNC find_mount_point(const char *name, int subdir_too)
        devno_of_name = s.st_dev;
        block_dev = 0;
-        if (S_ISBLK(s.st_mode)) {
+        /* Why S_ISCHR? - UBI volumes use char devices, not block */
+        if (S_ISBLK(s.st_mode) || S_ISCHR(s.st_mode)) {
                devno_of_name = s.st_rdev;
                block_dev = 1;
        }
diff --git a/libbb/isdirectory.c b/libbb/isdirectory.c
index 9861be6f8..ba6c52ce8 100644
--- a/libbb/isdirectory.c
+++ b/libbb/isdirectory.c
@@ -15,22 +15,17 @@
 * Return TRUE if fileName is a directory.
 * Nonexistent files return FALSE.
 */
-int FAST_FUNC is_directory(const char *fileName, int followLinks, struct stat *statBuf)
+int FAST_FUNC is_directory(const char *fileName, int followLinks)
 {
        int status;
-        struct stat astatBuf;
+        struct stat statBuf;
-        if (statBuf == NULL) {
-                /* use auto stack buffer */
-                statBuf = &astatBuf;
-        }
        if (followLinks)
-                status = stat(fileName, statBuf);
+                status = stat(fileName, &statBuf);
        else
-                status = lstat(fileName, statBuf);
+                status = lstat(fileName, &statBuf);
-        status = (status == 0 && S_ISDIR(statBuf->st_mode));
+        status = (status == 0 && S_ISDIR(statBuf.st_mode));
        return status;
 }
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index c89c829ed..78244c395 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2221,14 +2221,17 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
 #define command command_must_not_be_used
        new_settings = initial_settings;
-        new_settings.c_lflag &= ~ICANON;        /* unbuffered input */
+        /* ~ICANON: unbuffered input (most c_cc[] are disabled, VMIN/VTIME are enabled) */
-        /* Turn off echoing and CTRL-C, so we can trap it */
+        /* ~ECHO, ~ECHONL: turn off echoing, including newline echoing */
-        new_settings.c_lflag &= ~(ECHO | ECHONL | ISIG);
+        /* ~ISIG: turn off INTR (ctrl-C), QUIT, SUSP */
-        /* Hmm, in linux c_cc[] is not parsed if ICANON is off */
+        new_settings.c_lflag &= ~(ICANON | ECHO | ECHONL | ISIG);
+        /* reads would block only if < 1 char is available */
        new_settings.c_cc[VMIN] = 1;
+        /* no timeout (reads block forever) */
        new_settings.c_cc[VTIME] = 0;
-        /* Turn off CTRL-C, so we can trap it */
+        /* Should be not needed if ISIG is off: */
-        new_settings.c_cc[VINTR] = _POSIX_VDISABLE;
+        /* Turn off CTRL-C */
+        /* new_settings.c_cc[VINTR] = _POSIX_VDISABLE; */
        tcsetattr_stdin_TCSANOW(&new_settings);
 #if ENABLE_USERNAME_OR_HOMEDIR
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index cf5ba4deb..1590d9a4c 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -204,7 +204,7 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const
                        line += strcspn(line, delims[0] ? delims : delims + 1);
                } else {
                        /* Combining, find comment char if any */
-                        line = strchrnul(line, delims[0]);
+                        line = strchrnul(line, PARSE_EOL_COMMENTS ? delims[0] : '\0');
                        /* Trim any extra delimiters from the end */
                        if (flags & PARSE_TRIM) {
diff --git a/libbb/procps.c b/libbb/procps.c
index 39ddd2c12..dbae46e33 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -128,10 +128,11 @@ static unsigned long fast_strtoul_16(char **endptr)
        char *str = *endptr;
        unsigned long n = 0;
-        while ((c = *str++) != ' ') {
+        /* Need to stop on both ' ' and '\n' */
+        while ((c = *str++) > ' ') {
                c = ((c|0x20) - '0');
                if (c > 9)
-                        // c = c + '0' - 'a' + 10:
+                        /* c = c + '0' - 'a' + 10: */
                        c = c - ('a' - '0' - 10);
                n = n*16 + c;
        }
@@ -144,11 +145,12 @@ static unsigned long fast_strtoul_16(char **endptr)
 /* We cut a lot of corners here for speed */
 static unsigned long fast_strtoul_10(char **endptr)
 {
-        char c;
+        unsigned char c;
        char *str = *endptr;
        unsigned long n = *str - '0';
-        while ((c = *++str) != ' ')
+        /* Need to stop on both ' ' and '\n' */
+        while ((c = *++str) > ' ')
                n = n*10 + (c - '0');
        *endptr = str + 1; /* We skip trailing space! */
@@ -199,7 +201,7 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
        memset(&currec, 0, sizeof(currec));
        while (fgets(buf, PROCPS_BUFSIZE, file)) {
                // Each mapping datum has this form:
-                // f7d29000-f7d39000 rw-s ADR M:m OFS FILE
+                // f7d29000-f7d39000 rw-s FILEOFS M:m INODE FILENAME
                // Size:                nnn kB
                // Rss:                 nnn kB
                // .....
@@ -224,7 +226,7 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
                tp = strchr(buf, '-');
                if (tp) {
                        // We reached next mapping - the line of this form:
-                        // f7d29000-f7d39000 rw-s ADR M:m OFS FILE
+                        // f7d29000-f7d39000 rw-s FILEOFS M:m INODE FILENAME
                        if (cb) {
                                /* If we have a previous record, there's nothing more
@@ -243,7 +245,7 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
                        strncpy(currec.smap_mode, tp, sizeof(currec.smap_mode)-1);
-                        // skipping "rw-s ADR M:m OFS "
+                        // skipping "rw-s FILEOFS M:m INODE "
                        tp = skip_whitespace(skip_fields(tp, 4));
                        // filter out /dev/something (something != zero)
                        if (strncmp(tp, "/dev/", 5) != 0 || strcmp(tp, "/dev/zero\n") == 0) {
diff --git a/libbb/read_printf.c b/libbb/read_printf.c
index 0bbf7802a..5ed6e3632 100644
--- a/libbb/read_printf.c
+++ b/libbb/read_printf.c
@@ -8,16 +8,6 @@
 */
 #include "libbb.h"
-#define ZIPPED (ENABLE_FEATURE_SEAMLESS_LZMA \
-        || ENABLE_FEATURE_SEAMLESS_BZ2 \
-        || ENABLE_FEATURE_SEAMLESS_GZ \
-        /* || ENABLE_FEATURE_SEAMLESS_Z */ \
-)
-#if ZIPPED
-# include "bb_archive.h"
-#endif
 /* Suppose that you are a shell. You start child processes.
 * They work and eventually exit. You want to get user input.
@@ -244,132 +234,3 @@ void* FAST_FUNC xmalloc_xopen_read_close(const char *filename, size_t *maxsz_p)
                bb_perror_msg_and_die("can't read '%s'", filename);
        return buf;
 }
-/* Used by e.g. rpm which gives us a fd without filename,
- * thus we can't guess the format from filename's extension.
- */
-#if ZIPPED
-void FAST_FUNC setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/)
-{
-        const int fail_if_not_detected = 1;
-        union {
-                uint8_t b[4];
-                uint16_t b16[2];
-                uint32_t b32[1];
-        } magic;
-        int offset = -2;
-# if BB_MMU
-        IF_DESKTOP(long long) int FAST_FUNC (*xformer)(int src_fd, int dst_fd);
-        enum { xformer_prog = 0 };
-# else
-        enum { xformer = 0 };
-        const char *xformer_prog;
-# endif
-        /* .gz and .bz2 both have 2-byte signature, and their
-         * unpack_XXX_stream wants this header skipped. */
-        xread(fd, magic.b16, sizeof(magic.b16[0]));
-        if (ENABLE_FEATURE_SEAMLESS_GZ
-         && magic.b16[0] == GZIP_MAGIC
-        ) {
-# if BB_MMU
-                xformer = unpack_gz_stream;
-# else
-                xformer_prog = "gunzip";
-# endif
-                goto found_magic;
-        }
-        if (ENABLE_FEATURE_SEAMLESS_BZ2
-         && magic.b16[0] == BZIP2_MAGIC
-        ) {
-# if BB_MMU
-                xformer = unpack_bz2_stream;
-# else
-                xformer_prog = "bunzip2";
-# endif
-                goto found_magic;
-        }
-        if (ENABLE_FEATURE_SEAMLESS_XZ
-         && magic.b16[0] == XZ_MAGIC1
-        ) {
-                offset = -6;
-                xread(fd, magic.b32, sizeof(magic.b32[0]));
-                if (magic.b32[0] == XZ_MAGIC2) {
-# if BB_MMU
-                        xformer = unpack_xz_stream;
-                        /* unpack_xz_stream wants fd at position 6, no need to seek */
-                        //xlseek(fd, offset, SEEK_CUR);
-# else
-                        xformer_prog = "unxz";
-# endif
-                        goto found_magic;
-                }
-        }
-        /* No known magic seen */
-        if (fail_if_not_detected)
-                bb_error_msg_and_die("no gzip"
-                        IF_FEATURE_SEAMLESS_BZ2("/bzip2")
-                        IF_FEATURE_SEAMLESS_XZ("/xz")
-                        " magic");
-        xlseek(fd, offset, SEEK_CUR);
-        return;
- found_magic:
-# if !BB_MMU
-        /* NOMMU version of open_transformer execs
-         * an external unzipper that wants
-         * file position at the start of the file */
-        xlseek(fd, offset, SEEK_CUR);
-# endif
-        open_transformer(fd, xformer, xformer_prog);
-}
-#endif /* ZIPPED */
-int FAST_FUNC open_zipped(const char *fname)
-{
-#if !ZIPPED
-        return open(fname, O_RDONLY);
-#else
-        char *sfx;
-        int fd;
-        fd = open(fname, O_RDONLY);
-        if (fd < 0)
-                return fd;
-        sfx = strrchr(fname, '.');
-        if (sfx) {
-                sfx++;
-                if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, "lzma") == 0)
-                        /* .lzma has no header/signature, just trust it */
-                        open_transformer(fd, unpack_lzma_stream, "unlzma");
-                else
-                if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0)
-                 || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0)
-                 || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0)
-                ) {
-                        setup_unzip_on_fd(fd /*, fail_if_not_detected: 1*/);
-                }
-        }
-        return fd;
-#endif
-}
-void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p)
-{
-        int fd;
-        char *image;
-        fd = open_zipped(fname);
-        if (fd < 0)
-                return NULL;
-        image = xmalloc_read(fd, maxsz_p);
-        if (!image)
-                bb_perror_msg("read error from '%s'", fname);
-        close(fd);
-        return image;
-}
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 5d8056bd6..6611dabfa 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -256,11 +256,19 @@ void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
        if (!(flags & DAEMON_ONLY_SANITIZE)) {
                if (fork_or_rexec(argv))
                        exit(EXIT_SUCCESS); /* parent */
-                /* if daemonizing, make sure we detach from stdio & ctty */
+                /* if daemonizing, detach from stdio & ctty */
                setsid();
                dup2(fd, 0);
                dup2(fd, 1);
                dup2(fd, 2);
+                if (flags & DAEMON_DOUBLE_FORK) {
+                        /* On Linux, session leader can acquire ctty
+                         * unknowingly, by opening a tty.
+                         * Prevent this: stop being a session leader.
+                         */
+                        if (fork_or_rexec(argv))
+                                exit(EXIT_SUCCESS); /* parent */
+                }
        }
        while (fd > 2) {
                close(fd--);
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 4b7c110d3..1c8bb2b73 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -322,26 +322,28 @@ len_and_sockaddr* FAST_FUNC xdotted2sockaddr(const char *host, int port)
        return str2sockaddr(host, port, AF_UNSPEC, AI_NUMERICHOST | DIE_ON_ERROR);
 }
-#undef xsocket_type
+int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, int family, int sock_type)
-int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, IF_FEATURE_IPV6(int family,) int sock_type)
 {
-        IF_NOT_FEATURE_IPV6(enum { family = AF_INET };)
        len_and_sockaddr *lsa;
        int fd;
        int len;
-#if ENABLE_FEATURE_IPV6
        if (family == AF_UNSPEC) {
+#if ENABLE_FEATURE_IPV6
                fd = socket(AF_INET6, sock_type, 0);
                if (fd >= 0) {
                        family = AF_INET6;
                        goto done;
                }
+#endif
                family = AF_INET;
        }
-#endif
        fd = xsocket(family, sock_type, 0);
        len = sizeof(struct sockaddr_in);
+        if (family == AF_UNIX)
+                len = sizeof(struct sockaddr_un);
 #if ENABLE_FEATURE_IPV6
        if (family == AF_INET6) {
 done:
@@ -357,7 +359,7 @@ int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, IF_FEATURE_IPV6(int family,)
 int FAST_FUNC xsocket_stream(len_and_sockaddr **lsap)
 {
-        return xsocket_type(lsap, IF_FEATURE_IPV6(AF_UNSPEC,) SOCK_STREAM);
+        return xsocket_type(lsap, AF_UNSPEC, SOCK_STREAM);
 }
 static int create_and_bind_or_die(const char *bindaddr, int port, int sock_type)
@@ -370,7 +372,7 @@ static int create_and_bind_or_die(const char *bindaddr, int port, int sock_type)
                /* user specified bind addr dictates family */
                fd = xsocket(lsa->u.sa.sa_family, sock_type, 0);
        } else {
-                fd = xsocket_type(&lsa, IF_FEATURE_IPV6(AF_UNSPEC,) sock_type);
+                fd = xsocket_type(&lsa, AF_UNSPEC, sock_type);
                set_nport(&lsa->u.sa, htons(port));
        }
        setsockopt_reuseaddr(fd);
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 8a6d7e1d1..70d3fc96c 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -376,6 +376,7 @@ void FAST_FUNC xchroot(const char *path)
 {
        if (chroot(path))
                bb_perror_msg_and_die("can't change root directory to %s", path);
+        xchdir("/");
 }
 // Print a warning message if opendir() fails, but don't die.