# HG changeset patch # User truelight # Date 1103212278 0 # Node ID d52f31c390c168b2730777d2b3b1c28be91ba073 # Parent b69a17776812b9d4d14655591a22f66ce708d525 (svn r1137) -Fix: [Network] Replaces all strncpy with ttd_strlcpy.. windows really does not like strncpy for some silly reason. diff -r b69a17776812 -r d52f31c390c1 console_cmds.c --- a/console_cmds.c Thu Dec 16 15:35:19 2004 +0000 +++ b/console_cmds.c Thu Dec 16 15:51:18 2004 +0000 @@ -684,7 +684,7 @@ if (strncmp(argv[2], "*", NETWORK_PASSWORD_LENGTH) == 0) { _network_player_info[_local_player].password[0] = '\0'; } else { - strncpy(_network_player_info[_local_player].password, argv[2], sizeof(_network_player_info[_local_player].password)); + ttd_strlcpy(_network_player_info[_local_player].password, argv[2], sizeof(_network_player_info[_local_player].password)); } if (!_network_server) SEND_COMMAND(PACKET_CLIENT_SET_PASSWORD)(_network_player_info[_local_player].password); @@ -733,7 +733,7 @@ return NULL; } if (argc == 3) { - strncpy(_network_server_name, argv[2], sizeof(_network_server_name)); + ttd_strlcpy(_network_server_name, argv[2], sizeof(_network_server_name)); IConsolePrintF(_iconsole_color_warning, "Server-name changed to '%s'", _network_server_name); ttd_strlcpy(_network_game_info.server_name, _network_server_name, sizeof(_network_game_info.server_name)); } else { diff -r b69a17776812 -r d52f31c390c1 network.c --- a/network.c Thu Dec 16 15:35:19 2004 +0000 +++ b/network.c Thu Dec 16 15:51:18 2004 +0000 @@ -795,8 +795,6 @@ return _networking; } -extern const char _openttd_revision[]; - void NetworkInitGameInfo(void) { NetworkClientInfo *ci; @@ -813,7 +811,7 @@ _network_game_info.clients_on = 1; _network_game_info.dedicated = false; } - strncpy(_network_game_info.server_revision, _openttd_revision, sizeof(_network_game_info.server_revision)); + ttd_strlcpy(_network_game_info.server_revision, _openttd_revision, sizeof(_network_game_info.server_revision)); _network_game_info.spectators_on = 0; _network_game_info.game_date = _date; _network_game_info.start_date = ConvertIntDate(_patches.starting_date); @@ -837,8 +835,8 @@ ci->client_playas = OWNER_SPECTATOR; else ci->client_playas = _local_player + 1; - strncpy(ci->client_name, _network_player_name, sizeof(ci->client_name)); - strncpy(ci->unique_id, _network_unique_id, sizeof(ci->unique_id)); + ttd_strlcpy(ci->client_name, _network_player_name, sizeof(ci->client_name)); + ttd_strlcpy(ci->unique_id, _network_unique_id, sizeof(ci->unique_id)); } bool NetworkServerStart(void)