Require file attribute config to have .attr suffix

- Allows for more precise globbing, avoiding potential issues from
  leftover / accidentally placed files in the fileattrs directory.

diff --git a/build/rpmfc.c b/build/rpmfc.c
index 34aa1a7..5af4cd8 100644 (file)
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -839,7 +839,7 @@ assert(dix >= 0);
 static int initAttrs(rpmfc fc)
 {
     ARGV_t files = NULL;
-    char * attrPath = rpmExpand("%{_fileattrsdir}/*", NULL);
+    char * attrPath = rpmExpand("%{_fileattrsdir}/*.attr", NULL);
     int nattrs = 0;
 
     /* Discover known attributes from pathnames + initialize them */
@@ -847,7 +847,9 @@ static int initAttrs(rpmfc fc)
        nattrs = argvCount(files);
        fc->atypes = xcalloc(nattrs + 1, sizeof(*fc->atypes));
        for (int i = 0; i < nattrs; i++) {
-           fc->atypes[i] = rpmfcAttrNew(basename(files[i]));
+           char *bn = basename(files[i]);
+           bn[strlen(bn)-strlen(".attr")] = '\0';
+           fc->atypes[i] = rpmfcAttrNew(bn);
        }
        fc->atypes[nattrs] = NULL;
        argvFree(files);

diff --git a/fileattrs/Makefile.am b/fileattrs/Makefile.am
index 379737a..8458fe9 100644 (file)
--- a/fileattrs/Makefile.am
+++ b/fileattrs/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/rpm.am
 fattrsdir = $(rpmconfigdir)/fileattrs
 
 fattrs_DATA = \
-       desktop elf font libtool perl perllib pkgconfig python \
-       ocaml script
+       desktop.attr elf.attr font.attr libtool.attr perl.attr perllib.attr \
+       pkgconfig.attr python.attr ocaml.attr script.attr
 
 EXTRA_DIST = $(fattrs_DATA)

diff --git a/fileattrs/desktop b/fileattrs/desktop.attr
similarity index 100%
rename from fileattrs/desktop
rename to fileattrs/desktop.attr

diff --git a/fileattrs/elf b/fileattrs/elf.attr
similarity index 100%
rename from fileattrs/elf
rename to fileattrs/elf.attr

diff --git a/fileattrs/font b/fileattrs/font.attr
similarity index 100%
rename from fileattrs/font
rename to fileattrs/font.attr

diff --git a/fileattrs/libtool b/fileattrs/libtool.attr
similarity index 100%
rename from fileattrs/libtool
rename to fileattrs/libtool.attr

diff --git a/fileattrs/mono b/fileattrs/mono.attr
similarity index 100%
rename from fileattrs/mono
rename to fileattrs/mono.attr

diff --git a/fileattrs/ocaml b/fileattrs/ocaml.attr
similarity index 100%
rename from fileattrs/ocaml
rename to fileattrs/ocaml.attr

diff --git a/fileattrs/perl b/fileattrs/perl.attr
similarity index 100%
rename from fileattrs/perl
rename to fileattrs/perl.attr

diff --git a/fileattrs/perllib b/fileattrs/perllib.attr
similarity index 100%
rename from fileattrs/perllib
rename to fileattrs/perllib.attr

diff --git a/fileattrs/pkgconfig b/fileattrs/pkgconfig.attr
similarity index 100%
rename from fileattrs/pkgconfig
rename to fileattrs/pkgconfig.attr

diff --git a/fileattrs/python b/fileattrs/python.attr
similarity index 100%
rename from fileattrs/python
rename to fileattrs/python.attr

diff --git a/fileattrs/script b/fileattrs/script.attr
similarity index 100%
rename from fileattrs/script
rename to fileattrs/script.attr

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 050b442..634a021 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -430,7 +430,7 @@ static void setDefaults(void)
     if (!macrofiles) {
        macrofiles = rstrscat(NULL, confdir, "/macros", ":",
                                confdir, "/platform/%{_target}/macros", ":",
-                               confdir, "/fileattrs/*", ":",
+                               confdir, "/fileattrs/*.attr", ":",
                                confdir, "/" RPMCANONVENDOR "/macros", ":",
                                SYSCONFDIR "/rpm/macros.*", ":",
                                SYSCONFDIR "/rpm/macros", ":",