openat: work around AIX 7.1 fstatat bug

[gnulib.git] / lib / vsnprintf.c

diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c
index af567d2..ff5a807 100644 (file)
--- a/lib/vsnprintf.c
+++ b/lib/vsnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
 /* Formatted output to strings.

-   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2011 Free Software Foundation, Inc.

    Written by Simon Josefsson and Yoann Vandoorselaere <yoann@prelude-ids.org>.
 
    This program is free software; you can redistribute it and/or modify
    Written by Simon Josefsson and Yoann Vandoorselaere <yoann@prelude-ids.org>.
 
    This program is free software; you can redistribute it and/or modify


@@ -21,27 +21,21 @@
 #endif
 
 /* Specification.  */
 #endif
 
 /* Specification.  */

-#include "vsnprintf.h"
+#include <stdio.h>

 
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
 
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>

-#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include "vasnprintf.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "vasnprintf.h"
 

-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-

 /* Print formatted output to string STR.  Similar to vsprintf, but
    additional length SIZE limit how much is written into STR.  Returns
    string length of formatted string (which may be larger than SIZE).
    STR may be NULL, in which case nothing will be written.  On error,
 /* Print formatted output to string STR.  Similar to vsprintf, but
    additional length SIZE limit how much is written into STR.  Returns
    string length of formatted string (which may be larger than SIZE).
    STR may be NULL, in which case nothing will be written.  On error,

-   return a negative value. */
+   return a negative value.  */

 int
 vsnprintf (char *str, size_t size, const char *format, va_list args)
 {
 int
 vsnprintf (char *str, size_t size, const char *format, va_list args)
 {


@@ -58,11 +52,11 @@ vsnprintf (char *str, size_t size, const char *format, va_list args)
   if (output != str)
     {
       if (size)
   if (output != str)
     {
       if (size)

-       {
-         size_t pruned_len = (len < size ? len : size - 1);
-         memcpy (str, output, pruned_len);
-         str[pruned_len] = '\0';
-       }
+        {
+          size_t pruned_len = (len < size ? len : size - 1);
+          memcpy (str, output, pruned_len);
+          str[pruned_len] = '\0';
+        }

 
       free (output);
     }
 
       free (output);
     }