[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat/files Handle trailing NUL correctly.

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34309364a27f
branches:  trunk
changeset: 531112:34309364a27f
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Jul 20 00:11:25 2007 +0000

description:
Handle trailing NUL correctly.

diffstat:

 pkgtools/libnbcompat/files/snprintf.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r 065a0b752d94 -r 34309364a27f pkgtools/libnbcompat/files/snprintf.c
--- a/pkgtools/libnbcompat/files/snprintf.c     Fri Jul 20 00:10:06 2007 +0000
+++ b/pkgtools/libnbcompat/files/snprintf.c     Fri Jul 20 00:11:25 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: snprintf.c,v 1.4 2007/07/19 22:06:43 tnn Exp $ */
+/*     $NetBSD: snprintf.c,v 1.5 2007/07/20 00:11:25 tnn Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -45,6 +45,8 @@
 #include <stdarg.h>
 #endif
 
+#define MIN(a, b) ((a)<(b)?(a):(b))
+
 int
 snprintf(char *str, size_t size, const char *format, ...)
 {
@@ -83,10 +85,11 @@
        }
 
        vsprintf(p, format, ap);
-
-       memcpy(str, p, len < size ? len : size);
-       if (len < size)
-               str[len] = 0;
+       
+       if (size > 0) {
+               memcpy(str, p, MIN(len, size));
+               str[MIN(len, size - 1)] = 0;
+       }
 
        if (p != buf)
                free(p);