macOS compatibility

Author: ReimuNotMoe

Cmd_Devices.cpp

@@ -33,7 +33,6 @@ int Command_Devices(const std::vector<std::string>& args) {
 		try {
 #endif
 		tty.make_raw();
-		tty.speed() = 2000000;
 #ifdef __CYGWIN__
 		} catch (...) {
 

Cmd_Env.cpp

@@ -192,7 +192,6 @@ int Command_Env(const std::vector<std::string>& args) {
 	try {
 #endif
 	tty.make_raw();
-	tty.speed() = 2000000;
 #ifdef __CYGWIN__
 	} catch (...) {
 

Cmd_Erase.cpp

@@ -53,7 +53,6 @@ int Command_Erase(const std::vector<std::string>& args) {
 	try {
 #endif
 	tty.make_raw();
-	tty.speed() = 2000000;
 #ifdef __CYGWIN__
 	} catch (...) {
 

Cmd_Flash.cpp

@@ -46,14 +46,19 @@ int Command_Flash(const std::vector<std::string>& args) {
 	try {
 #endif
 	tty.make_raw();
-	tty.speed() = 2000000;
 #ifdef __CYGWIN__
 	} catch (...) {
 
 	}
 #endif
 
+
+
 	std::ifstream infile(filepath);
+	if (!infile.good()) {
+		printf("error: unable to open file `%s'\n", filepath.c_str());
+		return 2;
+	}
 	infile.seekg(0, std::ios_base::end);
 	size_t infile_size = infile.tellg();
 	infile.seekg(0, std::ios_base::beg);

Cmd_Info.cpp

@@ -37,27 +37,26 @@ int Command_Info(const std::vector<std::string>& args) {
 	try {
 #endif
 	tty.make_raw();
-	tty.speed() = 2000000;
 #ifdef __CYGWIN__
 	} catch (...) {
 
 	}
 #endif
 
 	auto info_bl_ver = serial_chat(tty, FlasherCommand_GetBootloaderVersion, nullptr);
-	*info_bl_ver.end() = 0;
+	info_bl_ver.back() = 0;
 
 	auto info_board = serial_chat(tty, FlasherCommand_GetBoardName, nullptr);
-	*info_board.end() = 0;
+	info_board.back() = 0;
 
 	auto info_board_mf = serial_chat(tty, FlasherCommand_GetBoardManufacturer, nullptr);
-	*info_board_mf.end() = 0;
+	info_board_mf.back() = 0;
 
 	auto info_chip = serial_chat(tty, FlasherCommand_GetChipName, nullptr);
-	*info_chip.end() = 0;
+	info_chip.back() = 0;
 
 	auto info_chip_mf = serial_chat(tty, FlasherCommand_GetChipManufacturer, nullptr);
-	*info_chip_mf.end() = 0;
+	info_chip_mf.back() = 0;
 
 	printf("Device: %s\n", global_device_path.c_str());
 	puts("");

Cmd_Reboot.cpp

@@ -45,7 +45,6 @@ int Command_Reboot(const std::vector<std::string>& args) {
 	try {
 #endif
 	tty.make_raw();
-	tty.speed() = 2000000;
 #ifdef __CYGWIN__
 	} catch (...) {
 

PICoBoot_Utility.cpp

@@ -52,7 +52,7 @@ void ShowHelpExtra() {
 std::string global_device_path;
 
 int main(int argc, char **argv) {
-	cxxopts::Options options("picoboot", "picoboot - Bootloader tool for the PotatoPi PICo series.");
+	cxxopts::Options options("picoboot", "picoboot - Utility for the PICoBoot bootloader.");
 
 	std::vector<std::string> positional_args;
 

ScanDevice.cpp

@@ -22,7 +22,7 @@
 std::vector<std::string> ScanDevice_GetAllTTYs() {
 	std::vector<std::string> ret;
 
-	for (const auto &dirEntry : std::filesystem::recursive_directory_iterator("/dev/")) {
+	for (const auto &dirEntry : std::filesystem::directory_iterator("/dev/")) {
 		auto p = dirEntry.path().string();
 #if defined(__linux__)
 		const char keyword[] = "/ttyACM";