Simplify printing of engine info

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 2b039161aa18cda7f12ec3aa490499c52da7a104..765cd2caa52b93d52ff9c7bbe0fb984b43d0676b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,16 +17,14 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cstdio>
 #include <iostream>
 #include <string>
 
 #include "bitboard.h"
-#include "evaluate.h"
+#include "misc.h"
 #include "position.h"
-#include "thread.h"
 #include "search.h"
-#include "ucioption.h"
+#include "thread.h"
 
 using namespace std;
 
@@ -36,36 +34,24 @@ extern void kpk_bitbase_init();
 
 int main(int argc, char* argv[]) {
 
-  // Disable IO buffering for C and C++ standard libraries
-  setvbuf(stdin, NULL, _IONBF, 0);
-  setvbuf(stdout, NULL, _IONBF, 0);
-  cout.rdbuf()->pubsetbuf(NULL, 0);
-  cin.rdbuf()->pubsetbuf(NULL, 0);
-
-  // Startup initializations
-  init_bitboards();
+  bitboards_init();
   Position::init();
   kpk_bitbase_init();
   Search::init();
   Threads.init();
 
-  if (argc < 2)
-  {
-      cout << engine_name() << " by " << engine_authors() << endl;
+  cout << engine_info() << endl;
 
-      if (CpuHasPOPCNT)
-          cout << "Good! CPU has hardware POPCNT." << endl;
+  if (argc == 1)
+      uci_loop();
 
-      uci_loop(); // Enter the UCI loop and wait for user input
-  }
-  else if (string(argv[1]) == "bench" && argc < 8)
+  else if (string(argv[1]) == "bench")
       benchmark(argc, argv);
 
   else
-      cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
+      cerr << "\nUsage: stockfish bench [hash size = 128] [threads = 1] "
            << "[limit = 12] [fen positions file = default] "
            << "[limited by depth, time, nodes or perft = depth]" << endl;
 
   Threads.exit();
-  return 0;
 }