Merge branch 'busybox' into merge

13 files changed, 216 insertions, 126 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index ad81ce46b..db79ff62b 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -27,8 +27,6 @@ lib-y += concat_subpath_file.o
 lib-y += copy_file.o
 lib-y += copyfd.o
 lib-y += crc32.o
-lib-y += create_icmp6_socket.o
-lib-y += create_icmp_socket.o
 lib-y += default_error_retval.o
 lib-y += device_open.o
 lib-y += dump.o
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index f0df4e080..44161a219 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -29,7 +29,7 @@
 #include "busybox.h"
 
 #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
-        || defined(__APPLE__) \
+    || defined(__APPLE__) \
     )
 # include <malloc.h> /* for mallopt */
 #endif
diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index fe2b50677..77c1bcd95 100644
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -65,7 +65,9 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
         i = 0;
         while (1) {
                 int r = read(fd, &ret[i], 1);
-                if (r < 0) {
+                if ((i == 0 && r == 0) /* EOF (^D) with no password */
+                 || r < 0
+                ) {
                         /* read is interrupted by timeout or ^C */
                         ret = NULL;
                         break;
diff --git a/libbb/create_icmp6_socket.c b/libbb/create_icmp6_socket.c
deleted file mode 100644
index 368c69028..000000000
--- a/libbb/create_icmp6_socket.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * create raw socket for icmp (IPv6 version) protocol
- * and drop root privileges if running setuid
- *
- * Licensed under GPLv2, see file LICENSE in this source tree.
- */
-
-#include "libbb.h"
-
-#if ENABLE_FEATURE_IPV6
-int FAST_FUNC create_icmp6_socket(void)
-{
-        int sock;
-#if 0
-        struct protoent *proto;
-        proto = getprotobyname("ipv6-icmp");
-        /* if getprotobyname failed, just silently force
-         * proto->p_proto to have the correct value for "ipv6-icmp" */
-        sock = socket(AF_INET6, SOCK_RAW,
-                        (proto ? proto->p_proto : IPPROTO_ICMPV6));
-#else
-        sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
-#endif
-        if (sock < 0) {
-                if (errno == EPERM)
-                        bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-                bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
-        }
-
-        /* drop root privs if running setuid */
-        xsetuid(getuid());
-
-        return sock;
-}
-#endif
diff --git a/libbb/create_icmp_socket.c b/libbb/create_icmp_socket.c
deleted file mode 100644
index 585626983..000000000
--- a/libbb/create_icmp_socket.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * create raw socket for icmp protocol
- * and drop root privileges if running setuid
- *
- * Licensed under GPLv2, see file LICENSE in this source tree.
- */
-
-#include "libbb.h"
-
-int FAST_FUNC create_icmp_socket(void)
-{
-        int sock;
-#if 0
-        struct protoent *proto;
-        proto = getprotobyname("icmp");
-        /* if getprotobyname failed, just silently force
-         * proto->p_proto to have the correct value for "icmp" */
-        sock = socket(AF_INET, SOCK_RAW,
-                        (proto ? proto->p_proto : 1)); /* 1 == ICMP */
-#else
-        sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */
-#endif
-        if (sock < 0) {
-                if (errno == EPERM)
-                        bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-                bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
-        }
-
-        /* drop root privs if running setuid */
-        xsetuid(getuid());
-
-        return sock;
-}
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index b4d955e5a..3f743ac75 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -84,7 +84,7 @@ static void FAST_FUNC common64_end(md5_ctx_t *ctx, int swap_needed)
                         if (swap_needed)
                                 t = bb_bswap_64(t);
                         /* wbuffer is suitably aligned for this */
-                        *(uint64_t *) (&ctx->wbuffer[64 - 8]) = t;
+                        *(bb__aliased_uint64_t *) (&ctx->wbuffer[64 - 8]) = t;
                 }
                 ctx->process_block(ctx);
                 if (remaining >= 8)
@@ -883,10 +883,10 @@ void FAST_FUNC sha512_end(sha512_ctx_t *ctx, void *resbuf)
                         uint64_t t;
                         t = ctx->total64[0] << 3;
                         t = SWAP_BE64(t);
-                        *(uint64_t *) (&ctx->wbuffer[128 - 8]) = t;
+                        *(bb__aliased_uint64_t *) (&ctx->wbuffer[128 - 8]) = t;
                         t = (ctx->total64[1] << 3) | (ctx->total64[0] >> 61);
                         t = SWAP_BE64(t);
-                        *(uint64_t *) (&ctx->wbuffer[128 - 16]) = t;
+                        *(bb__aliased_uint64_t *) (&ctx->wbuffer[128 - 16]) = t;
                 }
                 sha512_process_block128(ctx);
                 if (remaining >= 16)
diff --git a/libbb/in_ether.c b/libbb/in_ether.c
new file mode 100644
index 000000000..dadadbafe
--- /dev/null
+++ b/libbb/in_ether.c
@@ -0,0 +1,58 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ */
+
+//kbuild:lib-$(CONFIG_IFCONFIG) += in_ether.o
+//kbuild:lib-$(CONFIG_IFENSLAVE) += in_ether.o
+
+#include "libbb.h"
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+
+/* Convert Ethernet address from "XX[:]XX[:]XX[:]XX[:]XX[:]XX" to sockaddr.
+ * Return nonzero on error.
+ */
+int FAST_FUNC in_ether(const char *bufp, struct sockaddr *sap)
+{
+        char *ptr;
+        int i, j;
+        unsigned char val;
+        unsigned char c;
+
+        sap->sa_family = ARPHRD_ETHER;
+        ptr = (char *) sap->sa_data;
+
+        i = ETH_ALEN;
+        goto first;
+        do {
+                /* We might get a semicolon here */
+                if (*bufp == ':')
+                        bufp++;
+ first:
+                j = val = 0;
+                do {
+                        c = *bufp;
+                        if (((unsigned char)(c - '0')) <= 9) {
+                                c -= '0';
+                        } else if ((unsigned char)((c|0x20) - 'a') <= 5) {
+                                c = (unsigned char)((c|0x20) - 'a') + 10;
+                        } else {
+                                if (j && (c == ':' || c == '\0'))
+                                        /* One-digit byte: __:X:__ */
+                                        break;
+                                return -1;
+                        }
+                        ++bufp;
+                        val <<= 4;
+                        val += c;
+                        j ^= 1;
+                } while (j);
+
+                *ptr++ = val;
+
+        } while (--i);
+
+        /* Error if we aren't at end of string */
+        return *bufp;
+}
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 7f64a9691..20d75cf56 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -38,6 +38,14 @@
  * and the \] escape to signal the end of such a sequence. Example:
  *
  * PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+ *
