diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-25 08:22:48 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-25 08:22:48 +0100 |
| commit | a0b4a1330be6a36ad095222d2ea83927cd33514d (patch) | |
| tree | 616920ca608751e843c92c9815069f43789e3097 /xorg-server/os/access.c | |
| parent | 45710577f374972946a8eb37833a9c94e5a299bf (diff) | |
| download | vcxsrv-a0b4a1330be6a36ad095222d2ea83927cd33514d.tar.gz vcxsrv-a0b4a1330be6a36ad095222d2ea83927cd33514d.tar.bz2 vcxsrv-a0b4a1330be6a36ad095222d2ea83927cd33514d.zip | |
mesa xserver pixman git update 25 nov 2011
Diffstat (limited to 'xorg-server/os/access.c')
| -rw-r--r-- | xorg-server/os/access.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/xorg-server/os/access.c b/xorg-server/os/access.c index b7b19279f..159894007 100644 --- a/xorg-server/os/access.c +++ b/xorg-server/os/access.c @@ -528,7 +528,7 @@ DefineSelf (int fd) ifn.lifn_family = AF_UNSPEC; ifn.lifn_flags = 0; if (ioctl (fd, SIOCGLIFNUM, (char *) &ifn) < 0) - Error ("Getting interface count"); + ErrorF ("Getting interface count: %s\n", strerror(errno)); if (len < (ifn.lifn_count * sizeof(struct lifreq))) { len = ifn.lifn_count * sizeof(struct lifreq); bufptr = malloc(len); @@ -558,7 +558,7 @@ DefineSelf (int fd) #endif if (ifioctl (fd, IFC_IOCTL_REQ, (pointer) &ifc) < 0) - Error ("Getting interface configuration (4)"); + ErrorF ("Getting interface configuration (4): %s\n", strerror(errno)); cplim = (char *) IFC_IFC_REQ + IFC_IFC_LEN; @@ -1756,8 +1756,7 @@ siHostnameAddrMatch(int family, pointer addr, int len, if (siAddrLen >= sizeof(hostname)) return FALSE; - strncpy(hostname, siAddr, siAddrLen); - hostname[siAddrLen] = '\0'; + strlcpy(hostname, siAddr, siAddrLen + 1); if (getaddrinfo(hostname, NULL, NULL, &addresses) == 0) { for (a = addresses ; a != NULL ; a = a->ai_next) { @@ -1786,8 +1785,7 @@ siHostnameAddrMatch(int family, pointer addr, int len, if (siAddrLen >= sizeof(hostname)) return FALSE; - strncpy(hostname, siAddr, siAddrLen); - hostname[siAddrLen] = '\0'; + strlcpy(hostname, siAddr, siAddrLen + 1); if ((hp = _XGethostbyname(hostname, hparams)) != NULL) { #ifdef h_addr /* new 4.3bsd version of gethostent */ |