Changeset b6061f8c in mainline for uspace

Timestamp:

2025-04-14T14:18:50Z (11 months ago)

Author:

GitHub <noreply@…>

Children:

f444633

Parents:

c7c6afd (diff), 5d2bdaa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Wayne Thornton <wmthornton-dev@…> (2025-04-14 14:18:50)

git-committer:

GitHub <noreply@…> (2025-04-14 14:18:50)

Message:

Merge branch 'HelenOS:master' into master

Location:

uspace

Files:

• app/sysinst/sysinst.c (modified) (1 diff)
• drv/block/isa-ide/main.c (modified) (2 diffs)
• drv/block/pci-ide/main.c (modified) (2 diffs)
• lib/c/test/adt/odict.c (modified) (1 diff)
• lib/c/test/str.c (modified) (2 diffs)

uspace/app/sysinst/sysinst.c

@@ -72 +72 @@
  */
 #define DEFAULT_DEV_0 "devices/\\hw\\sys\\00:01.1\\c0d0"
-#define DEFAULT_DEV_1 "devices/\\hw\\sys\\00:01.0\\ide1\\c0d0"
+#define DEFAULT_DEV_1 "devices/\\hw\\sys\\ide1\\c0d0"
 //#define DEFAULT_DEV "devices/\\hw\\pci0\\00:01.2\\uhci_rh\\usb01_a1\\mass-storage0\\l0"
 /** Volume label for the new file system */

uspace/drv/block/isa-ide/main.c

@@ -169 +169 @@
         isa_ide_ctrl_t *ctrl;
         isa_ide_hwres_t res;
+        unsigned chans;
         errno_t rc;
 
@@ -187 +188 @@
         ctrl->dev = dev;
 
+        chans = 0;
+
         rc = isa_ide_channel_init(ctrl, &ctrl->channel[0], 0, &res);
-        if (rc == ENOENT)
+        if (rc == EOK)
+                ++chans;
+        else if (rc != ENOENT)
                 goto error;
 
         rc = isa_ide_channel_init(ctrl, &ctrl->channel[1], 1, &res);
-        if (rc == ENOENT)
-                goto error;
-
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed initializing ATA controller.");
+        if (rc == EOK)
+                ++chans;
+        else if (rc != ENOENT)
+                goto error;
+
+        if (chans == 0) {
+                ddf_msg(LVL_ERROR, "No ISA IDE devices found.");
                 rc = EIO;
                 goto error;

uspace/drv/block/pci-ide/main.c

@@ -136 +136 @@
         pci_ide_hwres_t res;
         async_sess_t *parent_sess;
+        unsigned chans;
         errno_t rc;
 
@@ -157 +158 @@
                 goto error;
 
+        chans = 0;
+
         rc = pci_ide_channel_init(ctrl, &ctrl->channel[0], 0, &res);
-        if (rc == ENOENT)
+        if (rc == EOK)
+                ++chans;
+        else if (rc != ENOENT)
                 goto error;
 
         rc = pci_ide_channel_init(ctrl, &ctrl->channel[1], 1, &res);
-        if (rc == ENOENT)
-                goto error;
-
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed initializing ATA controller.");
+        if (rc == EOK)
+                ++chans;
+        else if (rc != ENOENT)
+                goto error;
+
+        if (chans == 0) {
+                ddf_msg(LVL_ERROR, "No PCI IDE devices found.");
                 rc = EIO;
                 goto error;

uspace/lib/c/test/adt/odict.c

@@ -233 +233 @@
 
                 e->key = v;
-                odict_insert(&e->odict, &odict, &ep->odict);
+                odict_insert(&e->odict, &odict, ep ? &ep->odict : NULL);
                 PCUT_ASSERT_ERRNO_VAL(EOK, odict_validate(&odict));
                 v = seq_next(v);

uspace/lib/c/test/str.c

@@ -27 +27 @@
  */
 
+#include "pcut/asserts.h"
 #include <stdio.h>
 #include <str.h>
@@ -115 +116 @@
 }
 
+PCUT_TEST(str_non_shortest)
+{
+        /* Overlong zero. */
+        const char overlong1[] = { 0b11000000, 0b10000000, 0 };
+        const char overlong2[] = { 0b11100000, 0b10000000, 0 };
+        const char overlong3[] = { 0b11110000, 0b10000000, 0 };
+
+        const char overlong4[] = { 0b11000001, 0b10111111, 0 };
+        const char overlong5[] = { 0b11100000, 0b10011111, 0b10111111, 0 };
+        const char overlong6[] = { 0b11110000, 0b10001111, 0b10111111, 0b10111111, 0 };
+
+        size_t offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong1, &offset, sizeof(overlong1)));
+        offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong2, &offset, sizeof(overlong2)));
+        offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong3, &offset, sizeof(overlong3)));
+        offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong4, &offset, sizeof(overlong4)));
+        offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong5, &offset, sizeof(overlong5)));
+        offset = 0;
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, str_decode(overlong6, &offset, sizeof(overlong6)));
+
+        char sanitized[sizeof(overlong6)];
+        str_cpy(sanitized, STR_NO_LIMIT, overlong1);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+        str_cpy(sanitized, STR_NO_LIMIT, overlong2);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+        str_cpy(sanitized, STR_NO_LIMIT, overlong3);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+        str_cpy(sanitized, STR_NO_LIMIT, overlong4);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+        str_cpy(sanitized, STR_NO_LIMIT, overlong5);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+        str_cpy(sanitized, STR_NO_LIMIT, overlong6);
+        PCUT_ASSERT_INT_EQUALS(U_SPECIAL, sanitized[0]);
+}
+
 PCUT_EXPORT(str);