karl srclist envvars, vasnprintf

diff --git a/config/srclistvars.sh b/config/srclistvars.sh
index 73f8b7c5123016cf1d853ac9e590591035d56945..caaa8eeae0b5abfa1702531c2051f462d164faaa 100644 (file)
--- a/config/srclistvars.sh
+++ b/config/srclistvars.sh
@@ -1,4 +1,4 @@
-# $Id: srclistvars.sh,v 1.9 2003-07-14 22:44:04 eggert Exp $
+# $Id: srclistvars.sh,v 1.10 2003-07-15 12:42:06 karl Exp $
 # Variables for srclist-update and srclist.txt.
 # Will change for each user.
 
@@ -11,17 +11,21 @@ eggert)
   : ${GNUORG=../gnuorg}
   : ${LIBCSRC=../libc}
   : ${TEXINFOSRC=../texinfo}
-esac
+  ;;
+
+karl)
+  : ${ACLOCAL=/usr/local/gnu/share/aclocal}
+  : ${AUTOCONF=/usr/local/gnu/share/autoconf}
+  : ${AUTOMAKE=$HOME/gnu/src/automake}
+  : ${EMACSSRC=$HOME/gnu/src/emacs}
+  : ${GETTEXT=$HOME/gnu/src/gettext}
+  : ${GNUBIN=/usr/local/gnu/bin}
+  : ${GNUCONFIG=$HOME/gnu/src/ftp.gnu.org/pub/gnu/config}
+  : ${GNULIBSRC=$HOME/gnu/src/gnulib}
+  : ${GNUORG=$HOME/gnu/gnuorg}
+  : ${LIBCSRC=$HOME/gnu/src/libc}
+  : ${TEXINFOSRC=/u/texinfo/src}
+  : ${TEXMFROOT=/usr/local/texmf/texmf}
+  ;;
 
-: ${ACLOCAL=/usr/local/gnu/share/aclocal}
-: ${AUTOCONF=/usr/local/gnu/share/autoconf}
-: ${AUTOMAKE=$HOME/gnu/src/automake}
-: ${EMACSSRC=$HOME/gnu/src/emacs}
-: ${GETTEXT=/usr/local/gnu/share/gettext}
-: ${GNUBIN=/usr/local/gnu/bin}
-: ${GNUCONFIG=$HOME/gnu/src/ftp.gnu.org/pub/gnu/config}
-: ${GNULIBSRC=$HOME/gnu/src/gnulib}
-: ${GNUORG=$HOME/gnu/gnuorg}
-: ${LIBCSRC=$HOME/gnu/src/libc}
-: ${TEXINFOSRC=/u/texinfo/src}
-: ${TEXMFROOT=/usr/local/texmf/texmf}
+esac

diff --git a/lib/ChangeLog b/lib/ChangeLog
index ba97b7d5eb63f9bba8d9f898a484135d8bc96532..5f395ece24209f64ba5d82228ad3cf10ed6ccd8a 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-15    <karl@gnu.org>
+
+       * vasnprintf.c: update from gettext.
+
 2003-07-15  Jim Meyering  <jim@meyering.net>
 
        * makepath.c (make_path): Enclose diagnostic in _(...).

diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 29e601f0b506a7261a0b778acfe37cacb290c380..994f99348382a9fb56335fb539352d5dd75f6b05 100644 (file)
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -39,12 +39,12 @@
 #include "printf-parse.h"
 
 /* For those losing systems which don't have 'alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
+   some additional code emulating it.  */ 
+#ifdef HAVE_ALLOCA 
 # define freea(p) /* nothing */
 #else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
+# define alloca(n) malloc (n) 
+# define freea(p) free (p) 
 #endif
 
 char *
@@ -509,7 +509,7 @@ vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
                    retcount = 0;
 
 #if HAVE_SNPRINTF
-# define SNPRINTF_BUF(arg) \
+#define SNPRINTF_BUF(arg) \
                    switch (prefix_count)                                   \
                      {                                                     \
                      case 0:                                               \
@@ -529,7 +529,7 @@ vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
                        abort ();                                           \
                      }
 #else
-# define SNPRINTF_BUF(arg) \
+#define SNPRINTF_BUF(arg) \
                    switch (prefix_count)                                   \
                      {                                                     \
                      case 0:                                               \