diff --git a/Base/etc/group b/Base/etc/group index 4f712ac979..2fb7986f9c 100644 --- a/Base/etc/group +++ b/Base/etc/group @@ -1,5 +1,5 @@ root:x:0: -goodboys:x:1:anon +wheel:x:1:anon tty:x:2: phys:x:3:window,anon audio:x:4:anon diff --git a/Kernel/Arch/i386/CPU.cpp b/Kernel/Arch/i386/CPU.cpp index 3fce021fcb..9ad0b6ff43 100644 --- a/Kernel/Arch/i386/CPU.cpp +++ b/Kernel/Arch/i386/CPU.cpp @@ -176,7 +176,7 @@ void handle_crash(RegisterState& regs, const char* description, int signal, bool dump(regs); if (Process::current->is_ring0()) { - klog() << "Oh shit, we've crashed in ring 0 :("; + klog() << "Crash in ring 0 :("; dump_backtrace(); hang(); } @@ -819,7 +819,7 @@ void cpu_setup() if (g_cpu_supports_rdrand) { klog() << "x86: Using RDRAND for good randomness"; } else { - klog() << "x86: No RDRAND support detected. Randomness will be shitty"; + klog() << "x86: No RDRAND support detected, randomness will be poor"; } } diff --git a/Kernel/Heap/kmalloc.cpp b/Kernel/Heap/kmalloc.cpp index b33136911a..32a1562c04 100644 --- a/Kernel/Heap/kmalloc.cpp +++ b/Kernel/Heap/kmalloc.cpp @@ -142,7 +142,7 @@ void* kmalloc_impl(size_t size) if (g_kmalloc_bytes_free < real_size) { Kernel::dump_backtrace(); - klog() << "kmalloc(): PANIC! Out of memory (sucks, dude)\nsum_free=" << g_kmalloc_bytes_free << ", real_size=" << real_size; + klog() << "kmalloc(): PANIC! Out of memory\nsum_free=" << g_kmalloc_bytes_free << ", real_size=" << real_size; Kernel::hang(); } diff --git a/Libraries/LibC/getopt.cpp b/Libraries/LibC/getopt.cpp index 46026a47a5..d28d0e3c05 100644 --- a/Libraries/LibC/getopt.cpp +++ b/Libraries/LibC/getopt.cpp @@ -190,7 +190,7 @@ int OptionParser::handle_short_option() bool ok = lookup_short_option(option, needs_value); if (!ok) { optopt = option; - report_error("Unrecognized option \033[1m-%c\033[22m, dude", option); + report_error("Unrecognized option \033[1m-%c\033[22m", option); return '?'; } @@ -218,7 +218,7 @@ int OptionParser::handle_short_option() optarg = m_argv[m_arg_index + 1]; m_consumed_args = 2; } else { - report_error("Missing value for option \033[1m-%c\033[22m, dude", option); + report_error("Missing value for option \033[1m-%c\033[22m", option); return '?'; } } @@ -266,7 +266,7 @@ int OptionParser::handle_long_option() auto* option = lookup_long_option(m_argv[m_arg_index] + 2); if (!option) { - report_error("Unrecognized option \033[1m%s\033[22m, dude", m_argv[m_arg_index]); + report_error("Unrecognized option \033[1m%s\033[22m", m_argv[m_arg_index]); return '?'; } // lookup_long_option() will also set optarg if the value of the option is @@ -278,7 +278,7 @@ int OptionParser::handle_long_option() switch (option->has_arg) { case no_argument: if (optarg) { - report_error("Option \033[1m--%s\033[22m doesn't accept an argument, dude", option->name); + report_error("Option \033[1m--%s\033[22m doesn't accept an argument", option->name); return '?'; } m_consumed_args = 1; @@ -295,7 +295,7 @@ int OptionParser::handle_long_option() optarg = m_argv[m_arg_index + 1]; m_consumed_args = 2; } else { - report_error("Missing value for option \033[1m--%s\033[22m, dude", option->name); + report_error("Missing value for option \033[1m--%s\033[22m", option->name); return '?'; } break; diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh index c52fb9f963..597f4babcd 100755 --- a/Meta/build-root-filesystem.sh +++ b/Meta/build-root-filesystem.sh @@ -2,7 +2,7 @@ set -e -goodboys_gid=1 +wheel_gid=1 tty_gid=2 phys_gid=3 audio_gid=4 @@ -36,8 +36,8 @@ chmod 660 mnt/etc/WindowServer/WindowServer.ini chown $window_uid:$window_gid mnt/etc/WindowServer/WindowServer.ini echo "/bin/sh" > mnt/etc/shells -chown 0:$goodboys_gid mnt/bin/su -chown 0:$goodboys_gid mnt/bin/KeyboardSettings +chown 0:$wheel_gid mnt/bin/su +chown 0:$wheel_gid mnt/bin/KeyboardSettings chown 0:$phys_gid mnt/bin/shutdown chown 0:$phys_gid mnt/bin/reboot chown 0:0 mnt/boot/Kernel diff --git a/Services/WebServer/Client.cpp b/Services/WebServer/Client.cpp index 14c4f927d1..c1ee2906cd 100644 --- a/Services/WebServer/Client.cpp +++ b/Services/WebServer/Client.cpp @@ -78,7 +78,7 @@ void Client::handle_request(ByteBuffer raw_request) } if (request.method() != HTTP::HttpRequest::Method::GET) { - send_error_response(403, "Forbidden, bro!", request); + send_error_response(403, "Forbidden!", request); return; } @@ -115,7 +115,7 @@ void Client::handle_request(ByteBuffer raw_request) auto file = Core::File::construct(real_path); if (!file->open(Core::File::ReadOnly)) { - send_error_response(404, "Not found, bro!", request); + send_error_response(404, "Not found!", request); return; } diff --git a/Shell/Shell.cpp b/Shell/Shell.cpp index ebd92596c7..ef210441e0 100644 --- a/Shell/Shell.cpp +++ b/Shell/Shell.cpp @@ -339,7 +339,7 @@ int Shell::builtin_exit(int, const char**) { if (!jobs.is_empty()) { if (!m_should_ignore_jobs_on_next_exit) { - printf("Shell: Hey dude, you have %zu active job%s, run 'exit' again to really exit.\n", jobs.size(), jobs.size() > 1 ? "s" : ""); + printf("Shell: You have %zu active job%s, run 'exit' again to really exit.\n", jobs.size(), jobs.size() > 1 ? "s" : ""); m_should_ignore_jobs_on_next_exit = true; return 1; } diff --git a/Userland/cat.cpp b/Userland/cat.cpp index a234c2b21e..a20983295f 100644 --- a/Userland/cat.cpp +++ b/Userland/cat.cpp @@ -35,21 +35,6 @@ #include #include -bool detect_useless_use_of_cat(int argc) -{ - // I can think of somewhat valid uses of zero-argument cat - // from a tty to a pipe, so let's allow those. - if (argc != 2) - return false; - - struct stat statbuf; - int rc = fstat(1, &statbuf); - if (rc < 0) - return false; - - return S_ISFIFO(statbuf.st_mode); -} - int main(int argc, char** argv) { if (pledge("stdio rpath", nullptr) < 0) { @@ -63,9 +48,6 @@ int main(int argc, char** argv) args_parser.add_positional_argument(paths, "File path", "path", Core::ArgsParser::Required::No); args_parser.parse(argc, argv); - if (detect_useless_use_of_cat(argc)) - fprintf(stderr, "\033[34;1mMeow! Useless use of cat detected\033[0m\n"); - Vector fds; if (!paths.is_empty()) { for (const char* path : paths) {