libui: Add Buttons

Also, create the socket after dropping privileges.

kernel/src/arch/x86_64/disk/ATA.cpp

@@ -6,7 +6,6 @@
 #include "fs/MBR.h"
 #include "memory/MemoryManager.h"
 #include <luna/Alignment.h>
-#include <luna/Buffer.h>
 #include <luna/CType.h>
 #include <luna/SafeArithmetic.h>
 #include <luna/Vector.h>
@@ -759,7 +758,9 @@ Result<u64> ATADevice::read(u8* buf, usize offset, usize size) const
 
     ScopedKMutexLock<100> lock(m_drive->channel()->lock());
 
-    Buffer temp;
+    // FIXME: Don't always allocate this if we don't need it.
+    auto* temp = (u8*)TRY(malloc_impl(block_size));
+    auto guard = make_scope_guard([temp] { free_impl(temp); });
 
     if (offset % block_size)
     {
@@ -768,10 +769,8 @@ Result<u64> ATADevice::read(u8* buf, usize offset, usize size) const
         // Maybe we don't even want enough to get to the next block?
         if (extra_size > size) extra_size = size;
 
-        TRY(temp.try_resize(block_size));
+        TRY(m_drive->read_lba(offset / block_size, temp, 1));
-
+        memcpy(buf, temp + (offset % block_size), extra_size);
-        TRY(m_drive->read_lba(offset / block_size, temp.data(), 1));
-        memcpy(buf, temp.data() + (offset % block_size), extra_size);
         offset += extra_size;
         size -= extra_size;
         buf += extra_size;
@@ -795,9 +794,8 @@ Result<u64> ATADevice::read(u8* buf, usize offset, usize size) const
 
     if (size)
     {
-        TRY(temp.try_resize(block_size));
+        TRY(m_drive->read_lba(offset / block_size, temp, 1));
-        TRY(m_drive->read_lba(offset / block_size, temp.data(), 1));
+        memcpy(buf, temp, size);
-        memcpy(buf, temp.data(), size);
     }
 
     return length;

kernel/src/fs/GPT.cpp

@@ -66,9 +66,6 @@ namespace GPT
     {
         header.checksum = 0;
 
-        CRC32 crc;
+        return CRC32::checksum((u8*)&header, 0x5c);
-        crc.append((u8*)&header, 0x5c);
-
-        return crc.digest();
     }
 }

kernel/src/fs/Pipe.cpp

@@ -44,11 +44,7 @@ Result<usize> Pipe::read(u8* buf, usize, usize length)
 
 Result<usize> Pipe::write(const u8* buf, usize, usize length)
 {
-    if (!m_reader)
+    if (!m_reader) return length;
-    {
-        Scheduler::current()->send_signal(SIGPIPE);
-        return err(EPIPE);
-    }
 
     u8* slice = TRY(m_data_buffer.slice_at_end(length));
     memcpy(slice, buf, length);

kernel/src/fs/ext2/FileSystem.cpp

@@ -63,7 +63,7 @@ namespace Ext2
 
 #ifdef EXT2_DEBUG
         kdbgln("ext2: Read inode %lu with mode %#x (%#x + %#o), size %lu", inum, inode->m_raw_inode.mode,
-               inode->m_raw_inode.mode & 0xf000, inode->metadata().mode, inode->metadata().size);
+               inode->m_raw_inode.mode & 0xf000, inode->mode(), inode->size());
 #endif
 
         m_inode_cache.try_set(inum, inode);

kernel/src/fs/ext2/Inode.cpp

@@ -91,18 +91,19 @@ namespace Ext2
         const usize inode_size = m_metadata.size;
         const usize block_size = m_fs->m_block_size;
 
