apps+libc+libos: Remove _LUNA_SYSTEM_ERROR_EXTENSIONS and reorder headers
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
libluna/libos headers can now go after errno.h, so there's no reason to keep them separate.
This commit is contained in:
parent
052ae4902e
commit
0fad179485
@ -1,6 +1,5 @@
|
|||||||
#include <os/ArgumentParser.h>
|
#include <os/ArgumentParser.h>
|
||||||
#include <os/File.h>
|
#include <os/File.h>
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
|
#include <errno.h>
|
||||||
|
#include <fcntl.h>
|
||||||
#include <luna/PathParser.h>
|
#include <luna/PathParser.h>
|
||||||
#include <luna/String.h>
|
#include <luna/String.h>
|
||||||
#include <luna/Vector.h>
|
#include <luna/Vector.h>
|
||||||
#include <os/Directory.h>
|
#include <os/Directory.h>
|
||||||
#include <os/File.h>
|
#include <os/File.h>
|
||||||
#include <os/Process.h>
|
#include <os/Process.h>
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
|
#include <fcntl.h>
|
||||||
#include <os/ArgumentParser.h>
|
#include <os/ArgumentParser.h>
|
||||||
#include <os/Directory.h>
|
#include <os/Directory.h>
|
||||||
#include <os/File.h>
|
#include <os/File.h>
|
||||||
#include <os/FileSystem.h>
|
#include <os/FileSystem.h>
|
||||||
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
@ -39,11 +38,13 @@ Result<int> luna_main(int argc, char** argv)
|
|||||||
|
|
||||||
files = TRY(dir->list(filter));
|
files = TRY(dir->list(filter));
|
||||||
}
|
}
|
||||||
else
|
else if (os::FileSystem::exists(pathname))
|
||||||
{
|
{
|
||||||
auto str = TRY(String::from_string_view(pathname));
|
auto str = TRY(String::from_string_view(pathname));
|
||||||
TRY(files.try_append(move(str)));
|
TRY(files.try_append(move(str)));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
return err(ENOENT);
|
||||||
|
|
||||||
if (!long_list)
|
if (!long_list)
|
||||||
{
|
{
|
||||||
|
@ -1,11 +1,10 @@
|
|||||||
|
#include <errno.h>
|
||||||
#include <luna/String.h>
|
#include <luna/String.h>
|
||||||
#include <luna/Vector.h>
|
#include <luna/Vector.h>
|
||||||
#include <os/ArgumentParser.h>
|
#include <os/ArgumentParser.h>
|
||||||
#include <os/File.h>
|
#include <os/File.h>
|
||||||
#include <os/FileSystem.h>
|
#include <os/FileSystem.h>
|
||||||
#include <os/Process.h>
|
#include <os/Process.h>
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
|
#include <errno.h>
|
||||||
#include <luna/ScopeGuard.h>
|
#include <luna/ScopeGuard.h>
|
||||||
#include <luna/Vector.h>
|
#include <luna/Vector.h>
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
extern "C" char** environ;
|
extern "C" char** environ;
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
#define _LUNA_SYSTEM_ERROR_EXTENSIONS
|
|
||||||
#include <bits/errno-return.h>
|
#include <bits/errno-return.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <luna/Format.h>
|
#include <luna/Format.h>
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
#define _LUNA_SYSTEM_ERROR_EXTENSIONS
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <luna/Heap.h>
|
#include <luna/Heap.h>
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
#define _LUNA_SYSTEM_ERROR_EXTENSIONS
|
|
||||||
#include <bits/errno-return.h>
|
#include <bits/errno-return.h>
|
||||||
#include <luna/Heap.h>
|
#include <luna/Heap.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
#define _LUNA_SYSTEM_ERROR_EXTENSIONS
|
|
||||||
#include <bits/errno-return.h>
|
#include <bits/errno-return.h>
|
||||||
#include <luna/Check.h>
|
#include <luna/Check.h>
|
||||||
#include <luna/Format.h>
|
#include <luna/Format.h>
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
#include <luna/StringBuilder.h>
|
|
||||||
#include <luna/Vector.h>
|
|
||||||
|
|
||||||
#include <bits/errno-return.h>
|
#include <bits/errno-return.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <luna/StringBuilder.h>
|
||||||
|
#include <luna/Vector.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
#include <luna/CString.h>
|
|
||||||
#include <os/Directory.h>
|
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <luna/CString.h>
|
||||||
|
#include <os/Directory.h>
|
||||||
#include <sys/syscall.h>
|
#include <sys/syscall.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
#include <luna/String.h>
|
|
||||||
#include <os/Directory.h>
|
|
||||||
#include <os/FileSystem.h>
|
|
||||||
|
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <luna/String.h>
|
||||||
|
#include <os/Directory.h>
|
||||||
|
#include <os/FileSystem.h>
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
#include <os/Main.h>
|
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <os/Main.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
int g_argc;
|
int g_argc;
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
#include <os/Process.h>
|
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <os/Process.h>
|
||||||
#include <sys/syscall.h>
|
#include <sys/syscall.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user