From bb83c51dcc32da47dbcba45696b6d3593bafb816 Mon Sep 17 00:00:00 2001 From: brian Date: Thu, 15 Mar 2001 08:30:05 +0000 Subject: Actually commit the new version of trimdomain *blush* Thanks for covering my blunder to: peter --- lib/libutil/trimdomain.c | 150 +++++++++++++++++++++++++---------------------- 1 file changed, 80 insertions(+), 70 deletions(-) (limited to 'lib/libutil/trimdomain.c') diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c index a3b3439..b6464e0 100644 --- a/lib/libutil/trimdomain.c +++ b/lib/libutil/trimdomain.c @@ -1,6 +1,7 @@ /*- - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. + * Copyright (c) 2001 Brian Somers + * Based on original work by Atsushi Murai + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,18 +11,11 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -29,77 +23,93 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ - #include -#include -#include -#include -#include -#include -#include #include -#include #include -#include #include -#include -#include +static int isDISP(const char *); + +/*- + * Trim the current domain name from fullhost, but only if the result + * is less than or equal to hostsize in length. + * + * This function understands $DISPLAY type fullhosts. + * + * For example: + * + * trimdomain("abcde.my.domain", 5) -> "abcde" + * trimdomain("abcde.my.domain", 4) -> "abcde.my.domain" + * trimdomain("abcde.my.domain:0.0", 9) -> "abcde:0.0" + * trimdomain("abcde.my.domain:0.0", 8) -> "abcde.my.domain:0.0" + */ void trimdomain(char *fullhost, int hostsize) { - static char domain[MAXHOSTNAMELEN]; - static int first = 1; - static size_t dlen; - char *s, *end; - int spn, ok; + static char domain[MAXHOSTNAMELEN]; + static int first = 1; + static size_t dlen; + char *s, *end; + size_t len; - if (first) { - first = 0; - if (gethostname(domain, sizeof(domain) - 1) == 0 && - (s = strchr(domain, '.'))) - memmove(domain, s + 1, strlen(s + 1) + 1); - else - domain[0] = '\0'; - dlen = strlen(domain); - } + if (first) { + /* XXX: Should we assume that our domain is this persistent ? */ + first = 0; + if (gethostname(domain, sizeof(domain) - 1) == 0 && + (s = strchr(domain, '.')) != NULL) + memmove(domain, s + 1, strlen(s + 1) + 1); + else + domain[0] = '\0'; + dlen = strlen(domain); + } + + if (domain[0] == '\0') + return; - if (domain[0] != '\0') { s = fullhost; - end = s + hostsize + 1; - for (; (s = memchr(s, '.', end - s)) != NULL; s++) - if (!strncasecmp(s + 1, domain, dlen)) { - if (s[dlen + 1] == '\0') { - *s = '\0'; /* Found - lose the domain */ - break; - } else if (s[dlen + 1] == ':') { /* $DISPLAY ? */ - ok = dlen + 2; - spn = strspn(s + ok, "0123456789"); - if (spn > 0 && ok + spn - dlen <= end - s) { - ok += spn; - if (s[ok] == '\0') { - /* host.domain:nn */ - memmove(s, s + dlen + 1, ok - dlen); - break; - } else if (s[ok] == '.') { - ok++; - spn = strspn(s + ok, "0123456789"); - if (spn > 0 && s[ok + spn] == '\0' && - ok + spn - dlen <= end - s) { - /* host.domain:nn.nn */ - memmove(s, s + dlen + 1, ok + spn - dlen); - break; - } - } - } - } - } - } + end = s + hostsize + 1; + for (; (s = memchr(s, '.', end - s)) != NULL; s++) { + 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)) < end - s) { + /* Found -- shuffle the DISPLAY back. */ + memmove(s, s + dlen + 1, len + 1); + break; + } + } + } +} + +/* + * Is the given string NN or NN.NN where ``NN'' is an all-numeric string ? + */ +static int +isDISP(const char *disp) +{ + int res, w; + + w = strspn(disp, "0123456789"); + res = 0; + if (w > 0) { + if (disp[w] == '\0') + res = 1; /* NN */ + else if (disp[w] == '.') { + disp += w + 1; + w = strspn(disp, "0123456789"); + if (w > 0 && disp[w] == '\0') + res = 1; /* NN.NN */ + } + } + + return (res); } -- cgit v1.1