Merge branch 'jk/ident-loosen-getpwuid'

diff --git a/wrapper.c b/wrapper.c
index dae5675a960b636337dc7890fcfbcc559aa98567..c95e2906b850749cbeb109050359b671979969f2 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -609,6 +609,22 @@ char *xgetcwd(void)
        return strbuf_detach(&sb, NULL);
 }
 
+int xsnprintf(char *dst, size_t max, const char *fmt, ...)
+{
+       va_list ap;
+       int len;
+
+       va_start(ap, fmt);
+       len = vsnprintf(dst, max, fmt, ap);
+       va_end(ap);
+
+       if (len < 0)
+               die("BUG: your snprintf is broken");
+       if (len >= max)
+               die("BUG: attempt to snprintf into too-small buffer");
+       return len;
+}
+
 static int write_file_v(const char *path, int fatal,
                        const char *fmt, va_list params)
 {