+ * Unicode in PS1 is not fully supported: prompt length calulation is wrong,
+ * resulting in line wrap problems with long (multi-line) input.
+ *
+ * Multi-line PS1 (e.g. PS1="\n[\w]\n$ ") has problems with history
+ * browsing: up/down arrows result in scrolling.
+ * It stems from simplistic "cmdedit_y = cmdedit_prmt_len / cmdedit_termw"
+ * calculation of how many lines the prompt takes.
  */
 #include "libbb.h"
 #include "unicode.h"
@@ -1268,7 +1276,7 @@ line_input_t* FAST_FUNC new_line_input_t(int flags)
 
 #if MAX_HISTORY > 0
 
-unsigned size_from_HISTFILESIZE(const char *hp)
+unsigned FAST_FUNC size_from_HISTFILESIZE(const char *hp)
 {
         int size = MAX_HISTORY;
         if (hp) {
@@ -1323,6 +1331,17 @@ static int get_next_history(void)
         return 0;
 }
 
+/* Lists command history. Used by shell 'history' builtins */
+void FAST_FUNC show_history(const line_input_t *st)
+{
+        int i;
+
+        if (!st)
+                return;
+        for (i = 0; i < st->cnt_history; i++)
+                printf("%4d %s\n", i, st->history[i]);
+}
+
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
 /* We try to ensure that concurrent additions to the history
  * do not overwrite each other.
@@ -1762,34 +1781,36 @@ static void ask_terminal(void)
 #define ask_terminal() ((void)0)
 #endif
 
+/* Called just once at read_line_input() init time */
 #if !ENABLE_FEATURE_EDITING_FANCY_PROMPT
 static void parse_and_put_prompt(const char *prmt_ptr)
 {
+        const char *p;
         cmdedit_prompt = prmt_ptr;
-        cmdedit_prmt_len = strlen(prmt_ptr);
+        p = strrchr(prmt_ptr, '\n');
+        cmdedit_prmt_len = unicode_strwidth(p ? p+1 : prmt_ptr);
         put_prompt();
 }
 #else
 static void parse_and_put_prompt(const char *prmt_ptr)
 {
-        int prmt_len = 0;
-        size_t cur_prmt_len = 0;
-        char flg_not_length = '[';
+        int prmt_size = 0;
         char *prmt_mem_ptr = xzalloc(1);
 # if ENABLE_USERNAME_OR_HOMEDIR
         char *cwd_buf = NULL;
 # endif
-        char timebuf[sizeof("HH:MM:SS")];
+        char flg_not_length = '[';
         char cbuf[2];
-        char c;
-        char *pbuf;
 
-        cmdedit_prmt_len = 0;
+        /*cmdedit_prmt_len = 0; - already is */
 
         cbuf[1] = '\0'; /* never changes */
 
         while (*prmt_ptr) {
+                char timebuf[sizeof("HH:MM:SS")];
                 char *free_me = NULL;
+                char *pbuf;
+                char c;
 
                 pbuf = cbuf;
                 c = *prmt_ptr++;
@@ -1922,7 +1943,8 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                 }
                                 case '[': case ']':
                                         if (c == flg_not_length) {
-                                                flg_not_length = (flg_not_length == '[' ? ']' : '[');
+                                                /* Toggle '['/']' hex 5b/5d */
+                                                flg_not_length ^= 6;
                                                 continue;
                                         }
                                         break;
@@ -1930,11 +1952,22 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                         } /* if */
                 } /* if */
                 cbuf[0] = c;
