nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixups

Browse Source
This commit is contained in:
lemoer 2020-05-16 17:27:12 +02:00
parent 7f4b63d89f
commit 5b8ea15911
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/libgluonutil/src/libgluonutil.c
View File

@ -227,21 +227,25 @@ char * gluonutil_get_primary_domain(void) {
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); free(domain_code);
char primary_domain_path[PATH_MAX] = ""; char primary_domain_path[PATH_MAX+1] = "";
if ((readlink(domain_path, primary_domain_path, PATH_MAX) < 0) && (errno == EINVAL)) { char *primary_domain_code;
if (readlink(domain_path, primary_domain_path, PATH_MAX) < 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
strncpy(primary_domain_path, domain_path, PATH_MAX); if (errno != EINVAL)
return NULL;
primary_domain_code = basename(domain_path);
} else {
primary_domain_code = basename(primary_domain_path);
} }
char *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)
// strip .json from filename return NULL;
*ext_begin = '\0';
return strdup(primary_domain_code);
}
return NULL; // strip .json from filename
*ext_begin = '\0';
return strdup(primary_domain_code);
} }