Compare commits
No commits in common. "991ae4383a36dfa76cdcdb7932b3f1091bb508eb" and "14fdcb892d1c3356a3757358e78dcfdc55b8d5d8" have entirely different histories.
991ae4383a
...
14fdcb892d
|
@ -119,9 +119,8 @@ namespace Kernel
|
||||||
|
|
||||||
BAN::ErrorOr<long> sys_pread(int fd, void* buffer, size_t count, off_t offset);
|
BAN::ErrorOr<long> sys_pread(int fd, void* buffer, size_t count, off_t offset);
|
||||||
|
|
||||||
BAN::ErrorOr<long> sys_chmod(const char* path, mode_t mode);
|
BAN::ErrorOr<long> sys_chmod(const char*, mode_t);
|
||||||
BAN::ErrorOr<long> sys_fchmod(int fildes, mode_t mode);
|
BAN::ErrorOr<long> sys_chown(const char*, uid_t, gid_t);
|
||||||
BAN::ErrorOr<long> sys_chown(const char* path, uid_t uid, gid_t gid);
|
|
||||||
|
|
||||||
BAN::ErrorOr<long> sys_socket(int domain, int type, int protocol);
|
BAN::ErrorOr<long> sys_socket(int domain, int type, int protocol);
|
||||||
BAN::ErrorOr<long> sys_getsockname(int socket, sockaddr* address, socklen_t* address_len);
|
BAN::ErrorOr<long> sys_getsockname(int socket, sockaddr* address, socklen_t* address_len);
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
bool g_disable_debug = false;
|
|
||||||
extern Kernel::TerminalDriver* g_terminal_driver;
|
extern Kernel::TerminalDriver* g_terminal_driver;
|
||||||
|
|
||||||
namespace Debug
|
namespace Debug
|
||||||
|
@ -71,9 +70,6 @@ namespace Debug
|
||||||
{
|
{
|
||||||
using namespace Kernel;
|
using namespace Kernel;
|
||||||
|
|
||||||
if (g_disable_debug)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (Kernel::Serial::has_devices())
|
if (Kernel::Serial::has_devices())
|
||||||
return Kernel::Serial::putchar_any(ch);
|
return Kernel::Serial::putchar_any(ch);
|
||||||
if (Kernel::TTY::is_initialized())
|
if (Kernel::TTY::is_initialized())
|
||||||
|
|
|
@ -1103,18 +1103,6 @@ namespace Kernel
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
BAN::ErrorOr<long> Process::sys_fchmod(int fildes, mode_t mode)
|
|
||||||
{
|
|
||||||
if (mode & S_IFMASK)
|
|
||||||
return BAN::Error::from_errno(EINVAL);
|
|
||||||
|
|
||||||
LockGuard _(m_process_lock);
|
|
||||||
auto inode = TRY(m_open_file_descriptors.inode_of(fildes));
|
|
||||||
TRY(inode->chmod(mode));
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
BAN::ErrorOr<long> Process::sys_chown(const char* path, uid_t uid, gid_t gid)
|
BAN::ErrorOr<long> Process::sys_chown(const char* path, uid_t uid, gid_t gid)
|
||||||
{
|
{
|
||||||
LockGuard _(m_process_lock);
|
LockGuard _(m_process_lock);
|
||||||
|
|
|
@ -65,7 +65,6 @@ static bool should_disable_serial(BAN::StringView full_command_line)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern bool g_disable_debug;
|
|
||||||
static ParsedCommandLine cmdline;
|
static ParsedCommandLine cmdline;
|
||||||
|
|
||||||
static void parse_command_line()
|
static void parse_command_line()
|
||||||
|
@ -82,8 +81,6 @@ static void parse_command_line()
|
||||||
cmdline.disable_smp = true;
|
cmdline.disable_smp = true;
|
||||||
else if (argument == "nousb")
|
else if (argument == "nousb")
|
||||||
cmdline.disable_usb = true;
|
cmdline.disable_usb = true;
|
||||||
else if (argument == "nodebug")
|
|
||||||
g_disable_debug = true;
|
|
||||||
else if (argument.starts_with("ps2="))
|
else if (argument.starts_with("ps2="))
|
||||||
{
|
{
|
||||||
if (argument.size() != 5 || !isdigit(argument[4]))
|
if (argument.size() != 5 || !isdigit(argument[4]))
|
||||||
|
|
|
@ -55,7 +55,6 @@ __BEGIN_DECLS
|
||||||
O(SYS_TTY_CTRL, tty_ctrl) \
|
O(SYS_TTY_CTRL, tty_ctrl) \
|
||||||
O(SYS_POWEROFF, poweroff) \
|
O(SYS_POWEROFF, poweroff) \
|
||||||
O(SYS_CHMOD, chmod) \
|
O(SYS_CHMOD, chmod) \
|
||||||
O(SYS_FCHMOD, fchmod) \
|
|
||||||
O(SYS_CREATE, create) \
|
O(SYS_CREATE, create) \
|
||||||
O(SYS_CREATE_DIR, create_dir) \
|
O(SYS_CREATE_DIR, create_dir) \
|
||||||
O(SYS_UNLINK, unlink) \
|
O(SYS_UNLINK, unlink) \
|
||||||
|
|
|
@ -13,9 +13,9 @@ int chmod(const char* path, mode_t mode)
|
||||||
return syscall(SYS_CHMOD, path, mode);
|
return syscall(SYS_CHMOD, path, mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
int fchmod(int fildes, mode_t mode)
|
int fchmod(int, mode_t)
|
||||||
{
|
{
|
||||||
return syscall(SYS_FCHMOD, fildes, mode);
|
ASSERT_NOT_REACHED();
|
||||||
}
|
}
|
||||||
|
|
||||||
int fstat(int fildes, struct stat* buf)
|
int fstat(int fildes, struct stat* buf)
|
||||||
|
|
|
@ -197,18 +197,6 @@ BAN::Vector<BAN::Vector<BAN::String>> parse_command(BAN::StringView command_view
|
||||||
{
|
{
|
||||||
char c = command_view[i];
|
char c = command_view[i];
|
||||||
|
|
||||||
if (i + 1 < command_view.size() && c == '\\')
|
|
||||||
{
|
|
||||||
char next = command_view[i + 1];
|
|
||||||
if (next == '\'' || next == '"')
|
|
||||||
{
|
|
||||||
if (i + 1 < command_view.size())
|
|
||||||
MUST(current_arg.push_back(next));
|
|
||||||
i++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (state)
|
switch (state)
|
||||||
{
|
{
|
||||||
case State::Normal:
|
case State::Normal:
|
||||||
|
|
Loading…
Reference in New Issue