-                cur_prmt_len = strlen(pbuf);
-                prmt_len += cur_prmt_len;
-                if (flg_not_length != ']')
-                        cmdedit_prmt_len += cur_prmt_len;
-                prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_len+1), pbuf);
+                {
+                        int n = strlen(pbuf);
+                        prmt_size += n;
+                        if (c == '\n')
+                                cmdedit_prmt_len = 0;
+                        else if (flg_not_length != ']') {
+#if 0 /*ENABLE_UNICODE_SUPPORT*/
+/* Won't work, pbuf is one BYTE string here instead of an one Unicode char string. */
+/* FIXME */
+                                cmdedit_prmt_len += unicode_strwidth(pbuf);
+#else
+                                cmdedit_prmt_len += n;
+#endif
+                        }
+                }
+                prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_size+1), pbuf);
                 free(free_me);
         } /* while */
 
@@ -2003,7 +2036,15 @@ static int lineedit_read_key(char *read_key_buffer, int timeout)
                         S.sent_ESC_br6n = 0;
                         if (cursor == 0) { /* otherwise it may be bogus */
                                 int col = ((ic >> 32) & 0x7fff) - 1;
-                                if (col > cmdedit_prmt_len) {
+                                /*
+                                 * Is col > cmdedit_prmt_len?
+                                 * If yes (terminal says cursor is farther to the right
+                                 * of where we think it should be),
+                                 * the prompt wasn't printed starting at col 1,
+                                 * there was additional text before it.
+                                 */
+                                if ((int)(col - cmdedit_prmt_len) > 0) {
+                                        /* Fix our understanding of current x position */
                                         cmdedit_x += (col - cmdedit_prmt_len);
                                         while (cmdedit_x >= cmdedit_termw) {
                                                 cmdedit_x -= cmdedit_termw;
@@ -2094,6 +2135,7 @@ static int32_t reverse_i_search(void)
         char read_key_buffer[KEYCODE_BUFFER_SIZE];
         const char *matched_history_line;
         const char *saved_prompt;
+        unsigned saved_prmt_len;
         int32_t ic;
 
         matched_history_line = NULL;
@@ -2102,6 +2144,7 @@ static int32_t reverse_i_search(void)
 
         /* Save and replace the prompt */
         saved_prompt = cmdedit_prompt;
+        saved_prmt_len = cmdedit_prmt_len;
         goto set_prompt;
 
         while (1) {
@@ -2177,7 +2220,7 @@ static int32_t reverse_i_search(void)
                                         free((char*)cmdedit_prompt);
  set_prompt:
                                         cmdedit_prompt = xasprintf("(reverse-i-search)'%s': ", match_buf);
-                                        cmdedit_prmt_len = strlen(cmdedit_prompt);
+                                        cmdedit_prmt_len = unicode_strwidth(cmdedit_prompt);
                                         goto do_redraw;
                                 }
                         }
@@ -2199,7 +2242,7 @@ static int32_t reverse_i_search(void)
 
         free((char*)cmdedit_prompt);
         cmdedit_prompt = saved_prompt;
-        cmdedit_prmt_len = strlen(cmdedit_prompt);
+        cmdedit_prmt_len = saved_prmt_len;
         redraw(cmdedit_y, command_len - cursor);
 
         return ic;
@@ -2774,8 +2817,9 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         free(command_ps);
 #endif
 
-        if (command_len > 0)
+        if (command_len > 0) {
                 remember_in_history(command);
+        }
 
         if (break_out > 0) {
                 command[command_len++] = '\n';
diff --git a/libbb/printable.c b/libbb/printable.c
index f6ada4904..9a423431e 100644
--- a/libbb/printable.c
+++ b/libbb/printable.c
@@ -32,3 +32,27 @@ void FAST_FUNC fputc_printable(int ch, FILE *file)
         }
         fputc(ch, file);
 }
+
+void FAST_FUNC visible(unsigned ch, char *buf, int flags)
+{
+        if (ch == '\t' && !(flags & VISIBLE_SHOW_TABS)) {
+                goto raw;
+        }
+        if (ch == '\n') {
+                if (flags & VISIBLE_ENDLINE)
+                        *buf++ = '$';
+        } else {
+                if (ch >= 128) {
+                        ch -= 128;
+                        *buf++ = 'M';
+                        *buf++ = '-';
+                }
+                if (ch < 32 || ch == 127) {
+                        *buf++ = '^';
+                        ch ^= 0x40;
+                }
+        }
+ raw:
+        *buf++ = ch;
+        *buf = '\0';
+}
diff --git a/libbb/time.c b/libbb/time.c
index 57e14b66c..ea2f72e3b 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -23,14 +23,16 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                 if (sscanf(date_str, "%u:%u%c",
                                         &ptm->tm_hour,
                                         &ptm->tm_min,
-                                        &end) >= 2) {
+                                        &end) >= 2
+                ) {
                         /* no adjustments needed */
                 } else
                 /* mm.dd-HH:MM */
                 if (sscanf(date_str, "%u.%u-%u:%u%c",
                                         &ptm->tm_mon, &ptm->tm_mday,
                                         &ptm->tm_hour, &ptm->tm_min,
-                                        &end) >= 4) {
+                                        &end) >= 4
+                ) {
                         /* Adjust month from 1-12 to 0-11 */
                         ptm->tm_mon -= 1;
                 } else
