From e16894af5affa556d9198feef864e27d19d504fb Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Boric <jblbeurope@gmail.com>
Date: Fri, 14 May 2021 16:32:57 +0200
Subject: [PATCH] LibC: Do not include errno.h inside unistd.h

POSIX does not mandate this, therefore let's not do it.
---
 Tests/Kernel/bind-local-socket-to-symlink.cpp           | 1 +
 Tests/Kernel/crash-fcntl-invalid-cmd.cpp                | 1 +
 Tests/Kernel/setpgid-across-sessions-without-leader.cpp | 1 +
 Tests/LibC/TestLibCExec.cpp                             | 1 +
 Tests/LibPthread/TestLibPthreadSpinLocks.cpp            | 1 +
 Userland/Libraries/LibC/malloc.cpp                      | 1 +
 Userland/Libraries/LibC/netdb.cpp                       | 1 +
 Userland/Libraries/LibC/pthread_integration.cpp         | 1 +
 Userland/Libraries/LibC/pthread_tls.cpp                 | 1 +
 Userland/Libraries/LibC/pty.cpp                         | 1 +
 Userland/Libraries/LibC/pwd.cpp                         | 2 +-
 Userland/Libraries/LibC/shadow.cpp                      | 2 +-
 Userland/Libraries/LibC/spawn.cpp                       | 1 +
 Userland/Libraries/LibC/sys/wait.cpp                    | 1 +
 Userland/Libraries/LibC/unistd.h                        | 1 -
 Userland/Libraries/LibCore/FileWatcher.cpp              | 1 +
 Userland/Libraries/LibIPC/Decoder.cpp                   | 1 +
 Userland/Libraries/LibPthread/pthread.cpp               | 1 +
 Userland/Services/KeyboardPreferenceLoader/main.cpp     | 1 +
 Userland/Services/LaunchServer/Launcher.cpp             | 1 +
 Userland/Utilities/find.cpp                             | 1 +
 Userland/Utilities/flock.cpp                            | 1 +
 Userland/Utilities/mkdir.cpp                            | 1 +
 Userland/Utilities/mktemp.cpp                           | 1 +
 Userland/Utilities/ping.cpp                             | 1 +
 Userland/Utilities/sleep.cpp                            | 1 +
 Userland/Utilities/test-unveil.cpp                      | 1 +
 Userland/Utilities/test_efault.cpp                      | 1 +
 Userland/Utilities/traceroute.cpp                       | 1 +
 Userland/Utilities/tt.cpp                               | 1 +
 Userland/Utilities/useradd.cpp                          | 1 +
 Userland/Utilities/watch.cpp                            | 1 +
 32 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/Tests/Kernel/bind-local-socket-to-symlink.cpp b/Tests/Kernel/bind-local-socket-to-symlink.cpp
index d06d548704..fed92a90a9 100644
--- a/Tests/Kernel/bind-local-socket-to-symlink.cpp
+++ b/Tests/Kernel/bind-local-socket-to-symlink.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <AK/Assertions.h>
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
diff --git a/Tests/Kernel/crash-fcntl-invalid-cmd.cpp b/Tests/Kernel/crash-fcntl-invalid-cmd.cpp
index ab5083f952..cd81095c58 100644
--- a/Tests/Kernel/crash-fcntl-invalid-cmd.cpp
+++ b/Tests/Kernel/crash-fcntl-invalid-cmd.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Tests/Kernel/setpgid-across-sessions-without-leader.cpp b/Tests/Kernel/setpgid-across-sessions-without-leader.cpp
index f83b695941..e22c041880 100644
--- a/Tests/Kernel/setpgid-across-sessions-without-leader.cpp
+++ b/Tests/Kernel/setpgid-across-sessions-without-leader.cpp
@@ -6,6 +6,7 @@
 
 #include <AK/Assertions.h>
 #include <AK/Format.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <serenity.h>
 #include <stdio.h>
diff --git a/Tests/LibC/TestLibCExec.cpp b/Tests/LibC/TestLibCExec.cpp
index 25eefa5f46..c583549964 100644
--- a/Tests/LibC/TestLibCExec.cpp
+++ b/Tests/LibC/TestLibCExec.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <LibTest/TestCase.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/Tests/LibPthread/TestLibPthreadSpinLocks.cpp b/Tests/LibPthread/TestLibPthreadSpinLocks.cpp
index 5cd13ec61a..57513fb051 100644
--- a/Tests/LibPthread/TestLibPthreadSpinLocks.cpp
+++ b/Tests/LibPthread/TestLibPthreadSpinLocks.cpp
@@ -6,6 +6,7 @@
 
 #include <LibPthread/pthread.h>
 #include <LibTest/TestCase.h>
