Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r1137) -Fix: [Network] Replaces all strncpy with ttd_strlcpy.. windows really

Browse Source 
does not like strncpy for some silly reason.
This commit is contained in:
truelight 2004-12-16 15:51:18 +00:00
parent 366833eda0
commit 99c4d6f93b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console_cmds.c
View File

@ -684,7 +684,7 @@ DEF_CONSOLE_CMD(ConSet) {
if (strncmp(argv[2], "*", NETWORK_PASSWORD_LENGTH) == 0) { if (strncmp(argv[2], "*", NETWORK_PASSWORD_LENGTH) == 0) {
_network_player_info[_local_player].password[0] = '\0'; _network_player_info[_local_player].password[0] = '\0';
} else { } 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) if (!_network_server)
SEND_COMMAND(PACKET_CLIENT_SET_PASSWORD)(_network_player_info[_local_player].password); SEND_COMMAND(PACKET_CLIENT_SET_PASSWORD)(_network_player_info[_local_player].password);
@ -733,7 +733,7 @@ DEF_CONSOLE_CMD(ConSet) {
return NULL; return NULL;
} }
if (argc == 3) { 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); 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)); ttd_strlcpy(_network_game_info.server_name, _network_server_name, sizeof(_network_game_info.server_name));
} else { } else {

8
network.c
View File

@ -795,8 +795,6 @@ bool NetworkClientConnectGame(const byte* host, unsigned short port)
return _networking; return _networking;
} }
extern const char _openttd_revision[];
void NetworkInitGameInfo(void) void NetworkInitGameInfo(void)
{ {
NetworkClientInfo *ci; NetworkClientInfo *ci;
@ -813,7 +811,7 @@ void NetworkInitGameInfo(void)
_network_game_info.clients_on = 1; _network_game_info.clients_on = 1;
_network_game_info.dedicated = false; _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.spectators_on = 0;
_network_game_info.game_date = _date; _network_game_info.game_date = _date;
_network_game_info.start_date = ConvertIntDate(_patches.starting_date); _network_game_info.start_date = ConvertIntDate(_patches.starting_date);
@ -837,8 +835,8 @@ void NetworkInitGameInfo(void)
ci->client_playas = OWNER_SPECTATOR; ci->client_playas = OWNER_SPECTATOR;
else else
ci->client_playas = _local_player + 1; ci->client_playas = _local_player + 1;
strncpy(ci->client_name, _network_player_name, sizeof(ci->client_name)); ttd_strlcpy(ci->client_name, _network_player_name, sizeof(ci->client_name));
strncpy(ci->unique_id, _network_unique_id, sizeof(ci->unique_id)); ttd_strlcpy(ci->unique_id, _network_unique_id, sizeof(ci->unique_id));
} }
bool NetworkServerStart(void) bool NetworkServerStart(void)