test suite additions.

diff --git a/ChangeLog b/ChangeLog
index 83b3d8f..98792d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2003-07-26  Matthias Clasen  <maclas@gmx.de>
 
+       * tests/printf-test.c: New test, tests printf behaviour. This was already mentioned in Makefile.am
+       by accident.
+
+       * tests/file-test.c: New test, currently contains mkstemp tests copied from testglib.c.
+
+       * tests/Makefile.am (test_programs): Add file-test.
+
+       * glib/gprintf.c: Fix all g_return_val_if_fail () checks to return -1 on error to match the
+       behaviour of the stdio printf() family.
+
        * glib/garray.h: 
        * glib/garray.c (g_{,byte,pointer}_remove_range): New functions to remove a range of elements
        from an array.  (#94879, Nalin Dahyabhai)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 83b3d8f..98792d0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,15 @@
 2003-07-26  Matthias Clasen  <maclas@gmx.de>
 
+       * tests/printf-test.c: New test, tests printf behaviour. This was already mentioned in Makefile.am
+       by accident.
+
+       * tests/file-test.c: New test, currently contains mkstemp tests copied from testglib.c.
+
+       * tests/Makefile.am (test_programs): Add file-test.
+
+       * glib/gprintf.c: Fix all g_return_val_if_fail () checks to return -1 on error to match the
+       behaviour of the stdio printf() family.
+
        * glib/garray.h: 
        * glib/garray.c (g_{,byte,pointer}_remove_range): New functions to remove a range of elements
        from an array.  (#94879, Nalin Dahyabhai)

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 83b3d8f..98792d0 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,15 @@
 2003-07-26  Matthias Clasen  <maclas@gmx.de>
 
+       * tests/printf-test.c: New test, tests printf behaviour. This was already mentioned in Makefile.am
+       by accident.
+
+       * tests/file-test.c: New test, currently contains mkstemp tests copied from testglib.c.
+
+       * tests/Makefile.am (test_programs): Add file-test.
+
+       * glib/gprintf.c: Fix all g_return_val_if_fail () checks to return -1 on error to match the
+       behaviour of the stdio printf() family.
+
        * glib/garray.h: 
        * glib/garray.c (g_{,byte,pointer}_remove_range): New functions to remove a range of elements
        from an array.  (#94879, Nalin Dahyabhai)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 83b3d8f..98792d0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,15 @@
 2003-07-26  Matthias Clasen  <maclas@gmx.de>
 
+       * tests/printf-test.c: New test, tests printf behaviour. This was already mentioned in Makefile.am
+       by accident.
+
+       * tests/file-test.c: New test, currently contains mkstemp tests copied from testglib.c.
+
+       * tests/Makefile.am (test_programs): Add file-test.
+
+       * glib/gprintf.c: Fix all g_return_val_if_fail () checks to return -1 on error to match the
+       behaviour of the stdio printf() family.
+
        * glib/garray.h: 
        * glib/garray.c (g_{,byte,pointer}_remove_range): New functions to remove a range of elements
        from an array.  (#94879, Nalin Dahyabhai)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 83b3d8f..98792d0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,15 @@
 2003-07-26  Matthias Clasen  <maclas@gmx.de>
 
+       * tests/printf-test.c: New test, tests printf behaviour. This was already mentioned in Makefile.am
+       by accident.
+
+       * tests/file-test.c: New test, currently contains mkstemp tests copied from testglib.c.
+
+       * tests/Makefile.am (test_programs): Add file-test.
+
+       * glib/gprintf.c: Fix all g_return_val_if_fail () checks to return -1 on error to match the
+       behaviour of the stdio printf() family.
+
        * glib/garray.h: 
        * glib/garray.c (g_{,byte,pointer}_remove_range): New functions to remove a range of elements
        from an array.  (#94879, Nalin Dahyabhai)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 83b3d8f..98792d0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,15 @@
 2003-07-26  Matthias Clasen  <maclas@gmx.de>
 
+       * tests/printf-test.c: New test, tests printf behaviour. This was already mentioned in Makefile.am
+       by accident.
+
+       * tests/file-test.c: New test, currently contains mkstemp tests copied from testglib.c.
+
+       * tests/Makefile.am (test_programs): Add file-test.
+
+       * glib/gprintf.c: Fix all g_return_val_if_fail () checks to return -1 on error to match the
+       behaviour of the stdio printf() family.
+
        * glib/garray.h: 
        * glib/garray.c (g_{,byte,pointer}_remove_range): New functions to remove a range of elements
        from an array.  (#94879, Nalin Dahyabhai)

diff --git a/glib/gprintf.c b/glib/gprintf.c
index 0603cd9..754b191 100644 (file)
--- a/glib/gprintf.c
+++ b/glib/gprintf.c
@@ -179,7 +179,7 @@ gint
 g_vprintf (gchar const *format,
           va_list      args)
 {
-  g_return_val_if_fail (format != NULL, 0);
+  g_return_val_if_fail (format != NULL, -1);
 
   return _g_vprintf (format, args);
 }
@@ -203,7 +203,7 @@ g_vfprintf (FILE        *file,
             gchar const *format,
            va_list      args)
 {
-  g_return_val_if_fail (format != NULL, 0);
+  g_return_val_if_fail (format != NULL, -1);
 
   return _g_vfprintf (file, format, args);
 }
@@ -227,8 +227,8 @@ g_vsprintf (gchar    *string,
            gchar const *format,
            va_list      args)
 {
-  g_return_val_if_fail (string != NULL, 0);
-  g_return_val_if_fail (format != NULL, 0);
+  g_return_val_if_fail (string != NULL, -1);
+  g_return_val_if_fail (format != NULL, -1);
 
   return _g_vsprintf (string, format, args);
 }
@@ -269,8 +269,8 @@ g_vsnprintf (gchar   *string,
             gchar const *format,
             va_list      args)
 {
-  g_return_val_if_fail (n == 0 || string != NULL, 0);
-  g_return_val_if_fail (format != NULL, 0);
+  g_return_val_if_fail (n == 0 || string != NULL, -1);
+  g_return_val_if_fail (format != NULL, -1);
 
   return _g_vsnprintf (string, n, format, args);
 }

diff --git a/tests/Makefile.am b/tests/Makefile.am
index cc4c7b2..1398390 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -66,6 +66,7 @@ test_programs =                                       \
        $(CXX_TEST)                             \
        date-test                               \
        dirname-test                            \
+       file-test                               \
        gio-test                                \
        hash-test                               \
        iochannel-test                          \
@@ -111,6 +112,7 @@ module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
 array_test_LDADD = $(progs_ldadd)
 date_test_LDADD = $(progs_ldadd)
 dirname_test_LDADD = $(progs_ldadd)
+file_test_LDADD = $(progs_ldadd)
 gio_test_LDADD = $(progs_ldadd)
 hash_test_LDADD = $(progs_ldadd)
 iochannel_test_LDADD = $(progs_ldadd)

diff --git a/tests/file-test.c b/tests/file-test.c
new file mode 100644 (file)
index 0000000..a5400cf
--- /dev/null
+++ b/tests/file-test.c
@@ -0,0 +1,87 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GLib Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include "config.h"
+
+#undef G_DISABLE_ASSERT
+#undef G_LOG_DOMAIN
+
+#ifdef GLIB_COMPILATION
+#undef GLIB_COMPILATION
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#include <glib.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+static void
+test_mkstemp (void)
+{
+  char template[32];
+  GError *error;
+  int fd;
+  int i;
+  const char hello[] = "Hello, World";
+  const int hellolen = sizeof (hello) - 1;
+  char chars[62];
+
+  strcpy (template, "foobar");
+  fd = g_mkstemp (template);
+  g_assert (fd == -1 && "g_mkstemp works even if template doesn't end in XXXXXX");
+  close (fd);
+
+  strcpy (template, "fooXXXXXX");
+  fd = g_mkstemp (template);
+  g_assert (fd != -1 && "g_mkstemp didn't work for template fooXXXXXX");
+  i = write (fd, hello, hellolen);
+  g_assert (i != -1 && "write() failed");
+  g_assert (i == hellolen && "write() has written too few bytes");
+
+  lseek (fd, 0, 0);
+  i = read (fd, chars, sizeof (chars));
+  g_assert (i != -1 && "read() failed: %s");
+  g_assert (i == hellolen && "read() has got wrong number of bytes");
+
+  chars[i] = 0;
+  g_assert (strcmp (chars, hello) == 0 && "read() didn't get same string back");
+
+  close (fd);
+  remove (template);
+}
+
+
+int 
+main (int argc, char *argv[])
+{
+  test_mkstemp ();
+
+  return 0;
+}

diff --git a/tests/printf-test.c b/tests/printf-test.c
new file mode 100644 (file)
index 0000000..90a08bf
--- /dev/null
+++ b/tests/printf-test.c
@@ -0,0 +1,199 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GLib Team 2003.  See the AUTHORS
+ * file for a list of people on the GLib Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include "glib.h"
+
+#include <stdio.h>
+#include <string.h>
+
+static gboolean any_failed = FALSE;
+static gboolean failed = FALSE;
+
+#define        TEST(message,cond)      G_STMT_START { failed = !(cond); \
+if (failed) \
+  { if (!message) \
+      g_print ("(%s:%d) failed for: %s\n", __FILE__, __LINE__, ( # cond )); \
+    else \
+      g_print ("(%s:%d) failed for: %s: (%s)\n", __FILE__, __LINE__, ( # cond ), message ? (gchar*)message : ""); \
+    fflush (stdout); \
+    any_failed = TRUE; \
+  } \
+} G_STMT_END
+
+#define TEST_FAILED(message) \
+  G_STMT_START { g_print ("Error: "); g_print message; g_print ("\n"); any_failed = TRUE; } G_STMT_END
+
+
+int
+main (int   argc,
+      char *argv[])
+{
+  gchar buf[128];
+  long l;
+  int i;
+  
+  /* truncation and return value */
+  TEST (NULL, g_snprintf (buf, 0, "abc") == 3);
+  TEST (NULL, g_snprintf (NULL, 0, "abc") == 3);
+  TEST (NULL, g_snprintf (buf, 5, "abc") == 3);
+  TEST (NULL, g_snprintf (buf, 1, "abc") == 3 && buf[0] == '\0' && !strcmp (buf, ""));
+  TEST (NULL, g_snprintf (buf, 2, "abc") == 3 && buf[1] == '\0' && !strcmp (buf, "a"));
+  TEST (NULL, g_snprintf (buf, 3, "abc") == 3 && buf[2] == '\0' && !strcmp (buf, "ab"));
+  TEST (NULL, g_snprintf (buf, 4, "abc") == 3 && buf[3] == '\0' && !strcmp (buf, "abc"));
+  TEST (NULL, g_snprintf (buf, 5, "abc") == 3 && buf[3] == '\0' && !strcmp (buf, "abc"));
+
+  /* %d, basic formatting */
+  TEST (NULL, g_snprintf (buf, 128, "%d", 5) == 1 && !strcmp (buf, "5"));
+  TEST (NULL, g_snprintf (buf, 128, "%d", 0) == 1 && !strcmp (buf, "0"));
+  TEST (NULL, g_snprintf (buf, 128, "%.0d", 0) == 0 && !strcmp (buf, ""));
+  TEST (NULL, g_snprintf (buf, 128, "%.0d", 1) == 1 && !strcmp (buf, "1"));
+  TEST (NULL, g_snprintf (buf, 128, "%d", -1) == 2 && !strcmp (buf, "-1"));
+  TEST (NULL, g_snprintf (buf, 128, "%.3d", 5) == 3 && !strcmp (buf, "005"));
+  TEST (NULL, g_snprintf (buf, 128, "%.3d", -5) == 4 && !strcmp (buf, "-005"));
+  TEST (NULL, g_snprintf (buf, 128, "%5.3d", 5) == 5 && !strcmp (buf, "  005"));
+  TEST (NULL, g_snprintf (buf, 128, "%-5.3d", -5) == 5 && !strcmp (buf, "-005 "));
+  /* %d, length modifiers */
+  TEST (NULL, g_snprintf (buf, 128, "%" G_GINT16_FORMAT, (gint16)-5) == 2 && !strcmp (buf, "-5"));
+  TEST (NULL, g_snprintf (buf, 128, "%" G_GUINT16_FORMAT, (guint16)5) == 1 && !strcmp (buf, "5"));
+  TEST (NULL, g_snprintf (buf, 128, "%" G_GINT32_FORMAT, (gint32)-5) == 2 && !strcmp (buf, "-5"));
+  TEST (NULL, g_snprintf (buf, 128, "%" G_GUINT32_FORMAT, (guint32)5) == 1 && !strcmp (buf, "5"));
+  TEST (NULL, g_snprintf (buf, 128, "%" G_GINT64_FORMAT, (gint64)-5) == 2 && !strcmp (buf, "-5"));
+  TEST (NULL, g_snprintf (buf, 128, "%" G_GUINT64_FORMAT, (guint64)5) == 1 && !strcmp (buf, "5"));
+  /* %d, flags */
+  TEST (NULL, g_snprintf (buf, 128, "%-d", 5) == 1 && !strcmp (buf, "5"));
+  TEST (NULL, g_snprintf (buf, 128, "%-+d", 5) == 2 && !strcmp (buf, "+5"));
+  TEST (NULL, g_snprintf (buf, 128, "%+-d", 5) == 2 && !strcmp (buf, "+5"));
+  TEST (NULL, g_snprintf (buf, 128, "%+d", -5) == 2 && !strcmp (buf, "-5"));
+  TEST (NULL, g_snprintf (buf, 128, "% d", 5) == 2 && !strcmp (buf, " 5"));
+  TEST (NULL, g_snprintf (buf, 128, "% .0d", 0) == 1 && !strcmp (buf, " "));
+  TEST (NULL, g_snprintf (buf, 128, "% +d", 5) == 2 && !strcmp (buf, "+5"));
+  TEST (NULL, g_snprintf (buf, 128, "%03d", 5) == 3 && !strcmp (buf, "005"));
+  TEST (NULL, g_snprintf (buf, 128, "%-03d", -5) == 3 && !strcmp (buf, "-5 "));
+  TEST (NULL, g_snprintf (buf, 128, "%03d", -5) == 3 && !strcmp (buf, "-05"));
+
+  /* %o, basic formatting */
+  TEST (NULL, g_snprintf (buf, 128, "%o", 5) == 1 && !strcmp (buf, "5"));
+  TEST (NULL, g_snprintf (buf, 128, "%o", 8) == 2 && !strcmp (buf, "10"));
+  TEST (NULL, g_snprintf (buf, 128, "%o", 0) == 1 && !strcmp (buf, "0"));
+  TEST (NULL, g_snprintf (buf, 128, "%.0o", 0) == 0 && !strcmp (buf, ""));
+  TEST (NULL, g_snprintf (buf, 128, "%.0o", 1) == 1 && !strcmp (buf, "1"));
+  TEST (NULL, g_snprintf (buf, 128, "%.3o", 5) == 3 && !strcmp (buf, "005"));
+  TEST (NULL, g_snprintf (buf, 128, "%.3o", 8) == 3 && !strcmp (buf, "010"));
+  TEST (NULL, g_snprintf (buf, 128, "%5.3o", 5) == 5 && !strcmp (buf, "  005"));
+
+  /* %u, basic formatting */
+  TEST (NULL, g_snprintf (buf, 128, "%u", 5) == 1 && !strcmp (buf, "5"));
+  TEST (NULL, g_snprintf (buf, 128, "%u", 0) == 1 && !strcmp (buf, "0"));
+  TEST (NULL, g_snprintf (buf, 128, "%.0u", 0) == 0 && !strcmp (buf, ""));
+  TEST (NULL, g_snprintf (buf, 128, "%.0u", 1) == 1 && !strcmp (buf, "1"));
+  TEST (NULL, g_snprintf (buf, 128, "%.3u", 5) == 3 && !strcmp (buf, "005"));
+  TEST (NULL, g_snprintf (buf, 128, "%5.3u", 5) == 5 && !strcmp (buf, "  005"));
+
+  /* %x, basic formatting */
+  TEST (NULL, g_snprintf (buf, 128, "%x", 5) == 1 && !strcmp (buf, "5"));
+  TEST (buf, g_snprintf (buf, 128, "%x", 31) == 2 && !strcmp (buf, "1f"));
+  TEST (NULL, g_snprintf (buf, 128, "%x", 0) == 1 && !strcmp (buf, "0"));
+  TEST (NULL, g_snprintf (buf, 128, "%.0x", 0) == 0 && !strcmp (buf, ""));
+  TEST (NULL, g_snprintf (buf, 128, "%.0x", 1) == 1 && !strcmp (buf, "1"));
+  TEST (NULL, g_snprintf (buf, 128, "%.3x", 5) == 3 && !strcmp (buf, "005"));
+  TEST (NULL, g_snprintf (buf, 128, "%.3x", 31) == 3 && !strcmp (buf, "01f"));
+  TEST (NULL, g_snprintf (buf, 128, "%5.3x", 5) == 5 && !strcmp (buf, "  005"));
+  /* %x, flags */
+  TEST (NULL, g_snprintf (buf, 128, "%-x", 5) == 1 && !strcmp (buf, "5"));
+  TEST (NULL, g_snprintf (buf, 128, "%03x", 5) == 3 && !strcmp (buf, "005"));
+  TEST (NULL, g_snprintf (buf, 128, "%#x", 31) == 4 && !strcmp (buf, "0x1f"));
+  TEST (NULL, g_snprintf (buf, 128, "%#x", 0) == 1 && !strcmp (buf, "0"));
+
+  /* %X, basic formatting */
+  TEST (NULL, g_snprintf (buf, 128, "%X", 5) == 1 && !strcmp (buf, "5"));
+  TEST (buf, g_snprintf (buf, 128, "%X", 31) == 2 && !strcmp (buf, "1F"));
+  TEST (NULL, g_snprintf (buf, 128, "%X", 0) == 1 && !strcmp (buf, "0"));
+  TEST (NULL, g_snprintf (buf, 128, "%.0X", 0) == 0 && !strcmp (buf, ""));
+  TEST (NULL, g_snprintf (buf, 128, "%.0X", 1) == 1 && !strcmp (buf, "1"));
+  TEST (NULL, g_snprintf (buf, 128, "%.3X", 5) == 3 && !strcmp (buf, "005"));
+  TEST (NULL, g_snprintf (buf, 128, "%.3X", 31) == 3 && !strcmp (buf, "01F"));
+  TEST (NULL, g_snprintf (buf, 128, "%5.3X", 5) == 5 && !strcmp (buf, "  005"));
+  /* %X, flags */
+  TEST (NULL, g_snprintf (buf, 128, "%-X", 5) == 1 && !strcmp (buf, "5"));
+  TEST (NULL, g_snprintf (buf, 128, "%03X", 5) == 3 && !strcmp (buf, "005"));
+  TEST (NULL, g_snprintf (buf, 128, "%#X", 31) == 4 && !strcmp (buf, "0X1F"));
+  TEST (NULL, g_snprintf (buf, 128, "%#X", 0) == 1 && !strcmp (buf, "0"));
+
+  /* %f, basic formattting */
+  TEST (NULL, g_snprintf (buf, 128, "%f", G_PI) == 8 && !strncmp (buf, "3.14159", 7));
+  TEST (NULL, g_snprintf (buf, 128, "%.8f", G_PI) == 10 && !strncmp (buf, "3.1415926", 9));
+  TEST (NULL, g_snprintf (buf, 128, "%.0f", G_PI) == 1 && !strcmp (buf, "3"));
+  /* %f, flags */
+  TEST (NULL, g_snprintf (buf, 128, "%+f", G_PI) == 9 && !strncmp (buf, "+3.14159", 8));
+  TEST (NULL, g_snprintf (buf, 128, "% f", G_PI) == 9 && !strncmp (buf, " 3.14159", 8));
+  TEST (NULL, g_snprintf (buf, 128, "%#.0f", G_PI) == 2 && !strcmp (buf, "3."));
+  TEST (NULL, g_snprintf (buf, 128, "%05.2f", G_PI) == 5 && !strcmp (buf, "03.14"));
+
+  /* %e, basic formatting */
+  TEST (NULL, g_snprintf (buf, 128, "%e", G_PI) == 12 && !strcmp (buf, "3.141593e+00"));
+  TEST (NULL, g_snprintf (buf, 128, "%.8e", G_PI) == 14 && !strcmp (buf, "3.14159265e+00"));
+  TEST (buf, g_snprintf (buf, 128, "%.0e", G_PI) == 5 && !strcmp (buf, "3e+00"));
+  TEST (buf, g_snprintf (buf, 128, "%.1e", 0.0) == 7 && !strcmp (buf, "0.0e+00"));
+  TEST (buf, g_snprintf (buf, 128, "%.1e", 0.00001) == 7 && !strcmp (buf, "1.0e-05"));
+  TEST (buf, g_snprintf (buf, 128, "%.1e", 10000.0) == 7 && !strcmp (buf, "1.0e+04"));
+  /* %e, flags */
+  TEST (NULL, g_snprintf (buf, 128, "%+e", G_PI) == 13 && !strcmp (buf, "+3.141593e+00"));
+  TEST (NULL, g_snprintf (buf, 128, "% e", G_PI) == 13 && !strcmp (buf, " 3.141593e+00"));
+  TEST (NULL, g_snprintf (buf, 128, "%#.0e", G_PI) == 6 && !strcmp (buf, "3.e+00"));
+  TEST (NULL, g_snprintf (buf, 128, "%09.2e", G_PI) == 9 && !strcmp (buf, "03.14e+00"));
+
+  /* %c */
+  TEST (NULL, g_snprintf (buf, 128, "%c", 'a') == 1 && !strcmp (buf, "a"));
+
+  /* %s */
+  TEST (NULL, g_snprintf (buf, 128, "%.2s", "abc") == 2 && !strcmp (buf, "ab"));
+  TEST (NULL, g_snprintf (buf, 128, "%.6s", "abc") == 3 && !strcmp (buf, "abc"));
+  TEST (NULL, g_snprintf (buf, 128, "%5s", "abc") == 5 && !strcmp (buf, "  abc"));
+  TEST (NULL, g_snprintf (buf, 128, "%-5s", "abc") == 5 && !strcmp (buf, "abc  "));
+  TEST (NULL, g_snprintf (buf, 128, "%5.2s", "abc") == 5 && !strcmp (buf, "   ab"));
+  TEST (NULL, g_snprintf (buf, 128, "%*s", 5, "abc") == 5 && !strcmp (buf, "  abc"));
+  TEST (NULL, g_snprintf (buf, 128, "%*s", -5, "abc") == 5 && !strcmp (buf, "abc  "));
+  TEST (NULL, g_snprintf (buf, 128, "%*.*s", 5, 2, "abc") == 5 && !strcmp (buf, "   ab"));
+
+  /* %n */
+  TEST (NULL, g_snprintf (buf, 128, "abc%n", &i) == 3 && !strcmp (buf, "abc") && i == 3);
+  TEST (NULL, g_snprintf (buf, 128, "abc%ln", &l) == 3 && !strcmp (buf, "abc") && l == 3);
+
+  /* %% */
+  TEST (NULL, g_snprintf (buf, 128, "%%") == 1 && !strcmp (buf, "%"));
+  
+  /* positional parameters */
+  TEST (NULL, g_snprintf (buf, 128, "%2$c %1$c", 'b', 'a') == 3 && !strcmp (buf, "a b"));
+  TEST (NULL, g_snprintf (buf, 128, "%1$*2$.*3$s", "abc", 5, 2) == 5 && !strcmp (buf, "   ab"));
+  TEST (NULL, g_snprintf (buf, 128, "%1$s%1$s", "abc") == 6 && !strcmp (buf, "abcabc"));
+  
+  return any_failed;
+}
+
+
+
+
+