@@ -38,15 +40,13 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                 if (sscanf(date_str, "%u.%u.%u-%u:%u%c", &ptm->tm_year,
                                         &ptm->tm_mon, &ptm->tm_mday,
                                         &ptm->tm_hour, &ptm->tm_min,
-                                        &end) >= 5) {
-                        ptm->tm_year -= 1900; /* Adjust years */
-                        ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
-                } else
+                                        &end) >= 5
                 /* yyyy-mm-dd HH:MM */
-                if (sscanf(date_str, "%u-%u-%u %u:%u%c", &ptm->tm_year,
+                 || sscanf(date_str, "%u-%u-%u %u:%u%c", &ptm->tm_year,
                                         &ptm->tm_mon, &ptm->tm_mday,
                                         &ptm->tm_hour, &ptm->tm_min,
-                                        &end) >= 5) {
+                                        &end) >= 5
+                ) {
                         ptm->tm_year -= 1900; /* Adjust years */
                         ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
                 } else
@@ -58,7 +58,6 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                         return; /* don't fall through to end == ":" check */
                 } else
 #endif
-//TODO: coreutils 6.9 also accepts "yyyy-mm-dd HH" (no minutes)
                 {
                         bb_error_msg_and_die(bb_msg_invalid_date, date_str);
                 }
@@ -68,7 +67,21 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                                 end = '\0';
                         /* else end != NUL and we error out */
                 }
