From d431c61873753673ad9fcbac90db6db04185e307 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 3 Nov 2009 08:51:31 -0700 Subject: build: reflect gnulib changes to tempname In glibc 2.11 and gnulib, gen_tempname added a parameter suffixlen (unfortunately, it is typed as int rather than size_t, for historical compatibility to a poor choice by BSD). * gnulib: Import latest changes. * gl/lib/tempname.h.diff: Accommodate new suffixlen parameter. * gl/lib/tempname.c.diff (check_x_suffix): Allow for X in suffix beyond x_suffix_len. (gen_tempname_len): Add suffixlen parameter. (__gen_tempname): Update caller. * src/mktemp.c (mkstemp_len, mkdtemp_len): Update callers. --- gl/lib/tempname.h.diff | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gl/lib/tempname.h.diff') diff --git a/gl/lib/tempname.h.diff b/gl/lib/tempname.h.diff index 5ceff5e8f..67074459a 100644 --- a/gl/lib/tempname.h.diff +++ b/gl/lib/tempname.h.diff @@ -1,12 +1,12 @@ diff --git c/lib/tempname.h i/lib/tempname.h -index edf7074..707edf4 100644 +index cd69e7d..9757db2 100644 --- c/lib/tempname.h +++ i/lib/tempname.h -@@ -34,4 +34,7 @@ - GT_DIR: create a directory, which will be mode 0700. +@@ -46,5 +46,7 @@ We use a clever algorithm to get hard-to-predict names. */ -+#include - extern int gen_tempname (char *tmpl, int flags, int kind); -+extern int gen_tempname_len (char *tmpl, int flags, int kind, + extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind); ++extern int gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind, + size_t x_suffix_len); + + #endif /* GL_TEMPNAME_H */ -- cgit v1.2.3-54-g00ecf