4 éve · ececac65c2
--- a/Meta/Lagom/CMakeLists.txt
+++ b/Meta/Lagom/CMakeLists.txt
@@ -91,27 +91,27 @@ if (BUILD_LAGOM)
 
				         target_link_libraries(TestJson Lagom)
			
 
				         target_link_libraries(TestJson stdc++)
			
 
				 
			
 
				-        add_executable(adjtime_lagom ../../Userland/adjtime.cpp)
			
 
				+        add_executable(adjtime_lagom ../../Userland/Utilities/adjtime.cpp)
			
 
				         set_target_properties(adjtime_lagom PROPERTIES OUTPUT_NAME adjtime)
			
 
				         target_link_libraries(adjtime_lagom Lagom)
			
 
				 
			
 
				-        add_executable(js_lagom ../../Userland/js.cpp)
			
 
				+        add_executable(js_lagom ../../Userland/Utilities/js.cpp)
			
 
				         set_target_properties(js_lagom PROPERTIES OUTPUT_NAME js)
			
 
				         target_link_libraries(js_lagom Lagom)
			
 
				         target_link_libraries(js_lagom stdc++)
			
 
				         target_link_libraries(js_lagom pthread)
			
 
				 
			
 
				-        add_executable(ntpquery_lagom ../../Userland/ntpquery.cpp)
			
 
				+        add_executable(ntpquery_lagom ../../Userland/Utilities/ntpquery.cpp)
			
 
				         set_target_properties(ntpquery_lagom PROPERTIES OUTPUT_NAME ntpquery)
			
 
				         target_link_libraries(ntpquery_lagom Lagom)
			
 
				 
			
 
				-        add_executable(test-js_lagom ../../Userland/test-js.cpp)
			
 
				+        add_executable(test-js_lagom ../../Userland/Utilities/test-js.cpp)
			
 
				         set_target_properties(test-js_lagom PROPERTIES OUTPUT_NAME test-js)
			
 
				         target_link_libraries(test-js_lagom Lagom)
			
 
				         target_link_libraries(test-js_lagom stdc++)
			
 
				         target_link_libraries(test-js_lagom pthread)
			
 
				 
			
 
				-        add_executable(test-crypto_lagom ../../Userland/test-crypto.cpp)
			
 
				+        add_executable(test-crypto_lagom ../../Userland/Utilities/test-crypto.cpp)
			
 
				         set_target_properties(test-crypto_lagom PROPERTIES OUTPUT_NAME test-crypto)
			
 
				         target_link_libraries(test-crypto_lagom Lagom)
			
 
				         target_link_libraries(test-crypto_lagom stdc++)
			
@@ -121,12 +121,12 @@ if (BUILD_LAGOM)
 
				             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
			
 
				         )
			
 
				 
			
 
				-        add_executable(test-compress_lagom ../../Userland/test-compress.cpp)
			
 
				+        add_executable(test-compress_lagom ../../Userland/Utilities/test-compress.cpp)
			
 
				         set_target_properties(test-compress_lagom PROPERTIES OUTPUT_NAME test-compress)
			
 
				         target_link_libraries(test-compress_lagom Lagom)
			
 
				         target_link_libraries(test-compress_lagom stdc++)
			
 
				 
			
 
				-        add_executable(disasm_lagom ../../Userland/disasm.cpp)
			
 
				+        add_executable(disasm_lagom ../../Userland/Utilities/disasm.cpp)
			
 
				         set_target_properties(disasm_lagom PROPERTIES OUTPUT_NAME disasm)
			
 
				         target_link_libraries(disasm_lagom Lagom)
			
 
				         target_link_libraries(disasm_lagom stdc++)
			
@@ -137,7 +137,7 @@ if (BUILD_LAGOM)
 
				         target_link_libraries(shell_lagom stdc++)
			
 
				         target_link_libraries(shell_lagom pthread)
			
 
				 
			
 
				-        add_executable(gml-format_lagom ../../Userland/gml-format.cpp)
			
 
				+        add_executable(gml-format_lagom ../../Userland/Utilities/gml-format.cpp)
			
 
				         set_target_properties(gml-format_lagom PROPERTIES OUTPUT_NAME gml-format)
			
 
				         target_link_libraries(gml-format_lagom Lagom)
			
 
				         target_link_libraries(gml-format_lagom stdc++)
			
