fixup
This commit is contained in:
parent
ad485c55fb
commit
24596b2731
@ -225,22 +225,25 @@ char * gluonutil_get_primary_domain(void) {
|
|||||||
const char *domain_path_fmt = "/lib/gluon/domains/%s.json";
|
const char *domain_path_fmt = "/lib/gluon/domains/%s.json";
|
||||||
char domain_path[strlen(domain_path_fmt) + strlen(domain_code)];
|
char domain_path[strlen(domain_path_fmt) + strlen(domain_code)];
|
||||||
snprintf(domain_path, sizeof(domain_path), domain_path_fmt, domain_code);
|
snprintf(domain_path, sizeof(domain_path), domain_path_fmt, domain_code);
|
||||||
free(domain_code);
|
|
||||||
|
|
||||||
char primary_domain_path[PATH_MAX+1];
|
char primary_domain_path[PATH_MAX+1];
|
||||||
char *primary_domain_code;
|
char *primary_domain_code;
|
||||||
ssize_t len = readlink(domain_path, primary_domain_path, PATH_MAX);
|
ssize_t len = readlink(domain_path, primary_domain_path, PATH_MAX);
|
||||||
if (len < 0) {
|
if (len < 0) {
|
||||||
// EINVAL = file is not a symlink = the domain itself is the primary domain
|
// EINVAL = file is not a symlink = the domain itself is the primary domain
|
||||||
if (errno != EINVAL)
|
if (errno != EINVAL) {
|
||||||
|
free(domain_code);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
primary_domain_code = basename(domain_path);
|
return domain_code;
|
||||||
} else {
|
|
||||||
primary_domain_path[len] = '\0';
|
|
||||||
primary_domain_code = basename(primary_domain_path);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
free(domain_code);
|
||||||
|
|
||||||
|
primary_domain_path[len] = '\0';
|
||||||
|
primary_domain_code = basename(primary_domain_path);
|
||||||
|
|
||||||
char *ext_begin = strrchr(primary_domain_code, '.');
|
char *ext_begin = strrchr(primary_domain_code, '.');
|
||||||
if (!ext_begin)
|
if (!ext_begin)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user