Print shortened ftype in package color listing

When listing the offending files, also show the file type, it may be
handy. Trim it after the first space char but keep at least 10 chars,
that should suffice as a hint to the user, and conveniently covers the
ELF binary types (see the updated test).

Author: dmnks

build/rpmfc.cc

@@ -1640,12 +1640,19 @@ rpmRC rpmfcApply(rpmfc fc)
     return rc;
 }
 
+static string rpmfcPrettyFType(rpmfc fc, unsigned ix)
+{
+    string ftype = fc->ftype[ix];
+    size_t len = ftype.find(' ', 10);
+    return ftype.substr(0, len);
+}
+
 static rpmRC rpmfcCheckPackageColor(rpmfc fc)
 {
     Package pkg = fc->pkg;
     const char *a = headerGetString(pkg->header, RPMTAG_ARCH);
     char *nvr;
-    string msg, bins;
+    string msg, type, bins;
     unsigned ix;
     int header_color = headerGetNumber(pkg->header, RPMTAG_HEADERCOLOR);
     int arch_color = rpmGetArchColor(a);
@@ -1671,7 +1678,10 @@ static rpmRC rpmfcCheckPackageColor(rpmfc fc)
 	int color = fc->fcolor[ix];
 	if (!color || color == arch_color)
 	    continue;
+	type = rpmfcPrettyFType(fc, ix);
 	bins += string(4, ' ') + fc->fn[ix].substr(fc->buildRoot.size());
+	if (!type.empty())
+	    bins += " (" + type + ")";
 	bins += '\n';
     }
 

tests/rpmbuild.at

@@ -4110,8 +4110,8 @@ runroot rpmbuild -bb --quiet --target noarch /data/SPECS/hello2.spec
 [1],
 [],
 [error: Arch dependent binaries in noarch package (hello2-1.0-1.noarch):
-    /usr/local/bin/hello
-    /usr/local/bin/hello2
+    /usr/local/bin/hello (ELF 64-bit)
+    /usr/local/bin/hello2 (ELF 64-bit)
 ])
 RPMTEST_CLEANUP
 
@@ -4126,6 +4126,6 @@ runroot rpmbuild -bb --quiet --target x86_64 --with hello32 \
 [0],
 [],
 [warning: Binaries not matching package arch (hello-1.0-1.x86_64):
-    /usr/local/bin/hello
+    /usr/local/bin/hello (ELF 32-bit)
 ])
 RPMTEST_CLEANUP