lib/format.c: implement tostrmode()

classabbyamp · classabbyamp · commit 2fb828de4e28 · 2023-03-14T03:51:10.000-04:00
diff --git a/lib/format.c b/lib/format.c
@@ -183,7 +183,7 @@ nexttok(const char **pos, struct strbuf *buf)
 }
 
 struct conversion {
-	enum { HUMANIZE = 1, STRMODE } type;
+	enum { HUMANIZE = 1, STRMODE = 2 } type;
 	union {
 		struct humanize {
 			unsigned width    : 8;
@@ -571,9 +571,13 @@ humanize(const struct xbps_fmt_spec *spec, int64_t d, FILE *fp)
 }
 
 static int
-tostrmode(const struct xbps_fmt_spec *spec UNUSED, int64_t d UNUSED, FILE *fp UNUSED)
+tostrmode(const struct xbps_fmt_spec *spec, int64_t d, FILE *fp)
 {
-	return -ENOTSUP;
+	char buf[64];
+	int len;
+	xbps_strmode(d, buf);
+	len = strlen(buf);
+	return xbps_fmt_string(spec, buf, len, fp);
 }
 
 int

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ nexttok(const char *pos, struct strbuf buf)`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`struct conversion {`
`186`		`- enum { HUMANIZE = 1, STRMODE } type;`
	`186`	`+ enum { HUMANIZE = 1, STRMODE = 2 } type;`
`187`	`187`	`union {`
`188`	`188`	`struct humanize {`
`189`	`189`	`unsigned width : 8;`
`@@ -571,9 +571,13 @@ humanize(const struct xbps_fmt_spec spec, int64_t d, FILE fp)`
`571`	`571`	`}`
`572`	`572`
`573`	`573`	`static int`
`574`		`-tostrmode(const struct xbps_fmt_spec spec UNUSED, int64_t d UNUSED, FILE fp UNUSED)`
	`574`	`+tostrmode(const struct xbps_fmt_spec spec, int64_t d, FILE fp)`
`575`	`575`	`{`
`576`		`- return -ENOTSUP;`
	`576`	`+ char buf[64];`
	`577`	`+ int len;`
	`578`	`+ xbps_strmode(d, buf);`
	`579`	`+ len = strlen(buf);`
	`580`	`+ return xbps_fmt_string(spec, buf, len, fp);`
`577`	`581`	`}`
`578`	`582`
`579`	`583`	`int`