--- a/Userland/CMakeLists.txt
+++ b/Userland/CMakeLists.txt
@@ -1,53 +1,4 @@
 
				-file(GLOB CMD_SOURCES  CONFIGURE_DEPENDS "*.cpp")
			
 
				-list(APPEND SPECIAL_TARGETS "test" "install")
			
 
				-
			
 
				-foreach(CMD_SRC ${CMD_SOURCES})
			
 
				-    get_filename_component(CMD_NAME ${CMD_SRC} NAME_WE)
			
 
				-    if (CMD_NAME IN_LIST SPECIAL_TARGETS)
			
 
				-        add_executable("${CMD_NAME}-bin" ${CMD_SRC})
			
 
				-        target_link_libraries("${CMD_NAME}-bin" LibCore)
			
 
				-        install(TARGETS "${CMD_NAME}-bin" RUNTIME DESTINATION bin)
			
 
				-        install(CODE "execute_process(COMMAND mv ${CMD_NAME}-bin ${CMD_NAME} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)")
			
 
				-    else ()
			
 
				-        add_executable(${CMD_NAME} ${CMD_SRC})
			
 
				-        target_link_libraries(${CMD_NAME} LibCore)
			
 
				-        install(TARGETS ${CMD_NAME} RUNTIME DESTINATION bin)
			
 
				-    endif()
			
 
				-endforeach()
			
 
				-
			
 
				-target_link_libraries(aplay LibAudio)
			
 
				-target_link_libraries(avol LibAudio)
			
 
				-target_link_libraries(checksum LibCrypto)
			
 
				-target_link_libraries(copy LibGUI)
			
 
				-target_link_libraries(disasm LibX86)
			
 
				-target_link_libraries(expr LibRegex)
			
 
				-target_link_libraries(functrace LibDebug LibX86)
			
 
				-target_link_libraries(gml-format LibGUI)
			
 
				-target_link_libraries(html LibWeb)
			
 
				-target_link_libraries(js LibJS LibLine)
			
 
				-target_link_libraries(keymap LibKeyboard)
			
 
				-target_link_libraries(lspci LibPCIDB)
			
 
				-target_link_libraries(man LibMarkdown)
			
 
				-target_link_libraries(md LibMarkdown)
			
 
				-target_link_libraries(misbehaving-application LibCore)
			
 
				-target_link_libraries(notify LibGUI)
			
 
				-target_link_libraries(open LibDesktop)
			
 
				-target_link_libraries(pape LibGUI)
			
 
				-target_link_libraries(passwd LibCrypt)
			
 
				-target_link_libraries(paste LibGUI)
			
 
				-target_link_libraries(pro LibProtocol)
			
 
				-target_link_libraries(su LibCrypt)
			
 
				-target_link_libraries(tar LibTar LibCompress)
			
 
				-target_link_libraries(test-crypto LibCrypto LibTLS LibLine)
			
 
				-target_link_libraries(test-compress LibCompress)
			
 
				-target_link_libraries(test-gfx-font LibGUI LibCore)
			
 
				-target_link_libraries(test-js LibJS LibLine LibCore)
			
 
				-target_link_libraries(test-pthread LibThread)
			
 
				-target_link_libraries(test-web LibWeb)
			
 
				-target_link_libraries(tt LibPthread)
			
 
				-target_link_libraries(grep LibRegex)
			
 
				-target_link_libraries(gunzip LibCompress)
			
 
				-
			
 
				 add_subdirectory(DynamicLoader)
			
 
				 add_subdirectory(Shell)
			
 
				 add_subdirectory(Tests)
			
 
				+add_subdirectory(Utilities)
			
