# # patch "ChangeLog" # from [e591e7b1a3be1717139355c04e40404d5ba47362] # to [fac838e939600ed258504b27140379e293e8c923] # # patch "database.cc" # from [99621dc8dd3b871fc41204945906db116111519d] # to [04b7bf7f3d9722bb194a0623a339babc83d95c74] # # patch "ui.cc" # from [403dbf11aebf69618ecbaf53dbb87695a78cb940] # to [cc9ea70c7d0fc57ce2c5457550ac0366310aa61b] # ======================================================================== --- ChangeLog e591e7b1a3be1717139355c04e40404d5ba47362 +++ ChangeLog fac838e939600ed258504b27140379e293e8c923 @@ -1,5 +1,10 @@ 2005-09-01 Matthew Gregan + * ui.cc (user_interface): Avoid calling sync_with_stdio(false) on + Win32 for now to work around a bug in MinGW where unsynchronized + std::cin returns EOF earlier when reading a stream with DOS + newlines. Resolves 'db load' failure reported by Howard Spindel. + * database.cc (load): Don't bother executing an empty string. * commands.cc (ALIAS(import, setup)): Remove alias. 2005-09-01 Matt Johnston ======================================================================== --- database.cc 99621dc8dd3b871fc41204945906db116111519d +++ database.cc 04b7bf7f3d9722bb194a0623a339babc83d95c74 @@ -363,7 +363,8 @@ tmp.erase(0, len); } - sqlite3_exec(__sql, tmp.c_str(), NULL, NULL, NULL); + if (!tmp.empty()) + sqlite3_exec(__sql, tmp.c_str(), NULL, NULL, NULL); assert_sqlite3_ok(__sql); } ======================================================================== --- ui.cc 403dbf11aebf69618ecbaf53dbb87695a78cb940 +++ ui.cc cc9ea70c7d0fc57ce2c5457550ac0366310aa61b @@ -262,7 +262,9 @@ last_write_was_a_tick(false), t_writer(0) { +#ifndef WIN32 clog.sync_with_stdio(false); +#endif clog.unsetf(ios_base::unitbuf); if (have_smart_terminal()) set_tick_writer(new tick_write_count);