-        auto buf = TRY(Buffer::create_sized(block_size));
+        u8* const buf = (u8*)TRY(calloc_impl(block_size, 1));
+        auto guard = make_scope_guard([buf] { free_impl(buf); });
 
         m_entries.clear();
 
         for (usize offset = 0; offset < inode_size; offset += block_size)
         {
-            TRY(read(buf.data(), offset, block_size));
+            TRY(read(buf, offset, block_size));
 
             usize dir_offset = 0;
             while (dir_offset < block_size)
             {
-                auto& entry = *(Ext2::RawDirectoryEntry*)&buf.data()[dir_offset];
+                auto& entry = *(Ext2::RawDirectoryEntry*)&buf[dir_offset];
 
                 if (entry.inum != 0)
                 {

kernel/src/sys/exec.cpp

@@ -182,7 +182,7 @@ Result<u64> sys_fork(Registers* regs, SyscallArgs)
     Scheduler::add_thread(thread);
 
 #ifdef FORK_DEBUG
-    kdbgln("fork: thread %d forked into child %d", current->id, thread->id);
+    kdbgln("fork: thread %lu forked into child %lu", current->id, thread->id);
 #endif
 
     return thread->id;

kernel/src/thread/Scheduler.cpp

@@ -183,7 +183,7 @@ namespace Scheduler
         CPU::disable_interrupts();
 
 #ifdef REAP_DEBUG
-        kdbgln("reap: reaping thread with id %d", thread->id);
+        kdbgln("reap: reaping thread with id %zu", thread->id);
 #endif
 
         if (thread->is_kernel)

libc/include/stdio.h

@@ -27,7 +27,6 @@ typedef struct
         int mode;        // The buffering mode.
     } _buf;
     int _flags; // The file access mode with which the file was opened.
-    pid_t _pid; // For popen(3) files, the pid of the child process.
 } FILE;
 
 #define EOF -1
@@ -53,7 +52,6 @@ extern "C"
 {
 #endif
 
-    /* Flush a stream's buffers. */
     int fflush(FILE*);
 
     /* Open a file and bind a stream to it. */
@@ -203,9 +201,6 @@ extern "C"
     /* Move a file's location across a file system. */
     int rename(const char* oldpath, const char* newpath);
 
-    /* Pipe a stream to or from a process. */
-    FILE* popen(const char* command, const char* type);
-
 #ifdef __cplusplus
 }
 #endif

libc/src/stdio.cpp

@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/syscall.h>
-#include <sys/wait.h>
 #include <unistd.h>
 
 FILE* stdin = nullptr;
@@ -762,87 +761,4 @@ extern "C"
         unlink(oldpath);
         return 0;
     }
-
-    FILE* popen(const char* command, const char* type)
-    {
-        int pfds[2];
-        if (pipe(pfds) < 0) return nullptr;
-
-        if (*type != 'r' && *type != 'w')
-        {
-            errno = EINVAL;
-            return nullptr;
-        }
-
-        pid_t child = fork();
-        if (child < 0)
-        {
-            close(pfds[0]);
-            close(pfds[1]);
-            return nullptr;
-        }
-        if (child == 0)
-        {
-            if (*type == 'r')
-            {
-                close(pfds[0]);
-                dup2(pfds[1], STDOUT_FILENO);
-            }
-            else
-            {
-                close(pfds[1]);
-                dup2(pfds[0], STDIN_FILENO);
-            }
-
-            execl("/bin/sh", "sh", "-c", command, nullptr);
-            _exit(127);
-        }
-
-        int fd;
-        if (*type == 'r')
-        {
-            close(pfds[1]);
-            fd = pfds[0];
-        }
-        else
-        {
-            close(pfds[0]);
-            fd = pfds[1];
-        }
-
-        int err = errno;
-        FILE* f = (FILE*)malloc(sizeof(FILE));
-        if (!f)
-        {
-            errno = err;
-            close(fd);
-            return nullptr;
-        }
-
-        f->_fd = fd;
-        f->_pid = child;
-        clearerr(f);
-
-        f->_flags = *type == 'r' ? O_RDONLY : O_WRONLY;
-        f->_buf.status = 0;
-        f->_buf.mode = _IOFBF;
-        f->_buf.size = f->_buf.index = 0;
-        f->_buf.buffer = nullptr;
-        setvbuf(f, NULL, f->_buf.mode, 0);
-
-        s_open_files[fd] = f;
-
-        return f;
-    }
-
-    int pclose(FILE* stream)
-    {
-        pid_t pid = stream->_pid;
-        fclose(stream);
-
-        int status;
-        if (waitpid(pid, &status, 0) < 0) return -1;
-
-        return status;
-    }
 }

libluna/include/luna/CRC32.h

@@ -1,13 +1,7 @@
 #pragma once
 #include <luna/Types.h>
 
-class CRC32
+namespace CRC32
 {
-  public:
+    u32 checksum(const u8* data, usize size);
-    void append(const u8* data, usize size);
+}
-
-    u32 digest();
-
-  private:
-    u32 m_checksum = 0xffffffffu;
-};

libluna/src/CRC32.cpp

@@ -33,16 +33,18 @@ static const u32 crc_table[] = {
     0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
 };
 