--- a/Userland/Utilities/CMakeLists.txt
+++ b/Userland/Utilities/CMakeLists.txt
@@ -0,0 +1,49 @@
 
				+file(GLOB CMD_SOURCES  CONFIGURE_DEPENDS "*.cpp")
			
 
				+list(APPEND SPECIAL_TARGETS "test" "install")
			
 
				+
			
 
				+foreach(CMD_SRC ${CMD_SOURCES})
			
 
				+    get_filename_component(CMD_NAME ${CMD_SRC} NAME_WE)
			
 
				+    if (CMD_NAME IN_LIST SPECIAL_TARGETS)
			
 
				+        add_executable("${CMD_NAME}-bin" ${CMD_SRC})
			
 
				+        target_link_libraries("${CMD_NAME}-bin" LibCore)
			
 
				+        install(TARGETS "${CMD_NAME}-bin" RUNTIME DESTINATION bin)
			
 
				+        install(CODE "execute_process(COMMAND mv ${CMD_NAME}-bin ${CMD_NAME} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)")
			
 
				+    else ()
			
 
				+        add_executable(${CMD_NAME} ${CMD_SRC})
			
 
				+        target_link_libraries(${CMD_NAME} LibCore)
			
 
				+        install(TARGETS ${CMD_NAME} RUNTIME DESTINATION bin)
			
 
				+    endif()
			
 
				+endforeach()
			
 
				+
			
 
				+target_link_libraries(aplay LibAudio)
			
 
				+target_link_libraries(avol LibAudio)
			
 
				+target_link_libraries(checksum LibCrypto)
			
 
				+target_link_libraries(copy LibGUI)
			
 
				+target_link_libraries(disasm LibX86)
			
 
				+target_link_libraries(expr LibRegex)
			
 
				+target_link_libraries(functrace LibDebug LibX86)
			
 
				+target_link_libraries(gml-format LibGUI)
			
 
				+target_link_libraries(html LibWeb)
			
 
				+target_link_libraries(js LibJS LibLine)
			
 
				+target_link_libraries(keymap LibKeyboard)
			
 
				+target_link_libraries(lspci LibPCIDB)
			
 
				+target_link_libraries(man LibMarkdown)
			
 
				+target_link_libraries(md LibMarkdown)
			
 
				+target_link_libraries(misbehaving-application LibCore)
			
 
				+target_link_libraries(notify LibGUI)
			
 
				+target_link_libraries(open LibDesktop)
			
 
				+target_link_libraries(pape LibGUI)
			
 
				+target_link_libraries(passwd LibCrypt)
			
 
				+target_link_libraries(paste LibGUI)
			
 
				+target_link_libraries(pro LibProtocol)
			
 
				+target_link_libraries(su LibCrypt)
			
 
				+target_link_libraries(tar LibTar LibCompress)
			
 
				+target_link_libraries(test-crypto LibCrypto LibTLS LibLine)
			
 
				+target_link_libraries(test-compress LibCompress)
			
 
				+target_link_libraries(test-gfx-font LibGUI LibCore)
			
 
				+target_link_libraries(test-js LibJS LibLine LibCore)
			
 
				+target_link_libraries(test-pthread LibThread)
			
 
				+target_link_libraries(test-web LibWeb)
			
 
				+target_link_libraries(tt LibPthread)
			
 
				+target_link_libraries(grep LibRegex)
			
 
				+target_link_libraries(gunzip LibCompress)
			