+#include <errno.h>
 #include <unistd.h>
 
 TEST_CASE(spin_init_process_scope)
diff --git a/Userland/Libraries/LibC/malloc.cpp b/Userland/Libraries/LibC/malloc.cpp
index a588aa88cb..c175c02daf 100644
--- a/Userland/Libraries/LibC/malloc.cpp
+++ b/Userland/Libraries/LibC/malloc.cpp
@@ -11,6 +11,7 @@
 #include <LibELF/AuxiliaryVector.h>
 #include <LibThread/Lock.h>
 #include <assert.h>
+#include <errno.h>
 #include <mallocdefs.h>
 #include <serenity.h>
 #include <stdio.h>
diff --git a/Userland/Libraries/LibC/netdb.cpp b/Userland/Libraries/LibC/netdb.cpp
index 324e48204d..0fe5ba2063 100644
--- a/Userland/Libraries/LibC/netdb.cpp
+++ b/Userland/Libraries/LibC/netdb.cpp
@@ -10,6 +10,7 @@
 #include <AK/String.h>
 #include <Kernel/Net/IPv4.h>
 #include <arpa/inet.h>
+#include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <stdio.h>
diff --git a/Userland/Libraries/LibC/pthread_integration.cpp b/Userland/Libraries/LibC/pthread_integration.cpp
index 55677d5b3d..6a0c895dbc 100644
--- a/Userland/Libraries/LibC/pthread_integration.cpp
+++ b/Userland/Libraries/LibC/pthread_integration.cpp
@@ -8,6 +8,7 @@
 #include <AK/NeverDestroyed.h>
 #include <AK/Vector.h>
 #include <bits/pthread_integration.h>
+#include <errno.h>
 #include <sched.h>
 #include <unistd.h>
 
diff --git a/Userland/Libraries/LibC/pthread_tls.cpp b/Userland/Libraries/LibC/pthread_tls.cpp
index 74e6471efe..6c32260dcd 100644
--- a/Userland/Libraries/LibC/pthread_tls.cpp
+++ b/Userland/Libraries/LibC/pthread_tls.cpp
@@ -6,6 +6,7 @@
 
 #include <AK/Atomic.h>
 #include <LibPthread/pthread.h>
+#include <errno.h>
 #include <unistd.h>
 
 #ifndef _DYNAMIC_LOADER
diff --git a/Userland/Libraries/LibC/pty.cpp b/Userland/Libraries/LibC/pty.cpp
index e514c60924..b2ad1e10ba 100644
--- a/Userland/Libraries/LibC/pty.cpp
+++ b/Userland/Libraries/LibC/pty.cpp
@@ -7,6 +7,7 @@
  */
 
 #include <AK/Format.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <pty.h>
 #include <stdlib.h>
diff --git a/Userland/Libraries/LibC/pwd.cpp b/Userland/Libraries/LibC/pwd.cpp
index 39552a9576..e55691d592 100644
--- a/Userland/Libraries/LibC/pwd.cpp
+++ b/Userland/Libraries/LibC/pwd.cpp
@@ -7,7 +7,7 @@
 #include <AK/String.h>
 #include <AK/TemporaryChange.h>
 #include <AK/Vector.h>
-#include <errno_numbers.h>
+#include <errno.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Userland/Libraries/LibC/shadow.cpp b/Userland/Libraries/LibC/shadow.cpp
index c79c7fc218..7dce928c61 100644
--- a/Userland/Libraries/LibC/shadow.cpp
+++ b/Userland/Libraries/LibC/shadow.cpp
@@ -8,7 +8,7 @@
 #include <AK/String.h>
 #include <AK/TemporaryChange.h>
 #include <AK/Vector.h>
-#include <errno_numbers.h>
+#include <errno.h>
 #include <shadow.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Userland/Libraries/LibC/spawn.cpp b/Userland/Libraries/LibC/spawn.cpp
