+2003-11-30 Bruno Haible <bruno@clisp.org>
+
+ * config/install-reloc: Compile also the allocsa.c file.
+
2003-12-17 Bruno Haible <bruno@clisp.org>
* gettext-0.13.1 released.
# Compile wrapper.
installdir=`echo "$destprog" | sed -e 's,/[^/]*$,,'`
-func_verbose $compile_command -I"$builddir" -I"$srcdir" -I"$config_h_dir" -DHAVE_CONFIG_H -DNO_XMALLOC -D"INSTALLPREFIX=\"$prefix\"" -D"INSTALLDIR=\"$installdir\"" -D"LIBPATHVAR=\"$library_path_var\"" -D"LIBDIRS=$libdirs" "$srcdir"/relocwrapper.c "$srcdir"/progname.c "$srcdir"/progreloc.c "$srcdir"/xreadlink.c "$srcdir"/readlink.c "$srcdir"/canonicalize.c "$srcdir"/relocatable.c "$srcdir"/setenv.c "$srcdir"/strerror.c -o $destprog.wrapper || exit $?
+func_verbose $compile_command -I"$builddir" -I"$srcdir" -I"$config_h_dir" -DHAVE_CONFIG_H -DNO_XMALLOC -D"INSTALLPREFIX=\"$prefix\"" -D"INSTALLDIR=\"$installdir\"" -D"LIBPATHVAR=\"$library_path_var\"" -D"LIBDIRS=$libdirs" "$srcdir"/relocwrapper.c "$srcdir"/progname.c "$srcdir"/progreloc.c "$srcdir"/xreadlink.c "$srcdir"/readlink.c "$srcdir"/canonicalize.c "$srcdir"/allocsa.c "$srcdir"/relocatable.c "$srcdir"/setenv.c "$srcdir"/strerror.c -o $destprog.wrapper || exit $?
# Rename $destprog.wrapper -> $destprog -> $destprog.bin.
ln -f $destprog $destprog.bin || exit 1
+2003-11-30 Bruno Haible <bruno@clisp.org>
+
+ * configure.ac: Invoke gl_ALLOCSA instead of gl_FUNC_ALLOCA.
+
2003-12-17 Bruno Haible <bruno@clisp.org>
* gettext-0.13.1 released.
AC_TYPE_SIZE_T
dnl Checks for library functions.
-gl_FUNC_ALLOCA
+gl_ALLOCSA
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([setlocale strerror strtoul])
AC_REPLACE_FUNCS([atexit memmove])
+2003-11-30 Bruno Haible <bruno@clisp.org>
+
+ * configure.ac: Invoke gl_ALLOCSA instead of gl_FUNC_ALLOCA.
+ * windows/gettextlib.def: Add mallocsa, xmallocsa, freesa.
+
2003-12-17 Bruno Haible <bruno@clisp.org>
* gettext-0.13.1 released.
gt_TYPE_SIG_ATOMIC_T
dnl Checks for library functions.
-gl_FUNC_ALLOCA
+gl_ALLOCSA
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([chown getcwd posix_spawn raise select strerror strtoul uname \
utime utimes waitid])
+2003-11-30 Bruno Haible <bruno@clisp.org>
+
+ Safer stack allocation.
+ * allocsa.h: New file.
+ * allocsa.c: New file.
+ * xallocsa.h: New file.
+ * xallocsa.c: New file.
+ * canonicalize.c: Include allocsa.h.
+ (__realpath): Use allocsa instead of alloca. Don't clobber errno right
+ before returning NULL.
+ * javacomp.c: Include xallocsa.h.
+ (compile_java_class): Use allocsa instead of alloca.
+ * javaexec.c: Include xallocsa.h.
+ (execute_java_class): Use allocsa instead of alloca.
+ * relocwrapper.c: Indirectly depends on allocsa.
+ * setenv.c: Include allocsa.h.
+ (alloca): Remove fallback definition.
+ (freea): Remove macro.
+ (__add_to_environ) [!_LIBC]: Use allocsa instead of alloca. Use freesa
+ instead of freea.
+ * Makefile.am (libgettextlib_la_SOURCES): Add allocsa.h, allocsa.c,
+ xallocsa.h, xallocsa.c.
+ * Makefile.msvc (OBJECTS): Add allocsa.obj, xallocsa.obj.
+ (allocsa.obj, xallocsa.obj): New rules.
+ * Makefile.vms (OBJECTS): Add allocsa.obj, xallocsa.obj.
+ (allocsa.obj, xallocsa.obj): New rules.
+
2003-12-17 Bruno Haible <bruno@clisp.org>
* gettext-0.13.1 released.
# Sources that are compiled on all platforms.
libgettextlib_la_SOURCES = \
+ allocsa.h allocsa.c \
argmatch.h argmatch.c \
backupfile.h backupfile.c addext.c \
basename.h basename.c \
unlocked-io.h \
wait-process.h wait-process.c \
xalloc.h xmalloc.c xstrdup.c \
+ xallocsa.h xallocsa.c \
xerror.h xerror.c \
xreadlink.h xreadlink.c \
xsetenv.h xsetenv.c \
SHELL = /bin/sh
OBJECTS = \
+ allocsa.obj \
argmatch.obj \
backupfile.obj addext.obj \
basename.obj \
tmpdir.obj \
wait-process.obj \
xmalloc.obj xstrdup.obj \
+ xallocsa.obj \
xerror.obj \
xsetenv.obj \
\
all : gettextlib.lib
+allocsa.obj : allocsa.c
+ $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c allocsa.c
+
argmatch.obj : argmatch.c
$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c argmatch.c
xstrdup.obj : xstrdup.c
$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xstrdup.c
+xallocsa.obj : xallocsa.c
+ $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xallocsa.c
+
xerror.obj : xerror.c
$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xerror.c
#### End of system configuration section. ####
OBJECTS = \
+ allocsa.obj, \
argmatch.obj, \
backupfile.obj, addext.obj, \
basename.obj, \
tmpdir.obj, \
wait-process.obj, \
xmalloc.obj, xstrdup.obj, \
+ xallocsa.obj, \
xerror.obj, \
xsetenv.obj, \
\
fnmatch.h : fnmatch_.h
$(LN) fnmatch_.h fnmatch.h
+allocsa.obj : allocsa.c
+ $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) allocsa.c
+
argmatch.obj : argmatch.c
$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) argmatch.c
xstrdup.obj : xstrdup.c
$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xstrdup.c
+xallocsa.obj : xallocsa.c
+ $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xallocsa.c
+
xerror.obj : xerror.c
$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xerror.c
# define __canonicalize_file_name canonicalize_file_name
# define __realpath rpl_realpath
# include "pathmax.h"
-# define __alloca alloca
+# include "allocsa.h"
# if HAVE_GETCWD
# ifdef VMS
/* We want the directory in Unix syntax, not in VMS syntax. */
#ifdef S_ISLNK
if (S_ISLNK (st.st_mode))
{
- char *buf = __alloca (path_max);
+ char *buf;
size_t len;
if (++num_links > MAXSYMLINKS)
goto error;
}
+ buf = allocsa (path_max);
+ if (!buf)
+ {
+ errno = ENOMEM;
+ goto error;
+ }
+
n = __readlink (rpath, buf, path_max);
if (n < 0)
- goto error;
+ {
+ int saved_errno = errno;
+ freesa (buf);
+ errno = saved_errno;
+ goto error;
+ }
buf[n] = '\0';
if (!extra_buf)
- extra_buf = __alloca (path_max);
+ {
+ extra_buf = allocsa (path_max);
+ if (!extra_buf)
+ {
+ freesa (buf);
+ errno = ENOMEM;
+ goto error;
+ }
+ }
len = strlen (end);
if ((long int) (n + len) >= path_max)
{
+ freesa (buf);
__set_errno (ENAMETOOLONG);
goto error;
}
--dest;
*dest = '\0';
+ if (extra_buf)
+ freesa (extra_buf);
+
return resolved ? memcpy (resolved, rpath, dest - rpath + 1) : rpath;
error:
- if (resolved)
- strcpy (resolved, rpath);
- else
- free (rpath);
+ {
+ int saved_errno = errno;
+ if (extra_buf)
+ freesa (extra_buf);
+ if (resolved)
+ strcpy (resolved, rpath);
+ else
+ free (rpath);
+ errno = saved_errno;
+ }
return NULL;
}
#ifdef _LIBC
#include "sh-quote.h"
#include "safe-read.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "error.h"
#include "gettext.h"
command_length += 1 + shell_quote_length (java_sources[i]);
command_length += 1;
- command = (char *) alloca (command_length);
+ command = (char *) xallocsa (command_length);
p = command;
/* Don't shell_quote $JAVAC, because it may consist of a command
and options. */
true, true);
err = (exitstatus != 0);
+ freesa (command);
+
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
argc =
2 + (optimize ? 1 : 0) + (debug ? 1 : 0) + (directory != NULL ? 2 : 0)
+ java_sources_count;
- argv = (char **) alloca ((argc + 1) * sizeof (char *));
+ argv = (char **) xallocsa ((argc + 1) * sizeof (char *));
argp = argv;
*argp++ = "gcj";
true);
err = (exitstatus != 0);
+ freesa (argv);
+
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
argc =
1 + (optimize ? 1 : 0) + (debug ? 1 : 0) + (directory != NULL ? 2 : 0)
+ java_sources_count;
- argv = (char **) alloca ((argc + 1) * sizeof (char *));
+ argv = (char **) xallocsa ((argc + 1) * sizeof (char *));
argp = argv;
*argp++ = "javac";
true, true);
err = (exitstatus != 0);
+ freesa (argv);
+
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
argc =
1 + (optimize ? 1 : 0) + (debug ? 1 : 0) + (directory != NULL ? 2 : 0)
+ java_sources_count;
- argv = (char **) alloca ((argc + 1) * sizeof (char *));
+ argv = (char **) xallocsa ((argc + 1) * sizeof (char *));
argp = argv;
*argp++ = "jikes";
true, true);
err = (exitstatus != 0);
+ freesa (argv);
+
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
#include "sh-quote.h"
#include "pathname.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "error.h"
#include "gettext.h"
{
char *exe_pathname = concatenated_pathname (exe_dir, class_name, EXEEXT);
char *old_classpath;
- char **argv = (char **) alloca ((1 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) xallocsa ((1 + nargs + 1) * sizeof (char *));
unsigned int i;
/* Set CLASSPATH. */
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
+ freesa (argv);
+
goto done1;
}
command_length += 1 + shell_quote_length (*arg);
command_length += 1;
- command = (char *) alloca (command_length);
+ command = (char *) xallocsa (command_length);
p = command;
/* Don't shell_quote $JAVA, because it may consist of a command
and options. */
argv[3] = NULL;
err = executer (java, "/bin/sh", argv, private_data);
+ freesa (command);
+
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
if (gij_present)
{
char *old_classpath;
- char **argv = (char **) alloca ((2 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) xallocsa ((2 + nargs + 1) * sizeof (char *));
unsigned int i;
/* Set CLASSPATH. */
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
+ freesa (argv);
+
goto done2;
}
}
if (java_present)
{
char *old_classpath;
- char **argv = (char **) alloca ((2 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) xallocsa ((2 + nargs + 1) * sizeof (char *));
unsigned int i;
/* Set CLASSPATH. We don't use the "-classpath ..." option because
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
+ freesa (argv);
+
goto done2;
}
}
if (jre_present)
{
char *old_classpath;
- char **argv = (char **) alloca ((2 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) xallocsa ((2 + nargs + 1) * sizeof (char *));
unsigned int i;
/* Set CLASSPATH. We don't use the "-classpath ..." option because
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
+ freesa (argv);
+
goto done2;
}
}
if (jview_present)
{
char *old_classpath;
- char **argv = (char **) alloca ((2 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) xallocsa ((2 + nargs + 1) * sizeof (char *));
unsigned int i;
/* Set CLASSPATH. */
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
+ freesa (argv);
+
goto done2;
}
}
-> xreadlink
-> readlink
-> canonicalize
+ -> allocsa
-> relocatable
-> setenv
+ -> allocsa
-> strerror
Macros that need to be set while compiling this file:
# include <unistd.h>
#endif
-/* For those losing systems which don't have 'alloca' we have to add
- some additional code emulating it. */
-#if _LIBC || HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
+#if !_LIBC
+# include "allocsa.h"
#endif
#if !_LIBC
{
/* See whether the value is already known. */
#ifdef USE_TSEARCH
- new_value = (char *) alloca (namelen + 1 + vallen);
# ifdef _LIBC
+ new_value = (char *) alloca (namelen + 1 + vallen);
__mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1),
value, vallen);
# else
+ new_value = (char *) allocsa (namelen + 1 + vallen);
+ if (new_value == NULL)
+ {
+ __set_errno (ENOMEM);
+ UNLOCK;
+ return -1;
+ }
memcpy (new_value, name, namelen);
new_value[namelen] = '=';
memcpy (&new_value[namelen + 1], value, vallen);
new_environ[size] = (char *) malloc (namelen + 1 + vallen);
if (new_environ[size] == NULL)
{
-#ifdef USE_TSEARCH
- freea (new_value);
+#if defined USE_TSEARCH && !defined _LIBC
+ freesa (new_value);
#endif
__set_errno (ENOMEM);
UNLOCK;
user string or not. */
STORE_VALUE (new_environ[size]);
}
-#ifdef USE_TSEARCH
- freea (new_value);
+#if defined USE_TSEARCH && !defined _LIBC
+ freesa (new_value);
#endif
}
else
{
#ifdef USE_TSEARCH
- char *new_value = alloca (namelen + 1 + vallen);
+ char *new_value;
# ifdef _LIBC
+ new_value = alloca (namelen + 1 + vallen);
__mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1),
value, vallen);
# else
+ new_value = allocsa (namelen + 1 + vallen);
+ if (new_value == NULL)
+ {
+ __set_errno (ENOMEM);
+ UNLOCK;
+ return -1;
+ }
memcpy (new_value, name, namelen);
new_value[namelen] = '=';
memcpy (&new_value[namelen + 1], value, vallen);
np = malloc (namelen + 1 + vallen);
if (np == NULL)
{
-#ifdef USE_TSEARCH
- freea (new_value);
+#if defined USE_TSEARCH && !defined _LIBC
+ freesa (new_value);
#endif
+ __set_errno (ENOMEM);
UNLOCK;
return -1;
}
/* And remember the value. */
STORE_VALUE (np);
}
-#ifdef USE_TSEARCH
- freea (new_value);
+#if defined USE_TSEARCH && !defined _LIBC
+ freesa (new_value);
#endif
}
+2003-11-30 Bruno Haible <bruno@clisp.org>
+
+ * allocsa.m4: New file.
+ * eealloc.m4: New file.
+ * setenv.m4 (gl_PREREQ_SETENV): Require gl_ALLOCSA instead of
+ AC_FUNC_ALLOCA.
+ * Makefile.am (EXTRA_DIST): Add allocsa.m4, eealloc.m4.
+
2003-12-17 Bruno Haible <bruno@clisp.org>
* gettext-0.13.1 released.
# find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
EXTRA_DIST = README ChangeLog.0 \
alloca.m4 \
+allocsa.m4 \
backupfile.m4 \
canonicalize.m4 \
eaccess.m4 \
+eealloc.m4 \
error.m4 \
extensions.m4 \
fnmatch.m4 \
-# setenv.m4 serial 3
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# setenv.m4 serial 4
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
# Prerequisites of lib/setenv.c.
AC_DEFUN([gl_PREREQ_SETENV],
[
- AC_REQUIRE([AC_FUNC_ALLOCA])
+ AC_REQUIRE([gl_ALLOCSA])
AC_CHECK_HEADERS_ONCE(stdlib.h string.h unistd.h)
AC_CHECK_HEADERS(search.h)
AC_CHECK_FUNCS(tsearch)
+2003-11-30 Bruno Haible <bruno@clisp.org>
+
+ * format-java.c: Include xallocsa.h.
+ (message_format_parse): Use xallocsa instead of alloca.
+ (choice_format_parse): Likewise.
+ * msgl-cat.c: Include xallocsa.h.
+ (catenate_msgdomain_list): Use xallocsa instead of alloca.
+ * msgl-charset.c: Include xallocsa.h.
+ (compare_po_locale_charsets): Use xallocsa instead of alloca.
+ * msgl-iconv.c: Include xallocsa.h.
+ (iconv_message_list): Use xallocsa instead of alloca.
+ * po-charset.c: Include xallocsa.h.
+ (po_lex_charset_set): Use xallocsa instead of alloca.
+ * read-tcl.c: Include xallocsa.h.
+ (msgdomain_read_tcl): Use xallocsa instead of alloca.
+ * write-java.c: Include xallocsa.h.
+ (compute_hashsize, msgdomain_write_java): Use xallocsa instead of
+ alloca.
+ * write-mo.c: Include xallocsa.h.
+ (write_table): Use xallocsa instead of alloca.
+ * write-po.c: Include xallocsa.h.
+ (msgdomain_list_print_po): Use xallocsa instead of alloca.
+ * write-tcl.c: Include xallocsa.h.
+ (msgdomain_write_tcl): Use xallocsa instead of alloca.
+ * msggrep.c: Include xallocsa.h.
+ (is_message_selected): Use xallocsa instead of alloca.
+ * msginit.c: Include xallocsa.h.
+ (subst_string): Use xallocsa instead of alloca.
+ * msgmerge.c: Include obstack.h.
+ (obstack_chunk_alloc, obstack_chunk_free): New macros.
+ (message_merge): Use obstack_alloc instead of alloca.
+ * xgettext.c: Include xallocsa.h.
+ (flag_context_list_table_insert): Use xallocsa instead of alloca.
+
2003-12-17 Bruno Haible <bruno@clisp.org>
* gettext-0.13.1 released.
#include "format.h"
#include "c-ctype.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "xerror.h"
#include "format-invalid.h"
#include "error.h"
element_end = format++;
n = element_end - element_start;
- element = (char *) alloca (n + 1);
+ element = (char *) xallocsa (n + 1);
memcpy (element, element_start, n);
element[n] = '\0';
{
*invalid_reason =
xasprintf (_("In the directive number %u, '{' is not followed by an argument number."), spec->directives);
+ freesa (element);
return false;
}
number = 0;
{
*invalid_reason =
xasprintf (_("In the directive number %u, the substring \"%s\" is not a valid date/time style."), spec->directives, element);
+ freesa (element);
return false;
}
}
element -= 4;
*invalid_reason =
xasprintf (_("In the directive number %u, \"%s\" is not followed by a comma."), spec->directives, element);
+ freesa (element);
return false;
}
}
{
*invalid_reason =
xasprintf (_("In the directive number %u, the substring \"%s\" is not a valid number style."), spec->directives, element);
+ freesa (element);
return false;
}
}
element -= 6;
*invalid_reason =
xasprintf (_("In the directive number %u, \"%s\" is not followed by a comma."), spec->directives, element);
+ freesa (element);
return false;
}
}
if (choice_format_parse (element, spec, invalid_reason))
;
else
- return false;
+ {
+ freesa (element);
+ return false;
+ }
}
else
{
element -= 6;
*invalid_reason =
xasprintf (_("In the directive number %u, \"%s\" is not followed by a comma."), spec->directives, element);
+ freesa (element);
return false;
}
}
{
*invalid_reason =
xasprintf (_("In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."), spec->directives, "time", "date", "number", "choice");
+ freesa (element);
return false;
}
+ freesa (element);
if (spec->allocated == spec->numbered_arg_count)
{
bool number_nonempty;
char *msgformat;
char *mp;
+ bool msgformat_valid;
/* Parse number. */
number_nonempty = false;
}
HANDLE_QUOTE;
- msgformat = (char *) alloca (strlen (format) + 1);
+ msgformat = (char *) xallocsa (strlen (format) + 1);
mp = msgformat;
while (*format != '\0' && !(!quoting && *format == '|'))
}
*mp = '\0';
- if (!message_format_parse (msgformat, spec, invalid_reason))
+ msgformat_valid = message_format_parse (msgformat, spec, invalid_reason);
+
+ freesa (msgformat);
+
+ if (!msgformat_valid)
return false;
if (*format == '\0')
#include "str-list.h"
#include "msgl-charset.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "exit.h"
#include "full-write.h"
#include "findprog.h"
char *total_comment;
char *q;
size_t j;
+ bool selected;
length = 0;
for (j = 0; j < mp->comment->nitems; j++)
length += strlen (mp->comment->item[j]) + 1;
- total_comment = (char *) alloca (length);
+ total_comment = (char *) xallocsa (length);
q = total_comment;
for (j = 0; j < mp->comment->nitems; j++)
if (q != total_comment + length)
abort ();
- if (is_string_selected (2, total_comment, length))
+ selected = is_string_selected (2, total_comment, length);
+
+ freesa (total_comment);
+
+ if (selected)
return true;
}
#include "po-time.h"
#include "plural-table.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "exit.h"
#include "pathname.h"
#include "xerror.h"
size_t i;
unsigned int j;
- substlen = (size_t *) alloca (nsubst * sizeof (size_t));
+ substlen = (size_t *) xallocsa (nsubst * sizeof (size_t));
for (j = 0; j < nsubst; j++)
{
substlen[j] = strlen (subst[j][0]);
if (j == nsubst)
i++;
}
+
+ freesa (substlen);
}
return str;
#include "msgl-equal.h"
#include "msgl-iconv.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "strstr.h"
#include "basename.h"
#include "exit.h"
charsetstr += strlen ("charset=");
len = strcspn (charsetstr, " \t\n");
- charset = (char *) alloca (len + 1);
+ charset = (char *) xallocsa (len + 1);
memcpy (charset, charsetstr, len);
charset[len] = '\0';
charset);
}
+ freesa (charset);
+
if (canon_from_code == NULL)
canon_from_code = canon_charset;
else if (canon_from_code != canon_charset)
#include "error.h"
#include "progname.h"
#include "basename.h"
+#include "xallocsa.h"
#include "xerror.h"
#include "message.h"
#include "strstr.h"
charsetstr += strlen ("charset=");
len = strcspn (charsetstr, " \t\n");
- charset = (char *) alloca (len + 1);
+ charset = (char *) xallocsa (len + 1);
memcpy (charset, charsetstr, len);
charset[len] = '\0';
_("\
present charset \"%s\" is not a portable encoding name"),
charset);
+ freesa (charset);
if (canon_locale_code != canon_charset)
{
multiline_warning (xasprintf (_("warning: ")),
#include "po-charset.h"
#include "msgl-ascii.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "strstr.h"
#include "exit.h"
#include "gettext.h"
charsetstr += strlen ("charset=");
len = strcspn (charsetstr, " \t\n");
- charset = (char *) alloca (len + 1);
+ charset = (char *) xallocsa (len + 1);
memcpy (charset, charsetstr, len);
charset[len] = '\0';
two different charsets \"%s\" and \"%s\" in input file"),
canon_from_code, canon_charset);
}
+ freesa (charset);
len1 = charsetstr - header;
len2 = strlen (canon_to_code);
#include <stdlib.h>
#include <string.h>
+#include "xallocsa.h"
#include "xerror.h"
#include "basename.h"
#include "progname.h"
charsetstr += strlen ("charset=");
len = strcspn (charsetstr, " \t\n");
- charset = (char *) alloca (len + 1);
+ charset = (char *) xallocsa (len + 1);
memcpy (charset, charsetstr, len);
charset[len] = '\0';
#endif
}
}
+ freesa (charset);
}
else
{
#include "pipe.h"
#include "wait-process.h"
#include "read-po.h"
+#include "xallocsa.h"
#include "error.h"
#include "exit.h"
#include "gettext.h"
/* Convert the locale name to lowercase and remove any encoding. */
len = strlen (locale_name);
- frobbed_locale_name = (char *) alloca (len + 1);
+ frobbed_locale_name = (char *) xallocsa (len + 1);
memcpy (frobbed_locale_name, locale_name, len + 1);
for (p = frobbed_locale_name; *p != '\0'; p++)
if (*p >= 'A' && *p <= 'Z')
file_name = concatenated_pathname (directory, frobbed_locale_name, ".msg");
+ freesa (frobbed_locale_name);
+
/* Prepare arguments. */
argv[0] = "tclsh";
argv[1] = tclscript;
#include "plural-exp.h"
#include "po-charset.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "pathname.h"
#include "fatal-signal.h"
#include "fwriteerror.h"
#define XXN 3 /* can be tweaked */
#define XXS 3 /* can be tweaked */
unsigned int n = mlp->nitems;
- unsigned int *hashcodes = (unsigned int *) alloca (n * sizeof (unsigned int));
+ unsigned int *hashcodes =
+ (unsigned int *) xallocsa (n * sizeof (unsigned int));
unsigned int hashsize;
unsigned int best_hashsize;
unsigned int best_score;
if (best_hashsize == 0 || best_score < best_hashsize)
abort ();
+ freesa (hashcodes);
+
/* There are collisions if and only if best_score > best_hashsize. */
*collisionp = (best_score > best_hashsize);
return best_hashsize;
}
/* Create a temporary directory where we can put the Java file. */
- template = (char *) alloca (PATH_MAX);
+ template = (char *) xallocsa (PATH_MAX);
if (path_search (template, PATH_MAX, NULL, "msg", 1))
{
error (0, errno,
else
class_name = xstrdup (resource_name);
- subdirs = (ndots > 0 ? (char **) alloca (ndots * sizeof (char *)) : NULL);
+ subdirs = (ndots > 0 ? (char **) xallocsa (ndots * sizeof (char *)) : NULL);
{
const char *p;
const char *last_dir;
{
const char *q = strchr (p, '.');
size_t n = q - p;
- char *part = (char *) alloca (n + 1);
+ char *part = (char *) xallocsa (n + 1);
memcpy (part, p, n);
part[n] = '\0';
subdirs[i] = concatenated_pathname (last_dir, part, NULL);
+ freesa (part);
last_dir = subdirs[i];
p = q + 1;
}
for (i = 0; i < ndots; i++)
free (subdirs[i]);
}
+ freesa (subdirs);
free (class_name);
quit2:
rmdir (tmpdir);
quit1:
cleanup_list.tmpdir = NULL;
+ freesa (template);
/* Here we could unregister the cleanup() handler. */
return retval;
}
#include "message.h"
#include "format.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "binary-io.h"
#include "fwriteerror.h"
#include "exit.h"
struct pre_sysdep_string *pre = msg->str[m];
struct sysdep_string *str =
(struct sysdep_string *)
- alloca (sizeof (struct sysdep_string)
- + pre->segmentcount * sizeof (struct segment_pair));
+ xallocsa (sizeof (struct sysdep_string)
+ + pre->segmentcount * sizeof (struct segment_pair));
unsigned int i;
offset = roundup (offset, alignment);
+ pre->segmentcount * sizeof (struct segment_pair),
1, output_file);
- freea (str);
+ freesa (str);
}
}
#include "write-properties.h"
#include "write-stringtable.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "strstr.h"
#include "fwriteerror.h"
#include "exit.h"
message_list_ty *mlp;
const char *header;
char *charset;
+ char *allocated_charset;
/* If the first domain is the default, don't bother emitting
the domain name, because it is the default. */
/* Extract the charset name. */
charset = "ASCII";
+ allocated_charset = NULL;
if (header != NULL)
{
const char *charsetstr = strstr (header, "charset=");
charsetstr += strlen ("charset=");
len = strcspn (charsetstr, " \t\n");
- charset = (char *) alloca (len + 1);
+ charset = allocated_charset = (char *) xallocsa (len + 1);
memcpy (charset, charsetstr, len);
charset[len] = '\0';
message_print_obsolete (mlp->item[j], fp, charset, blank_line);
blank_line = true;
}
+
+ if (allocated_charset != NULL)
+ freesa (allocated_charset);
}
}
#include "msgl-iconv.h"
#include "po-charset.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "pathname.h"
#include "fwriteerror.h"
#include "exit.h"
/* Convert the locale name to lowercase and remove any encoding. */
len = strlen (locale_name);
- frobbed_locale_name = (char *) alloca (len + 1);
+ frobbed_locale_name = (char *) xallocsa (len + 1);
memcpy (frobbed_locale_name, locale_name, len + 1);
for (p = frobbed_locale_name; *p != '\0'; p++)
if (*p >= 'A' && *p <= 'Z')
{
error (0, errno, _("error while opening \"%s\" for writing"),
file_name);
+ freesa (frobbed_locale_name);
return 1;
}
file_name);
fclose (output_file);
+ freesa (frobbed_locale_name);
}
return 0;
#include "basename.h"
#include "xerror.h"
#include "xalloc.h"
+#include "xallocsa.h"
#include "strstr.h"
#include "xerror.h"
#include "exit.h"
const char *name_start, const char *name_end,
int argnum, enum is_format value, bool pass)
{
+ char *allocated_name = NULL;
+
if (table == &flag_table_lisp)
{
/* Convert NAME to upper case. */
size_t name_len = name_end - name_start;
- char *name = (char *) alloca (name_len);
+ char *name = allocated_name = (char *) xallocsa (name_len);
size_t i;
for (i = 0; i < name_len; i++)
}
}
}
+
+ if (allocated_name != NULL)
+ freesa (allocated_name);
}
find_backup_file_name
find_entry
find_in_path
+freesa
fstrcmp
full_write
fwriteerror
insert_entry
iterate_table
locale_charset
+mallocsa
maybe_print_progname
mbs_width_linebreaks
mbsnwidth
xcalloc
xget_version
xmalloc
+xmallocsa
xrealloc
xsetenv
xstrdup
projects / thirdparty / gettext.git / commitdiff
