chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: make bus ref counting atomic
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index 00d3ace6167d85864e1d2a7697272126ea6c2227..673e0da6b69f38112708581ff81abe65a1675c1b 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-3838,24
+3838,29
@@
bool hostname_is_valid(const char *s) {
return true;
}
return true;
}
-char* hostname_cleanup(char *s) {
+char* hostname_cleanup(char *s
, bool lowercase
) {
char *p, *d;
bool dot;
for (p = s, d = s, dot = true; *p; p++) {
if (*p == '.') {
char *p, *d;
bool dot;
for (p = s, d = s, dot = true; *p; p++) {
if (*p == '.') {
- if (dot
|| p[1] == 0
)
+ if (dot)
continue;
continue;
+ *(d++) = '.';
dot = true;
dot = true;
- } else
+ } else if (hostname_valid_char(*p)) {
+ *(d++) = lowercase ? tolower(*p) : *p;
dot = false;
dot = false;
+ }
- if (hostname_valid_char(*p))
- *(d++) = *p;
}
}
- *d = 0;
+ if (dot && d > s)
+ d[-1] = 0;
+ else
+ *d = 0;
+
strshorten(s, HOST_NAME_MAX);
return s;
strshorten(s, HOST_NAME_MAX);
return s;