Merge branch 'busybox' into merge

5 files changed, 193 insertions, 40 deletions

diff --git a/miscutils/bc.c b/miscutils/bc.c
index fe555d018..01402b311 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -2892,6 +2892,8 @@ static char peek_inbuf(void)
         ) {
                 xc_read_line(&G.input_buffer, G.prs.lex_input_fp);
                 G.prs.lex_inbuf = G.input_buffer.v;
+                // lex_next_at may point to now-freed data, update it:
+                G.prs.lex_next_at = G.prs.lex_inbuf;
                 if (G.input_buffer.len <= 1) // on EOF, len is 1 (NUL byte)
                         G.prs.lex_input_fp = NULL;
         }
@@ -3103,7 +3105,7 @@ static BC_STATUS zbc_lex_identifier(void)
                         continue;
  match:
                 // buf starts with keyword bc_lex_kws[i]
-                if (isalnum(buf[j]) || buf[j]=='_')
+                if (isalnum(buf[j]) || buf[j] == '_')
                         continue; // "ifz" does not match "if" keyword, "if." does
                 p->lex = BC_LEX_KEY_1st_keyword + i;
                 if (!keyword_is_POSIX(i)) {
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index fb9ebcf60..297693f8c 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -976,7 +976,7 @@ static void action_compat(const struct devfsd_notify_struct *info, unsigned int
                                 rewind_ = info->devname[info->namelen - 1];
                                 if (rewind_ != 'n')
                                         rewind_ = '\0';
-                                mode=0;
+                                mode = 0;
                                 if (ptr[2] ==  'l' /*108*/ || ptr[2] == 'm'/*109*/)
                                         mode = ptr[2] - 107; /* 1 or 2 */
                                 if (ptr[2] ==  'a')
@@ -1595,11 +1595,11 @@ static char *write_old_sd_name(char *buffer,
                 return buffer;
         }
         if ((major > 64) && (major < 72)) {
-                disc_index = ((major - 64) << 4) +(minor >> 4);
+                disc_index = ((major - 64) << 4) + (minor >> 4);
                 if (disc_index < 26)
                         sprintf(buffer, "sd%c%s", 'a' + disc_index, part);
                 else
-                        sprintf(buffer, "sd%c%c%s", 'a' +(disc_index / 26) - 1, 'a' + disc_index % 26, part);
+                        sprintf(buffer, "sd%c%c%s", 'a' + (disc_index / 26) - 1, 'a' + disc_index % 26, part);
                 return buffer;
         }
         return NULL;
diff --git a/miscutils/devmem.c b/miscutils/devmem.c
index f9f0276bc..f21621bd6 100644
--- a/miscutils/devmem.c
+++ b/miscutils/devmem.c
@@ -29,7 +29,6 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
 {
         void *map_base, *virt_addr;
         uint64_t read_result;
-        uint64_t writeval = writeval; /* for compiler */
         off_t target;
         unsigned page_size, mapped_size, offset_in_page;
         int fd;
@@ -64,9 +63,6 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
                         width = strchrnul(bhwl, (argv[2][0] | 0x20)) - bhwl;
                         width = sizes[width];
                 }
-                /* VALUE */
-                if (argv[3])
-                        writeval = bb_strtoull(argv[3], NULL, 0);
         } else { /* argv[2] == NULL */
                 /* make argv[3] to be a valid thing to fetch */
                 argv--;
@@ -96,28 +92,46 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
         virt_addr = (char*)map_base + offset_in_page;
 
         if (!argv[3]) {
-                switch (width) {
-                case 8:
-                        read_result = *(volatile uint8_t*)virt_addr;
-                        break;
-                case 16:
-                        read_result = *(volatile uint16_t*)virt_addr;
-                        break;
-                case 32:
-                        read_result = *(volatile uint32_t*)virt_addr;
-                        break;
-                case 64:
-                        read_result = *(volatile uint64_t*)virt_addr;
-                        break;
-                default:
-                        bb_simple_error_msg_and_die("bad width");
+#ifdef __SIZEOF_INT128__
+                if (width == 128) {
+                        unsigned __int128 rd =
+                                *(volatile unsigned __int128 *)virt_addr;
+                        printf("0x%016llX%016llX\n",
+                                (unsigned long long)(uint64_t)(rd >> 64),
+                                (unsigned long long)(uint64_t)rd
+                        );
+                } else
+#endif
+                {
+                        switch (width) {
+                        case 8:
+                                read_result = *(volatile uint8_t*)virt_addr;
+                                break;
+                        case 16:
+                                read_result = *(volatile uint16_t*)virt_addr;
+                                break;
+                        case 32:
+                                read_result = *(volatile uint32_t*)virt_addr;
+                                break;
+                        case 64:
+                                read_result = *(volatile uint64_t*)virt_addr;
+                                break;
+                        default:
+                                bb_simple_error_msg_and_die("bad width");
+                        }
+//                      printf("Value at address 0x%"OFF_FMT"X (%p): 0x%llX\n",
+//                              target, virt_addr,
+//                              (unsigned long long)read_result);
+                        /* Zero-padded output shows the width of access just done */
+                        printf("0x%0*llX\n", (width >> 2), (unsigned long long)read_result);
                 }
-//              printf("Value at address 0x%"OFF_FMT"X (%p): 0x%llX\n",
-//                      target, virt_addr,
-//                      (unsigned long long)read_result);
-                /* Zero-padded output shows the width of access just done */
-                printf("0x%0*llX\n", (width >> 2), (unsigned long long)read_result);
         } else {
+                /* parse VALUE */
+#ifdef __SIZEOF_INT128__
+                unsigned __int128 writeval = strtoumax(argv[3], NULL, 0);
+#else
+                uint64_t writeval = bb_strtoull(argv[3], NULL, 0);
+#endif
                 switch (width) {
                 case 8:
                         *(volatile uint8_t*)virt_addr = writeval;
@@ -135,6 +149,12 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
                         *(volatile uint64_t*)virt_addr = writeval;
 //                      read_result = *(volatile uint64_t*)virt_addr;
                         break;
+#ifdef __SIZEOF_INT128__
+                case 128:
+                        *(volatile unsigned __int128 *)virt_addr = writeval;
+//                      read_result = *(volatile uint64_t*)virt_addr;
+                        break;
+#endif
                 default:
                         bb_simple_error_msg_and_die("bad width");
                 }
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index d8d8f6166..83e2f8d53 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -798,7 +798,7 @@ static void identify(uint16_t *val)
         if (!(val[GEN_CONFIG] & NOT_ATA)) {
                 dev = ATA_DEV;
                 printf("ATA device, with ");
-        } else if (val[GEN_CONFIG]==CFA_SUPPORT_VAL) {
+        } else if (val[GEN_CONFIG] == CFA_SUPPORT_VAL) {
                 dev = ATA_DEV;
                 like_std = 4;
                 printf("CompactFlash ATA device, with ");
@@ -819,13 +819,13 @@ static void identify(uint16_t *val)
          * specific, it should be safe to check it now, even though we don't
          * know yet what standard this device is using.
          */
-        if ((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==STBY_ID_VAL)
-         || (val[CONFIG]==PWRD_NID_VAL) || (val[CONFIG]==PWRD_ID_VAL)
+        if ((val[CONFIG] == STBY_NID_VAL) || (val[CONFIG] == STBY_ID_VAL)
+         || (val[CONFIG] == PWRD_NID_VAL) || (val[CONFIG] == PWRD_ID_VAL)
         ) {
                 like_std = 5;
-                if ((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==STBY_ID_VAL))
+                if ((val[CONFIG] == STBY_NID_VAL) || (val[CONFIG] == STBY_ID_VAL))
                         puts("powers-up in standby; SET FEATURES subcmd spins-up.");
-                if (((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==PWRD_NID_VAL)) && (val[GEN_CONFIG] & INCOMPLETE))
+                if (((val[CONFIG] == STBY_NID_VAL) || (val[CONFIG] == PWRD_NID_VAL)) && (val[GEN_CONFIG] & INCOMPLETE))
                         puts("\n\tWARNING: ID response incomplete.\n\tFollowing data may be incorrect.\n");
         }
 
@@ -853,7 +853,7 @@ static void identify(uint16_t *val)
                         printf("\n\tSupported: ");
                         jj = val[MAJOR] << 1;
                         kk = like_std >4 ? like_std-4: 0;
-                        for (ii = 14; (ii >0)&&(ii>kk); ii--) {
+                        for (ii = 14; (ii > 0) && (ii > kk); ii--) {
                                 if (jj & 0x8000) {
                                         printf("%u ", ii);
                                         if (like_std < ii) {
@@ -943,7 +943,7 @@ static void identify(uint16_t *val)
                 for (ii = 1; ii < 15; ii++) {
                         if (jj & 0x0001)
                                 printf("\t%s\n", nth_string(ata1_cfg_str, ii));
-                        jj >>=1;
+                        jj >>= 1;
                 }
         }
         if (dev == ATAPI_DEV) {
@@ -952,7 +952,7 @@ static void identify(uint16_t *val)
                 else if ((val[GEN_CONFIG] & DRQ_RESPONSE_TIME) ==  DRQ_INTR_VAL)
                         strng = "<=10ms with INTRQ";
                 else if ((val[GEN_CONFIG] & DRQ_RESPONSE_TIME) ==  DRQ_50US_VAL)
-                        strng ="50us";
+                        strng = "50us";
                 else
                         strng = "unknown";
                 printf("\tDRQ response: %s\n\tPacket size: ", strng); /* Data Request (DRQ) */
@@ -1014,7 +1014,7 @@ static void identify(uint16_t *val)
                 }
 
                 if (!bbbig)
-                        bbbig = (uint64_t)(ll>mm ? ll : mm); /* # 512 byte blocks */
+                        bbbig = (uint64_t)(ll > mm ? ll : mm); /* # 512 byte blocks */
                 printf("\tdevice size with M = 1024*1024: %11"PRIu64" MBytes\n", bbbig>>11);
                 bbbig = (bbbig << 9) / 1000000;
                 printf("\tdevice size with M = 1000*1000: %11"PRIu64" MBytes ", bbbig);
@@ -1160,7 +1160,7 @@ static void identify(uint16_t *val)
                 jj = ((val[ADV_PIO_MODES] & PIO_SUP) << 3) | 0x0007;
                 for (ii = 0; ii <= PIO_MODE_MAX; ii++) {
                         if (jj & 0x0001) printf("pio%d ", ii);
-                        jj >>=1;
+                        jj >>= 1;
                 }
                 bb_putchar('\n');
         } else if (((min_std < 5) || (eqpt == CDROM)) && (val[PIO_MODE] & MODE)) {
@@ -1199,7 +1199,7 @@ static void identify(uint16_t *val)
                         }
                         if (ii == 31) {
                                 if ((val[CMDS_SUPP_2] & VALID) != VALID_VAL)
-                                        ii +=16;
+                                        ii += 16;
                         }
                 }
         }
@@ -1220,7 +1220,7 @@ static void identify(uint16_t *val)
                                 printf("\t%s\t%s\n",
                                         (!(jj & 0x0001)) ? "not" : "",
                                         nth_string(secu_str, ii));
-                                jj >>=1;
+                                jj >>= 1;
                         }
                         if (val[SECU_STATUS] & SECU_ENABLED) {
                                 printf("\tSecurity level %s\n",
diff --git a/miscutils/tree.c b/miscutils/tree.c
new file mode 100644
index 000000000..fa55696c6
--- /dev/null
+++ b/miscutils/tree.c
@@ -0,0 +1,131 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2022 Roger Knecht <rknecht@pm.me>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config TREE
+//config:       bool "tree (0.6 kb)"
+//config:       default y
+//config:       help
+//config:       List files and directories in a tree structure.
+
+//applet:IF_TREE(APPLET(tree, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_TREE) += tree.o
+
+//usage:#define tree_trivial_usage NOUSAGE_STR
+//usage:#define tree_full_usage ""
+
+#include "libbb.h"
+#include "common_bufsiz.h"
+#include "unicode.h"
+
+#define prefix_buf bb_common_bufsiz1
+
+static void tree_print(unsigned count[2], const char* directory_name, char* prefix_pos)
+{
+        struct dirent **entries;
+        int index, size;
+        const char *bar = "|   ";
+        const char *mid = "|-- ";
+        const char *end = "`-- ";
+
+#if ENABLE_UNICODE_SUPPORT
+        if (unicode_status == UNICODE_ON) {
+                bar = "│   ";
+                mid = "├── ";
+                end = "└── ";
+        }
+#endif
+
+        // read directory entries
+        size = scandir(directory_name, &entries, NULL, alphasort);
+
+        if (size < 0) {
+                fputs_stdout(directory_name);
+                puts(" [error opening dir]");
+                return;
+        }
+
+        // print directory name
+        puts(directory_name);
+
+        // switch to sub directory
+        xchdir(directory_name);
+
+        // print all directory entries
+        for (index = 0; index < size;) {
+                struct dirent *dirent = entries[index++];
+
+                // filter hidden files and directories
+                if (dirent->d_name[0] != '.') {
+                        int status;
+                        struct stat statBuf;
+
+//TODO: when -l is implemented, use stat, not lstat, if -l
+                        status = lstat(dirent->d_name, &statBuf);
+
+                        if (index == size) {
+                                strcpy(prefix_pos, end);
+                        } else {
+                                strcpy(prefix_pos, mid);
+                        }
+                        fputs_stdout(prefix_buf);
+
+                        if (status == 0 && S_ISLNK(statBuf.st_mode)) {
+                                // handle symlink
+                                char* symlink_path = xmalloc_readlink(dirent->d_name);
+                                printf("%s -> %s\n", dirent->d_name, symlink_path);
+                                free(symlink_path);
+                                count[1]++;
+                        } else if (status == 0 && S_ISDIR(statBuf.st_mode)
+                         && (prefix_pos - prefix_buf) < (COMMON_BUFSIZE - 16)
+                        ) {
+                                // handle directory
+                                char* pos;
+                                if (index == size) {
+                                        pos = stpcpy(prefix_pos, "    ");
+                                } else {
+                                        pos = stpcpy(prefix_pos, bar);
+                                }
+                                tree_print(count, dirent->d_name, pos);
+                                count[0]++;
+                        } else {
+                                // handle file
+                                puts(dirent->d_name);
+                                count[1]++;
+                        }
+                }
+
+                // release directory entry
+                free(dirent);
+        }
+
+        // release directory array
+        free(entries);
+
+        // switch to parent directory
+        xchdir("..");
+}
+
+int tree_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int tree_main(int argc UNUSED_PARAM, char **argv)
+{
+        unsigned count[2] = { 0, 0 };
+
+        setup_common_bufsiz();
+        init_unicode();
+
+        if (!argv[1])
+                *argv-- = (char*)".";
+
+        // list directories given as command line arguments
+        while (*(++argv))
+                tree_print(count, *argv, prefix_buf);
+
+        // print statistic
+        printf("\n%u directories, %u files\n", count[0], count[1]);
+
+        return EXIT_SUCCESS;
+}