diff options
| author | trasz <trasz@FreeBSD.org> | 2015-03-09 13:00:59 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2015-03-09 13:00:59 +0000 |
| commit | 622e1a5d993aef0d1b3f936ffa228e8dd181d413 (patch) | |
| tree | 615c27b2d4364526969e676d416d3168e171fc84 /usr.sbin/autofs | |
| parent | 8822ff21ceb6b87a0a94f48793723433190908fd (diff) | |
| download | FreeBSD-src-622e1a5d993aef0d1b3f936ffa228e8dd181d413.zip FreeBSD-src-622e1a5d993aef0d1b3f936ffa228e8dd181d413.tar.gz | |
Improve separated_concat() to properly handle the case of concatenating
"/" and "/foo".
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'usr.sbin/autofs')
| -rw-r--r-- | usr.sbin/autofs/common.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c index 8c455c4..0b4adc1 100644 --- a/usr.sbin/autofs/common.c +++ b/usr.sbin/autofs/common.c @@ -136,8 +136,14 @@ separated_concat(const char *s1, const char *s2, char separator) assert(s1 != NULL); assert(s2 != NULL); - if (s1[0] == '\0' || s2[0] == '\0' || - s1[strlen(s1) - 1] == separator || s2[0] == separator) { + /* + * If s2 starts with separator - skip it; otherwise concatenating + * "/" and "/foo" would end up returning "//foo". + */ + if (s2[0] == separator) + s2++; + + if (s1[0] == '\0' || s2[0] == '\0' || s1[strlen(s1) - 1] == separator) { ret = asprintf(&result, "%s%s", s1, s2); } else { ret = asprintf(&result, "%s%c%s", s1, separator, s2); |
