D48504.id149661.diff
No OneTemporary
Actions

Size

783 B

Referenced Files

None

Subscribers

None

D48504.id149661.diff
View Options

	diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
	--- a/usr.bin/xinstall/xinstall.c
	+++ b/usr.bin/xinstall/xinstall.c
	@@ -1432,10 +1432,22 @@
	p = buf;
	/* Print details. */
	fprintf(metafp, ".%s%s type=%s", *p ? "/" : "", p, type);
	- if (owner)
	- fprintf(metafp, " uname=%s", owner);
	- if (group)
	- fprintf(metafp, " gname=%s", group);
	+ if (owner) {
	+ id_t id;
	+
	+ if (parseid(owner, &id))
	+ fprintf(metafp, " uid=%jd", (intmax_t)id);
	+ else
	+ fprintf(metafp, " uname=%s", owner);
	+ }
	+ if (group) {
	+ id_t id;
	+
	+ if (parseid(group, &id))
	+ fprintf(metafp, " gid=%jd", (intmax_t)id);
	+ else
	+ fprintf(metafp, " gname=%s", group);
	+ }
	fprintf(metafp, " mode=%#o", mode);
	if (slink) {
	strsnvis(buf, buflen, slink, VIS_CSTYLE, extra);