|
 |
417a11 |
diff --git a/src/magic.c b/src/magic.c
|
|
|
417a11 |
index 5403951..2b61080 100644
|
|
|
417a11 |
--- a/src/magic.c
|
|
|
417a11 |
+++ b/src/magic.c
|
|
|
417a11 |
@@ -101,16 +101,21 @@ get_default_magic(void)
|
|
|
417a11 |
if ((home = getenv("HOME")) == NULL)
|
|
|
417a11 |
return MAGIC;
|
|
|
417a11 |
|
|
|
417a11 |
- if (asprintf(&hmagicpath, "%s/.magic", home) < 0)
|
|
|
417a11 |
+ if (asprintf(&hmagicpath, "%s/.magic.mgc", home) < 0)
|
|
|
417a11 |
return MAGIC;
|
|
|
417a11 |
- if (stat(hmagicpath, &st) == -1)
|
|
|
417a11 |
- goto out;
|
|
|
417a11 |
- if (S_ISDIR(st.st_mode)) {
|
|
|
417a11 |
+ if (stat(hmagicpath, &st) == -1) {
|
|
|
417a11 |
free(hmagicpath);
|
|
|
417a11 |
- if (asprintf(&hmagicpath, "%s/%s", home, hmagic) < 0)
|
|
|
417a11 |
+ if (asprintf(&hmagicpath, "%s/.magic", home) < 0)
|
|
|
417a11 |
return MAGIC;
|
|
|
417a11 |
- if (access(hmagicpath, R_OK) == -1)
|
|
|
417a11 |
+ if (stat(hmagicpath, &st) == -1)
|
|
|
417a11 |
goto out;
|
|
|
417a11 |
+ if (S_ISDIR(st.st_mode)) {
|
|
|
417a11 |
+ free(hmagicpath);
|
|
|
417a11 |
+ if (asprintf(&hmagicpath, "%s/%s", home, hmagic) < 0)
|
|
|
417a11 |
+ return MAGIC;
|
|
|
417a11 |
+ if (access(hmagicpath, R_OK) == -1)
|
|
|
417a11 |
+ goto out;
|
|
|
417a11 |
+ }
|
|
|
417a11 |
}
|
|
|
417a11 |
|
|
|
417a11 |
if (asprintf(&default_magic, "%s:%s", hmagicpath, MAGIC) < 0)
|