add limited support for format builtin in gnu-m4 mode, because I'm fed

up of patching it away in various autoconf derivatives.

okay miod@

1 files changed, 47 insertions, 1 deletions

diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c
index 0b71338263f..973df3b030c 100644
--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gnum4.c,v 1.32 2006/03/20 10:55:19 espie Exp $ */
+/* $OpenBSD: gnum4.c,v 1.33 2006/03/20 20:27:45 espie Exp $ */
 
 /*
  * Copyright (c) 1999 Marc Espie
@@ -503,6 +503,52 @@ doregexp(const char *argv[], int argc)
 }
 
 void
+doformat(const char *argv[], int argc)
+{
+	const char *format = argv[2];
+	int pos = 3;
+	while (*format != 0) {
+		if (*format != '%') {
+			addchar(*format++);
+		} else {
+			format++;
+			if (*format == '%' || *format == 0) {
+				addchar('%');
+				if (*format == '%')
+					format++;
+			} else {
+			    int left_padded = 0;
+			    unsigned long width;
+			    size_t l;
+
+			    if (*format == '-') {
+			    	left_padded = 1;
+				format++;
+			    }
+			    width = strtoul(format, &format, 10);
+			    if (*format != 's') {
+			    	m4errx(1, "Unsupported format specification: %s.", argv[2]);
+			    }
+			    format++;
+			    if (pos >= argc)
+			    	m4errx(1, "Format with too many values.");
+			    l = strlen(argv[pos]);
+			    if (!left_padded) {
+				    while (l < width--)
+					    addchar(' ');
+			    }
+			    addchars(argv[pos++], l);
+			    if (left_padded) {
+			    	while (l < width--)
+					addchar(' ');
+			    }
+			}
+		}
+	}
+	pbstr(getstring());
+}
+
+void
 doesyscmd(const char *cmd)
 {
 	int p[2];