-        } else if (date_str[0] == '@') {
+        } else
+        /* yyyy-mm-dd HH */
+        if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
+                                &ptm->tm_mon, &ptm->tm_mday,
+                                &ptm->tm_hour,
+                                &end) >= 4
+        /* yyyy-mm-dd */
+         || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
+                                &ptm->tm_mon, &ptm->tm_mday,
+                                &end) >= 3
+        ) {
+                ptm->tm_year -= 1900; /* Adjust years */
+                ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
+        } else
+        if (date_str[0] == '@') {
                 time_t t = bb_strtol(date_str + 1, NULL, 10);
                 if (!errno) {
                         struct tm *lt = localtime(&t);
diff --git a/libbb/unicode.c b/libbb/unicode.c
index 99dc1dfa6..9c4da50d3 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -28,19 +28,37 @@ void FAST_FUNC reinit_unicode(const char *LANG)
         static const char unicode_0x394[] = { 0xce, 0x94, 0 };
         size_t width;
 
+        /* We pass "" instead of "C" because some libc's have
+         * non-ASCII default locale for setlocale("") call
+         * (this allows users of such libc to have Unicoded
+         * system without having to mess with env).
+         *
+         * We set LC_CTYPE because (a) we may be called with $LC_CTYPE
+         * value in LANG, not with $LC_ALL, (b) internationalized
+         * LC_NUMERIC and LC_TIME are more PITA than benefit
+         * (for one, some utilities have hard time with comma
+         * used as a fractional separator).
+         */
 //TODO: avoid repeated calls by caching last string?
-        setlocale(LC_ALL, (LANG && LANG[0]) ? LANG : "C");
+        setlocale(LC_CTYPE, LANG ? LANG : "");
 
         /* In unicode, this is a one character string */
-// can use unicode_strlen(string) too, but otherwise unicode_strlen() is unused
-        width = mbstowcs(NULL, unicode_0x394, INT_MAX);
+        width = unicode_strlen(unicode_0x394);
         unicode_status = (width == 1 ? UNICODE_ON : UNICODE_OFF);
 }
 
 void FAST_FUNC init_unicode(void)
 {
-        if (unicode_status == UNICODE_UNKNOWN)
-                reinit_unicode(getenv("LANG"));
+        /* Some people set only $LC_CTYPE, not $LC_ALL, because they want
+         * only Unicode to be activated on their system, not the whole
+         * shebang of wrong decimal points, strange date formats and so on.
+         */
+        if (unicode_status == UNICODE_UNKNOWN) {
+                char *s = getenv("LC_ALL");
+                if (!s) s = getenv("LC_CTYPE");
+                if (!s) s = getenv("LANG");
+                reinit_unicode(s);
+        }
 }
 
 #else
@@ -58,8 +76,12 @@ void FAST_FUNC reinit_unicode(const char *LANG)
 
 void FAST_FUNC init_unicode(void)
 {
-        if (unicode_status == UNICODE_UNKNOWN)
-                reinit_unicode(getenv("LANG"));
+        if (unicode_status == UNICODE_UNKNOWN) {
+                char *s = getenv("LC_ALL");
+                if (!s) s = getenv("LC_CTYPE");
+                if (!s) s = getenv("LANG");
+                reinit_unicode(s);
+        }
 }
 # endif
 
@@ -963,7 +985,6 @@ int FAST_FUNC unicode_bidi_is_neutral_wchar(wint_t wc)
 
 /* The rest is mostly same for libc and for "homegrown" support */
 
-#if 0 // UNUSED
 size_t FAST_FUNC unicode_strlen(const char *string)
 {
         size_t width = mbstowcs(NULL, string, INT_MAX);
@@ -971,7 +992,6 @@ size_t FAST_FUNC unicode_strlen(const char *string)
                 return strlen(string);
         return width;
 }
-#endif
 
 size_t FAST_FUNC unicode_strwidth(const char *string)
 {
diff --git a/libbb/xatonum.c b/libbb/xatonum.c
index 62bbe53e7..6f4e023bb 100644
--- a/libbb/xatonum.c
+++ b/libbb/xatonum.c
@@ -68,3 +68,10 @@ uint16_t FAST_FUNC xatou16(const char *numstr)
 {
         return xatou_range(numstr, 0, 0xffff);
 }
+
+const struct suffix_mult bkm_suffixes[] = {
+        { "b", 512 },
+        { "k", 1024 },
+        { "m", 1024*1024 },
+        { "", 0 }
+};
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 05aa07ce8..a70683241 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -541,13 +541,11 @@ int FAST_FUNC bb_xioctl(int fd, unsigned request, void *argp)
 
 char* FAST_FUNC xmalloc_ttyname(int fd)
 {
-        char *buf = xzalloc(128);
-        int r = ttyname_r(fd, buf, 127);
-        if (r) {
-                free(buf);
-                buf = NULL;
-        }
-        return buf;
+        char buf[128];
+        int r = ttyname_r(fd, buf, sizeof(buf) - 1);
+        if (r)
+                return NULL;
+        return xstrdup(buf);
 }
 
 void FAST_FUNC generate_uuid(uint8_t *buf)