--- a/Userland/Utilities/adjtime.cpp
+++ b/Userland/Utilities/adjtime.cpp
--- a/Userland/Utilities/allocate.cpp
+++ b/Userland/Utilities/allocate.cpp
--- a/Userland/Utilities/aplay.cpp
+++ b/Userland/Utilities/aplay.cpp
--- a/Userland/Utilities/arp.cpp
+++ b/Userland/Utilities/arp.cpp
--- a/Userland/Utilities/avol.cpp
+++ b/Userland/Utilities/avol.cpp
--- a/Userland/Utilities/base64.cpp
+++ b/Userland/Utilities/base64.cpp
--- a/Userland/Utilities/basename.cpp
+++ b/Userland/Utilities/basename.cpp
--- a/Userland/Utilities/beep.cpp
+++ b/Userland/Utilities/beep.cpp
--- a/Userland/Utilities/cal.cpp
+++ b/Userland/Utilities/cal.cpp
--- a/Userland/Utilities/cat.cpp
+++ b/Userland/Utilities/cat.cpp
--- a/Userland/Utilities/checksum.cpp
+++ b/Userland/Utilities/checksum.cpp
--- a/Userland/Utilities/chgrp.cpp
+++ b/Userland/Utilities/chgrp.cpp
--- a/Userland/Utilities/chmod.cpp
+++ b/Userland/Utilities/chmod.cpp
--- a/Userland/Utilities/chown.cpp
+++ b/Userland/Utilities/chown.cpp
--- a/Userland/Utilities/chroot.cpp
+++ b/Userland/Utilities/chroot.cpp
--- a/Userland/Utilities/clear.cpp
+++ b/Userland/Utilities/clear.cpp
--- a/Userland/Utilities/copy.cpp
+++ b/Userland/Utilities/copy.cpp
--- a/Userland/Utilities/cp.cpp
+++ b/Userland/Utilities/cp.cpp
--- a/Userland/Utilities/crash.cpp
+++ b/Userland/Utilities/crash.cpp
--- a/Userland/Utilities/cut.cpp
+++ b/Userland/Utilities/cut.cpp
--- a/Userland/Utilities/date.cpp
+++ b/Userland/Utilities/date.cpp
--- a/Userland/Utilities/ddate.cpp
+++ b/Userland/Utilities/ddate.cpp
--- a/Userland/Utilities/df.cpp
+++ b/Userland/Utilities/df.cpp
--- a/Userland/Utilities/dirname.cpp
+++ b/Userland/Utilities/dirname.cpp
--- a/Userland/Utilities/disasm.cpp
+++ b/Userland/Utilities/disasm.cpp
--- a/Userland/Utilities/disk_benchmark.cpp
+++ b/Userland/Utilities/disk_benchmark.cpp
--- a/Userland/Utilities/dmesg.cpp
+++ b/Userland/Utilities/dmesg.cpp
--- a/Userland/Utilities/du.cpp
+++ b/Userland/Utilities/du.cpp
--- a/Userland/Utilities/echo.cpp
+++ b/Userland/Utilities/echo.cpp
--- a/Userland/Utilities/env.cpp
+++ b/Userland/Utilities/env.cpp
--- a/Userland/Utilities/expr.cpp
+++ b/Userland/Utilities/expr.cpp
--- a/Userland/Utilities/false.cpp
+++ b/Userland/Utilities/false.cpp
--- a/Userland/Utilities/fgrep.cpp
+++ b/Userland/Utilities/fgrep.cpp
--- a/Userland/Utilities/find.cpp
+++ b/Userland/Utilities/find.cpp
--- a/Userland/Utilities/flock.cpp
+++ b/Userland/Utilities/flock.cpp
--- a/Userland/Utilities/functrace.cpp
+++ b/Userland/Utilities/functrace.cpp
--- a/Userland/Utilities/gml-format.cpp
+++ b/Userland/Utilities/gml-format.cpp
--- a/Userland/Utilities/grep.cpp
+++ b/Userland/Utilities/grep.cpp
--- a/Userland/Utilities/gron.cpp
+++ b/Userland/Utilities/gron.cpp
--- a/Userland/Utilities/gunzip.cpp
+++ b/Userland/Utilities/gunzip.cpp
--- a/Userland/Utilities/head.cpp
+++ b/Userland/Utilities/head.cpp
--- a/Userland/Utilities/hexdump.cpp
+++ b/Userland/Utilities/hexdump.cpp
--- a/Userland/Utilities/host.cpp
+++ b/Userland/Utilities/host.cpp
--- a/Userland/Utilities/hostname.cpp
+++ b/Userland/Utilities/hostname.cpp
--- a/Userland/Utilities/html.cpp
+++ b/Userland/Utilities/html.cpp
--- a/Userland/Utilities/id.cpp
+++ b/Userland/Utilities/id.cpp
--- a/Userland/Utilities/ifconfig.cpp
+++ b/Userland/Utilities/ifconfig.cpp
--- a/Userland/Utilities/ini.cpp
+++ b/Userland/Utilities/ini.cpp
--- a/Userland/Utilities/jp.cpp
+++ b/Userland/Utilities/jp.cpp
--- a/Userland/Utilities/js.cpp
+++ b/Userland/Utilities/js.cpp
--- a/Userland/Utilities/keymap.cpp
+++ b/Userland/Utilities/keymap.cpp
--- a/Userland/Utilities/kill.cpp
+++ b/Userland/Utilities/kill.cpp
--- a/Userland/Utilities/killall.cpp
+++ b/Userland/Utilities/killall.cpp
--- a/Userland/Utilities/ln.cpp
+++ b/Userland/Utilities/ln.cpp
--- a/Userland/Utilities/ls.cpp
+++ b/Userland/Utilities/ls.cpp
--- a/Userland/Utilities/lsirq.cpp
+++ b/Userland/Utilities/lsirq.cpp
--- a/Userland/Utilities/lsof.cpp
+++ b/Userland/Utilities/lsof.cpp
--- a/Userland/Utilities/lspci.cpp
+++ b/Userland/Utilities/lspci.cpp
--- a/Userland/Utilities/man.cpp
+++ b/Userland/Utilities/man.cpp
--- a/Userland/Utilities/md.cpp
+++ b/Userland/Utilities/md.cpp
--- a/Userland/Utilities/misbehaving-application.cpp
+++ b/Userland/Utilities/misbehaving-application.cpp
--- a/Userland/Utilities/mkdir.cpp
+++ b/Userland/Utilities/mkdir.cpp
--- a/Userland/Utilities/mkfifo.cpp
+++ b/Userland/Utilities/mkfifo.cpp
--- a/Userland/Utilities/mknod.cpp
+++ b/Userland/Utilities/mknod.cpp
--- a/Userland/Utilities/modload.cpp
+++ b/Userland/Utilities/modload.cpp
--- a/Userland/Utilities/modunload.cpp
+++ b/Userland/Utilities/modunload.cpp
--- a/Userland/Utilities/more.cpp
+++ b/Userland/Utilities/more.cpp
--- a/Userland/Utilities/mount.cpp
+++ b/Userland/Utilities/mount.cpp
--- a/Userland/Utilities/mv.cpp
+++ b/Userland/Utilities/mv.cpp
--- a/Userland/Utilities/nc.cpp
+++ b/Userland/Utilities/nc.cpp
--- a/Userland/Utilities/nl.cpp
+++ b/Userland/Utilities/nl.cpp
--- a/Userland/Utilities/notify.cpp
+++ b/Userland/Utilities/notify.cpp
--- a/Userland/Utilities/ntpquery.cpp
+++ b/Userland/Utilities/ntpquery.cpp
--- a/Userland/Utilities/open.cpp
+++ b/Userland/Utilities/open.cpp
--- a/Userland/Utilities/pape.cpp
+++ b/Userland/Utilities/pape.cpp
--- a/Userland/Utilities/passwd.cpp
+++ b/Userland/Utilities/passwd.cpp
--- a/Userland/Utilities/paste.cpp
+++ b/Userland/Utilities/paste.cpp
--- a/Userland/Utilities/pidof.cpp
+++ b/Userland/Utilities/pidof.cpp
--- a/Userland/Utilities/ping.cpp
+++ b/Userland/Utilities/ping.cpp
--- a/Userland/Utilities/pmap.cpp
+++ b/Userland/Utilities/pmap.cpp
--- a/Userland/Utilities/printf.cpp
+++ b/Userland/Utilities/printf.cpp
--- a/Userland/Utilities/pro.cpp
+++ b/Userland/Utilities/pro.cpp
--- a/Userland/Utilities/profile.cpp
+++ b/Userland/Utilities/profile.cpp
--- a/Userland/Utilities/ps.cpp
+++ b/Userland/Utilities/ps.cpp
--- a/Userland/Utilities/purge.cpp
+++ b/Userland/Utilities/purge.cpp
--- a/Userland/Utilities/readelf.cpp
+++ b/Userland/Utilities/readelf.cpp
--- a/Userland/Utilities/readlink.cpp
+++ b/Userland/Utilities/readlink.cpp
--- a/Userland/Utilities/realpath.cpp
+++ b/Userland/Utilities/realpath.cpp
--- a/Userland/Utilities/reboot.cpp
+++ b/Userland/Utilities/reboot.cpp
--- a/Userland/Utilities/rm.cpp
+++ b/Userland/Utilities/rm.cpp
--- a/Userland/Utilities/rmdir.cpp
+++ b/Userland/Utilities/rmdir.cpp
--- a/Userland/Utilities/seq.cpp
+++ b/Userland/Utilities/seq.cpp
--- a/Userland/Utilities/shutdown.cpp
+++ b/Userland/Utilities/shutdown.cpp
--- a/Userland/Utilities/sleep.cpp
+++ b/Userland/Utilities/sleep.cpp
--- a/Userland/Utilities/sort.cpp
+++ b/Userland/Utilities/sort.cpp
--- a/Userland/Utilities/stat.cpp
+++ b/Userland/Utilities/stat.cpp
--- a/Userland/Utilities/strace.cpp
+++ b/Userland/Utilities/strace.cpp