RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 17:27:46 +00:00
Code Issues Activity Actions

Everywhere: Port to String::copy_characters_to_buffer()

Browse source
This commit is contained in:
Sergey Bugaev 2020-08-25 17:32:01 +03:00 • committed by Andreas Kling
parent be6cce5530
commit 852454746e
8 changed files with 39 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/ifconfig.cpp
View file

@ -116,7 +116,11 @@ int main(int argc, char** argv)
struct ifreq ifr;
memset(&ifr, 0, sizeof(ifr));
strlcpy(ifr.ifr_name, ifname.characters(), IFNAMSIZ);
bool fits = ifname.copy_characters_to_buffer(ifr.ifr_name, IFNAMSIZ);
if (!fits) {
fprintf(stderr, "Interface name '%s' is too long\n", ifname.characters());
return 1;
}
ifr.ifr_addr.sa_family = AF_INET;
((sockaddr_in&)ifr.ifr_addr).sin_addr.s_addr = address.value().to_in_addr_t();
@ -144,7 +148,11 @@ int main(int argc, char** argv)
struct ifreq ifr;
memset(&ifr, 0, sizeof(ifr));
strlcpy(ifr.ifr_name, ifname.characters(), IFNAMSIZ);
bool fits = ifname.copy_characters_to_buffer(ifr.ifr_name, IFNAMSIZ);
if (!fits) {
fprintf(stderr, "Interface name '%s' is too long\n", ifname.characters());
return 1;
}
ifr.ifr_netmask.sa_family = AF_INET;
((sockaddr_in&)ifr.ifr_netmask).sin_addr.s_addr = address.value().to_in_addr_t();

5
Userland/ping.cpp
View file

@ -125,7 +125,10 @@ int main(int argc, char** argv)
ping_packet.header.code = 0;
ping_packet.header.un.echo.id = htons(pid);
ping_packet.header.un.echo.sequence = htons(seq++);
strlcpy(ping_packet.msg, "Hello there!\n", sizeof(ping_packet.msg));
bool fits = String("Hello there!\n").copy_characters_to_buffer(ping_packet.msg, sizeof(ping_packet.msg));
// It's a constant string, we can be sure that it fits.
ASSERT(fits);
ping_packet.header.checksum = internet_checksum(&ping_packet, sizeof(PingPacket));