-void CRC32::append(const u8* data, usize size)
+namespace CRC32
 {
-    for (usize i = 0; i < size; i++)
+    u32 checksum(const u8* data, usize size)
     {
-        const u32 index = (m_checksum & 0xff) ^ data[i];
+        u32 crc = 0xffffffffu;
-        m_checksum = (m_checksum >> 8) ^ (crc_table[index]);
+
+        for (usize i = 0; i < size; i++)
+        {
+            const u32 index = (crc & 0xff) ^ data[i];
+            crc = (crc >> 8) ^ (crc_table[index]);
+        }
+
+        return ~crc;
     }
 }
-
-u32 CRC32::digest()
-{
-    return ~m_checksum;
-}

tools/env.sh

@@ -5,7 +5,7 @@ export LUNA_BASE=${LUNA_BASE:-$LUNA_ROOT/base}
 [ -f "$LUNA_ROOT/env-local.sh" ] && source $LUNA_ROOT/env-local.sh
 
 export LUNA_ARCH=${LUNA_ARCH:-x86_64}
-export PATH=$LUNA_ROOT/toolchain/$LUNA_ARCH-luna/bin:$LUNA_ROOT/toolchain/dist:$LUNA_ROOT/toolchain/bin:$LUNA_ROOT/tools/exec/:$PATH
+export PATH=$LUNA_ROOT/toolchain/$LUNA_ARCH-luna/bin:$LUNA_ROOT/toolchain/dist:$LUNA_ROOT/tools/exec/:$PATH
 
 if [ "$USE_MAKE" = "1" ]
 then

tools/setup-autoconf.sh

@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-set -e
-source $(dirname $0)/setup-env.sh
-
-cd $LUNA_ROOT
-
-# libstdc++ needs autoconf (precisely version 2.69) so if the user has an older/more recent version, we must build autoconf from source.
-
-export AUTOCONF_VERSION=2.69
-
-mkdir -p toolchain/tarballs
-mkdir -p toolchain/build
-
-if [ ! -f toolchain/tarballs/autoconf-$AUTOCONF_VERSION.tar.gz ]; then
-    echo "Downloading autoconf (precisely version 2.69)..."
-
-    wget -Otoolchain/tarballs/autoconf-$AUTOCONF_VERSION.tar.gz https://ftp.gnu.org/gnu/autoconf/autoconf-$AUTOCONF_VERSION.tar.gz
-fi
-
-rm -rf toolchain/build/build-autoconf
-rm -rf toolchain/build/autoconf-$AUTOCONF_VERSION
-
-echo "Extracting autoconf (precisely version 2.69)..."
-
-tar xf toolchain/tarballs/autoconf-$AUTOCONF_VERSION.tar.gz -C toolchain/build/
-
-mkdir -p toolchain/build/build-autoconf
-
-cd toolchain/build/build-autoconf
-
-unset CC
-unset CXX
-unset LD
-unset AR
-
-echo "Building autoconf (precisely version 2.69)..."
-
-../autoconf-$AUTOCONF_VERSION/configure --prefix=$LUNA_ROOT/toolchain
-make
-make install

tools/setup-gcc.sh

@@ -36,10 +36,6 @@ patch -u -i $LUNA_ROOT/tools/gcc.patch -p 1 -d build
 
 cd -
 
-cd toolchain/build/gcc-$LUNA_GCC_VERSION_REQUIRED/libstdc++-v3
-autoconf
-cd -
-
 echo Configuring GCC...
 
 mkdir -p toolchain/build/gcc-$LUNA_ARCH

tools/setup.sh

@@ -9,12 +9,6 @@ fi
 
 if ! $(dirname $0)/test-gcc.sh
 then
-    if ! $(dirname $0)/test-autoconf.sh
-    then
-        echo Building autoconf...
-        $(dirname $0)/setup-autoconf.sh
-    fi
-
     echo Building GCC..
     $(dirname $0)/setup-gcc.sh
 fi
@@ -23,4 +17,4 @@ if ! [ -f $(dirname $0)/../toolchain/dist/mkbootimg ]
 then
     echo Building mkbootimg...
     $(dirname $0)/setup-mkbootimg.sh
-fi
+fi

tools/test-autoconf.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -e
-source $(dirname $0)/setup-env.sh
-
-if [ -x "$(command -v autoconf)" ]
-then
-    if [ "$(autoconf --version | head -n 1 | awk '{ print $4 }')" == "2.69" ]
-    then
-        exit 0
-    else
-        echo "You have autoconf installed, but it is not version 2.69, which is required by libstdc++. Thus, we must build autoconf from source."
-        exit 1
-    fi
-else
-exit 1
-fi