[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#6674: [PATCH] bug#6674: fix assignment of grep-find-use-xargs on Win
From: |
Óscar Fuentes |
Subject: |
bug#6674: [PATCH] bug#6674: fix assignment of grep-find-use-xargs on Windows/MS-DOS |
Date: |
Mon, 02 Aug 2010 17:48:12 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
Laimonas Vėbra <laimonas.vebra@gmail.com> writes:
> Isn't it wsprintf (used in cmdproxy.c to quote args and for other purposes):
> http://msdn.microsoft.com/en-us/library/ms647550(VS.85).aspx
>
> that imposes 1024 buffer/string length limit...?
2010-08-02 Óscar Fuentes <ofv@wanadoo.es>
* cmdproxy.c (main): use _snprintf instead of wsprintf. Fixes
bug#6647. wsprintf has a 1024 char limit on Windows.
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -35,6 +35,9 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
#include <stdlib.h> /* getenv */
#include <string.h> /* strlen */
+/* We don't want to include stdio.h because we are alreayd duplicating
+ lots of it here */
+int _snprintf(char *buffer, size_t count, const char *format, ...);
/******* Mock C library routines *********************************/
@@ -604,6 +607,7 @@ main (int argc, char ** argv)
{
char * p;
int extra_arg_space = 0;
+ int maxlen, remlen;
int run_command_dot_com;
progname = getenv ("COMSPEC");
@@ -635,21 +639,32 @@ main (int argc, char ** argv)
case path contains spaces (fortunately it can't contain
quotes, since they are illegal in path names). */
- buf = p = alloca (strlen (progname) + extra_arg_space +
- strlen (cmdline) + 16);
+ remlen = maxlen =
+ strlen (progname) + extra_arg_space + strlen (cmdline) + 16;
+ buf = p = alloca (maxlen + 1);
/* Quote progname in case it contains spaces. */
- p += wsprintf (p, "\"%s\"", progname);
+ p += _snprintf (p, remlen, "\"%s\"", progname);
+ remlen = maxlen - (p - buf);
/* Include pass_through_args verbatim; these are just switches
so should not need quoting. */
for (argv = pass_through_args; *argv != NULL; ++argv)
- p += wsprintf (p, " %s", *argv);
+ {
+ p += _snprintf (p, remlen, " %s", *argv);
+ remlen = maxlen - (p - buf);
+ }
if (run_command_dot_com)
- wsprintf(p, " /e:%d /c %s", envsize, cmdline);
+ {
+ _snprintf(p, remlen, " /e:%d /c %s", envsize, cmdline);
+ remlen = maxlen - (p - buf);
+ }
else
- wsprintf(p, " /c %s", cmdline);
+ {
+ _snprintf(p, remlen, " /c %s", cmdline);
+ remlen = maxlen - (p - buf);
+ }
cmdline = buf;
}
else
@@ -669,19 +684,27 @@ main (int argc, char ** argv)
else
path[0] = '\0';
- cmdline = p = alloca (strlen (progname) + extra_arg_space +
- strlen (path) + 13);
+ remlen = maxlen =
+ strlen (progname) + extra_arg_space + strlen (path) + 13;
+ cmdline = p = alloca (maxlen + 1);
/* Quote progname in case it contains spaces. */
- p += wsprintf (p, "\"%s\" %s", progname, path);
+ p += _snprintf (p, remlen, "\"%s\" %s", progname, path);
+ remlen = maxlen - (p - cmdline);
/* Include pass_through_args verbatim; these are just switches
so should not need quoting. */
for (argv = pass_through_args; *argv != NULL; ++argv)
- p += wsprintf (p, " %s", *argv);
+ {
+ p += _snprintf (p, remlen, " %s", *argv);
+ remlen = maxlen - (p - cmdline);
+ }
if (run_command_dot_com)
- wsprintf (p, " /e:%d", envsize);
+ {
+ _snprintf (p, remlen, " /e:%d", envsize);
+ remlen = maxlen - (p - cmdline);
+ }
}
}
- bug#6674: PATCH: fix assignment of grep-find-use-xargs on Windows/MS-DOS, Laimonas Vėbra, 2010/08/02
- bug#6674: PATCH: fix assignment of grep-find-use-xargs on Windows/MS-DOS, Óscar Fuentes, 2010/08/02
- bug#6674: [PATCH] bug#6674: fix assignment of grep-find-use-xargs on Windows/MS-DOS,
Óscar Fuentes <=
- bug#6674: [PATCH] bug#6674: fix assignment of grep-find-use-xargs on Windows/MS-DOS, Andreas Schwab, 2010/08/02
- bug#6674: [PATCH fixed] bug#6674: fix assignment of grep-find-use-xargs on Windows/MS-DOS, Óscar Fuentes, 2010/08/02
- bug#6674: [PATCH fixed] bug#6674: fix assignment of grep-find-use-xargs on Windows/MS-DOS, Eli Zaretskii, 2010/08/02
- bug#6674: [PATCH fixed] bug#6674: fix assignment of grep-find-use-xargs on Windows/MS-DOS, Juanma Barranquero, 2010/08/02
- bug#6674: [PATCH fixed] bug#6674: fix assignment of grep-find-use-xargs on Windows/MS-DOS, Óscar Fuentes, 2010/08/02
- bug#6674: [PATCH fixed] bug#6674: fix assignment of grep-find-use-xargs on Windows/MS-DOS, Juanma Barranquero, 2010/08/02
- bug#6674: [PATCH fixed] bug#6674: fix assignment of grep-find-use-xargs on Windows/MS-DOS, Óscar Fuentes, 2010/08/02
- bug#6674: [PATCH fixed] bug#6674: fix assignment of grep-find-use-xargs on Windows/MS-DOS, Eli Zaretskii, 2010/08/02