index 4fd903dd10..297c5d4d9c 100644
--- a/Userland/Libraries/LibC/spawn.cpp
+++ b/Userland/Libraries/LibC/spawn.cpp
@@ -15,6 +15,7 @@
 
 #include <AK/Function.h>
 #include <AK/Vector.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Userland/Libraries/LibC/sys/wait.cpp b/Userland/Libraries/LibC/sys/wait.cpp
index f682681688..62ee188dee 100644
--- a/Userland/Libraries/LibC/sys/wait.cpp
+++ b/Userland/Libraries/LibC/sys/wait.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <assert.h>
+#include <errno.h>
 #include <sys/wait.h>
 #include <syscall.h>
 #include <unistd.h>
diff --git a/Userland/Libraries/LibC/unistd.h b/Userland/Libraries/LibC/unistd.h
index acfd13c2bc..7fdd3bd902 100644
--- a/Userland/Libraries/LibC/unistd.h
+++ b/Userland/Libraries/LibC/unistd.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include <errno.h>
 #include <fd_set.h>
 #include <limits.h>
 #include <sys/cdefs.h>
diff --git a/Userland/Libraries/LibCore/FileWatcher.cpp b/Userland/Libraries/LibCore/FileWatcher.cpp
index 7b7f64da37..cab5fec492 100644
--- a/Userland/Libraries/LibCore/FileWatcher.cpp
+++ b/Userland/Libraries/LibCore/FileWatcher.cpp
@@ -18,6 +18,7 @@
 #include <Kernel/API/InodeWatcherFlags.h>
 #include <LibCore/DirIterator.h>
 #include <LibCore/Notifier.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/Userland/Libraries/LibIPC/Decoder.cpp b/Userland/Libraries/LibIPC/Decoder.cpp
index 66a3aed90a..ed63dc6472 100644
--- a/Userland/Libraries/LibIPC/Decoder.cpp
+++ b/Userland/Libraries/LibIPC/Decoder.cpp
@@ -11,6 +11,7 @@
 #include <LibIPC/Decoder.h>
 #include <LibIPC/Dictionary.h>
 #include <LibIPC/File.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/socket.h>
diff --git a/Userland/Libraries/LibPthread/pthread.cpp b/Userland/Libraries/LibPthread/pthread.cpp
index f4136524ce..b9f311d8e0 100644
--- a/Userland/Libraries/LibPthread/pthread.cpp
+++ b/Userland/Libraries/LibPthread/pthread.cpp
@@ -12,6 +12,7 @@
 #include <Kernel/API/Syscall.h>
 #include <LibSystem/syscall.h>
 #include <bits/pthread_integration.h>
+#include <errno.h>
 #include <limits.h>
 #include <pthread.h>
 #include <serenity.h>
diff --git a/Userland/Services/KeyboardPreferenceLoader/main.cpp b/Userland/Services/KeyboardPreferenceLoader/main.cpp
index 83dcbe6bcb..16fb65d06d 100644
--- a/Userland/Services/KeyboardPreferenceLoader/main.cpp
+++ b/Userland/Services/KeyboardPreferenceLoader/main.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <LibCore/ConfigFile.h>
+#include <errno.h>
 #include <spawn.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/Userland/Services/LaunchServer/Launcher.cpp b/Userland/Services/LaunchServer/Launcher.cpp
index 63eb77c98a..6464b8d4c1 100644
--- a/Userland/Services/LaunchServer/Launcher.cpp
+++ b/Userland/Services/LaunchServer/Launcher.cpp
@@ -13,6 +13,7 @@
 #include <AK/StringBuilder.h>
 #include <LibCore/ConfigFile.h>
 #include <LibDesktop/AppFile.h>
+#include <errno.h>
 #include <serenity.h>
 #include <spawn.h>
 #include <stdio.h>
diff --git a/Userland/Utilities/find.cpp b/Userland/Utilities/find.cpp
index 2db8e17f3c..de21073329 100644
--- a/Userland/Utilities/find.cpp
+++ b/Userland/Utilities/find.cpp
@@ -9,6 +9,7 @@
 #include <AK/OwnPtr.h>
 #include <AK/Vector.h>
 #include <LibCore/DirIterator.h>
+#include <errno.h>
 #include <getopt.h>
 #include <grp.h>
 #include <pwd.h>
