Actually commit the new version of trimdomain *blush*
Thanks for covering my blunder to: peter
This commit is contained in:
parent
468c8cb0a1
commit
61a1695b80
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=74288
@ -1,6 +1,7 @@
|
||||
/*-
|
||||
* Copyright (c) 1988, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
|
||||
* Based on original work by Atsushi Murai <amurai@FreeBSD.org>
|
||||
* 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 <sys/param.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/stat.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <libutil.h>
|
||||
#include <netdb.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
#include <utmp.h>
|
||||
#include <stdio.h>
|
||||
|
||||
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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user