udhcpc: fix a problem with binary-encoded options #2

[oweals/busybox.git] / libbb / xfuncs_printf.c

diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index ba660a2dbf2497df04316f121716313035d2db44..05aa07ce80151077676aa072073f81fffc3dd4f9 100644 (file)
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -240,6 +240,14 @@ off_t FAST_FUNC xlseek(int fd, off_t offset, int whence)
        return off;
 }
 
+int FAST_FUNC xmkstemp(char *template)
+{
+       int fd = mkstemp(template);
+       if (fd < 0)
+               bb_perror_msg_and_die("can't create temp file '%s'", template);
+       return fd;
+}
+
 // Die with supplied filename if this FILE* has ferror set.
 void FAST_FUNC die_if_ferror(FILE *fp, const char *fn)
 {
@@ -347,13 +355,14 @@ void FAST_FUNC xsetuid(uid_t uid)
 void FAST_FUNC xchdir(const char *path)
 {
        if (chdir(path))
-               bb_perror_msg_and_die("chdir(%s)", path);
+               bb_perror_msg_and_die("can't change directory to '%s'", path);
 }
 
 void FAST_FUNC xchroot(const char *path)
 {
        if (chroot(path))
-               bb_perror_msg_and_die("can't change root directory to %s", 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.