diff --git a/Userland/Utilities/flock.cpp b/Userland/Utilities/flock.cpp
index b4e2fa654e..e63e248a5e 100644
--- a/Userland/Utilities/flock.cpp
+++ b/Userland/Utilities/flock.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <errno.h>
 #include <spawn.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Userland/Utilities/mkdir.cpp b/Userland/Utilities/mkdir.cpp
index 8ed51e6739..0a3e4c57dd 100644
--- a/Userland/Utilities/mkdir.cpp
+++ b/Userland/Utilities/mkdir.cpp
@@ -8,6 +8,7 @@
 #include <AK/LexicalPath.h>
 #include <AK/StringBuilder.h>
 #include <LibCore/ArgsParser.h>
+#include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/Userland/Utilities/mktemp.cpp b/Userland/Utilities/mktemp.cpp
index daf4f77168..d40f8c5d1e 100644
--- a/Userland/Utilities/mktemp.cpp
+++ b/Userland/Utilities/mktemp.cpp
@@ -7,6 +7,7 @@
 #include <AK/LexicalPath.h>
 #include <AK/Random.h>
 #include <LibCore/ArgsParser.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/Userland/Utilities/ping.cpp b/Userland/Utilities/ping.cpp
index ef33e8e280..d554692bf4 100644
--- a/Userland/Utilities/ping.cpp
+++ b/Userland/Utilities/ping.cpp
@@ -6,6 +6,7 @@
 
 #include <LibCore/ArgsParser.h>
 #include <arpa/inet.h>
+#include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/ip_icmp.h>
diff --git a/Userland/Utilities/sleep.cpp b/Userland/Utilities/sleep.cpp
index a727315c48..50d3b3031a 100644
--- a/Userland/Utilities/sleep.cpp
+++ b/Userland/Utilities/sleep.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <LibCore/ArgsParser.h>
+#include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/Userland/Utilities/test-unveil.cpp b/Userland/Utilities/test-unveil.cpp
index 003dc748a1..047d15bda1 100644
--- a/Userland/Utilities/test-unveil.cpp
+++ b/Userland/Utilities/test-unveil.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <LibCore/ArgsParser.h>
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/Userland/Utilities/test_efault.cpp b/Userland/Utilities/test_efault.cpp
index e0e5ea5a09..0967e3b970 100644
--- a/Userland/Utilities/test_efault.cpp
+++ b/Userland/Utilities/test_efault.cpp
@@ -6,6 +6,7 @@
 
 #include <AK/Assertions.h>
 #include <AK/Types.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/mman.h>
diff --git a/Userland/Utilities/traceroute.cpp b/Userland/Utilities/traceroute.cpp
index ed6a097c3f..704a2de992 100644
--- a/Userland/Utilities/traceroute.cpp
+++ b/Userland/Utilities/traceroute.cpp
@@ -8,6 +8,7 @@
 #include <LibCore/ArgsParser.h>
 #include <LibCore/ElapsedTimer.h>
 #include <arpa/inet.h>
+#include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/ip_icmp.h>
diff --git a/Userland/Utilities/tt.cpp b/Userland/Utilities/tt.cpp
index 8584e48b71..599425ee57 100644
--- a/Userland/Utilities/tt.cpp
+++ b/Userland/Utilities/tt.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <LibCore/ArgsParser.h>
+#include <errno.h>
 #include <mman.h>
 #include <pthread.h>
 #include <stdio.h>
diff --git a/Userland/Utilities/useradd.cpp b/Userland/Utilities/useradd.cpp
index 2b70a63baa..76eacccff1 100644
--- a/Userland/Utilities/useradd.cpp
+++ b/Userland/Utilities/useradd.cpp
@@ -6,6 +6,7 @@
 #include <AK/String.h>
 #include <LibCore/ArgsParser.h>
 #include <ctype.h>
+#include <errno.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/Userland/Utilities/watch.cpp b/Userland/Utilities/watch.cpp
index 50e52c6b87..4054b4b0f8 100644
--- a/Userland/Utilities/watch.cpp
+++ b/Userland/Utilities/watch.cpp
@@ -9,6 +9,7 @@
 #include <AK/Time.h>
 #include <AK/Vector.h>
 #include <LibCore/ArgsParser.h>
+#include <errno.h>
 #include <spawn.h>
 #include <stdio.h>
 #include <sys/time.h>