summaryrefslogtreecommitdiffstats
path: root/lib/libutil/trimdomain.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libutil/trimdomain.c')
-rw-r--r--lib/libutil/trimdomain.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c
index a7ce8c4..85c27e0 100644
--- a/lib/libutil/trimdomain.c
+++ b/lib/libutil/trimdomain.c
@@ -75,18 +75,16 @@ trimdomain(char *fullhost, int hostsize)
s = fullhost;
end = s + hostsize + 1;
- for (; (s = memchr(s, '.', (size_t)(end - s))) != NULL; s++) {
+ if ((s = memchr(s, '.', (size_t)(end - s))) != NULL) {
if (strncasecmp(s + 1, domain, dlen) == 0) {
if (s[dlen + 1] == '\0') {
/* Found -- lose the domain. */
*s = '\0';
- break;
} else if (s[dlen + 1] == ':' &&
isDISP(s + dlen + 2) &&
(len = strlen(s + dlen + 1)) < (size_t)(end - s)) {
/* Found -- shuffle the DISPLAY back. */
memmove(s, s + dlen + 1, len + 1);
- break;
}
}
}
OpenPOWER on IntegriCloud