浏览代码

sql: Port to LibMain

alexmajor 3 年之前
父节点
当前提交
e3dbe19018
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. 1 1
      Userland/Utilities/CMakeLists.txt
  2. 4 2
      Userland/Utilities/sql.cpp

+ 1 - 1
Userland/Utilities/CMakeLists.txt

@@ -160,7 +160,7 @@ target_link_libraries(rmdir LibMain)
 target_link_libraries(run-tests LibRegex LibCoredump)
 target_link_libraries(run-tests LibRegex LibCoredump)
 target_link_libraries(shot LibGUI LibMain)
 target_link_libraries(shot LibGUI LibMain)
 target_link_libraries(shuf LibMain)
 target_link_libraries(shuf LibMain)
-target_link_libraries(sql LibLine LibSQL LibIPC)
+target_link_libraries(sql LibLine LibMain LibSQL LibIPC)
 target_link_libraries(sort LibMain)
 target_link_libraries(sort LibMain)
 target_link_libraries(stat LibMain)
 target_link_libraries(stat LibMain)
 target_link_libraries(strace LibMain)
 target_link_libraries(strace LibMain)

+ 4 - 2
Userland/Utilities/sql.cpp

@@ -1,5 +1,6 @@
 /*
 /*
  * Copyright (c) 2021, Tim Flynn <trflynn89@serenityos.org>
  * Copyright (c) 2021, Tim Flynn <trflynn89@serenityos.org>
+ * Copyright (c) 2022, Alex Major
  *
  *
  * SPDX-License-Identifier: BSD-2-Clause
  * SPDX-License-Identifier: BSD-2-Clause
  */
  */
@@ -11,6 +12,7 @@
 #include <LibCore/File.h>
 #include <LibCore/File.h>
 #include <LibCore/StandardPaths.h>
 #include <LibCore/StandardPaths.h>
 #include <LibLine/Editor.h>
 #include <LibLine/Editor.h>
+#include <LibMain/Main.h>
 #include <LibSQL/AST/Lexer.h>
 #include <LibSQL/AST/Lexer.h>
 #include <LibSQL/AST/Token.h>
 #include <LibSQL/AST/Token.h>
 #include <LibSQL/SQLClient.h>
 #include <LibSQL/SQLClient.h>
@@ -322,7 +324,7 @@ private:
     }
     }
 };
 };
 
 
-int main(int argc, char** argv)
+ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
 {
     String database_name(getlogin());
     String database_name(getlogin());
     String file_to_source;
     String file_to_source;
@@ -336,7 +338,7 @@ int main(int argc, char** argv)
     args_parser.add_option(file_to_read, "File to read", "read", 'r', "file");
     args_parser.add_option(file_to_read, "File to read", "read", 'r', "file");
     args_parser.add_option(file_to_source, "File to source", "source", 's', "file");
     args_parser.add_option(file_to_source, "File to source", "source", 's', "file");
     args_parser.add_option(suppress_sqlrc, "Don't read ~/.sqlrc", "no-sqlrc", 'n');
     args_parser.add_option(suppress_sqlrc, "Don't read ~/.sqlrc", "no-sqlrc", 'n');
-    args_parser.parse(argc, argv);
+    args_parser.parse(arguments);
 
 
     SQLRepl repl(database_name);
     SQLRepl repl(database_name);