* binutils sprintf optimisation
@ 2023-08-03 11:47 Alan Modra
0 siblings, 0 replies; only message in thread
From: Alan Modra @ 2023-08-03 11:47 UTC (permalink / raw)
To: binutils
Avoid the use of sprintf with a "%s" format string, replacing with
strcpy or stpcpy. Use sprintf return value rather than a later
strlen. Don't use strcat where we can keep track of the end of a
string output buffer.
* dlltool.c (look_for_prog): memcpy prefix and strcpy prog_name.
* dllwrap.c (look_for_prog): Likewise.
* resrc.c (look_for_default): Likewise. Add quotes with memmove
rather than allocating another buffer.
* size.c (size_number): Use sprintf return value.
* stabs.c (parse_stab_argtypes): Likewise.
* windmc.c (write_bin): Likewes, and use stpcpy.
* wrstabs.c: Similarly throughout.
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index efa54f1bd72..085d4c2ce41 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -4188,9 +4188,9 @@ look_for_prog (const char *prog_name, const char *prefix, int end_prefix)
+ strlen (EXECUTABLE_SUFFIX)
#endif
+ 10);
- strcpy (cmd, prefix);
+ memcpy (cmd, prefix, end_prefix);
- sprintf (cmd + end_prefix, "%s", prog_name);
+ strcpy (cmd + end_prefix, prog_name);
if (strchr (cmd, '/') != NULL)
{
diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c
index e6fee8bb061..f333eb561e2 100644
--- a/binutils/dllwrap.c
+++ b/binutils/dllwrap.c
@@ -186,9 +186,9 @@ look_for_prog (const char *progname, const char *prefix, int end_prefix)
+ strlen (EXECUTABLE_SUFFIX)
#endif
+ 10);
- strcpy (cmd, prefix);
+ memcpy (cmd, prefix, end_prefix);
- sprintf (cmd + end_prefix, "%s", progname);
+ strcpy (cmd + end_prefix, progname);
if (strchr (cmd, '/') != NULL)
{
diff --git a/binutils/resrc.c b/binutils/resrc.c
index 0d7a6e1cdbc..468e2fd8fe1 100644
--- a/binutils/resrc.c
+++ b/binutils/resrc.c
@@ -383,9 +383,9 @@ look_for_default (char *cmd, const char *prefix, int end_prefix,
struct stat s;
const char *fnquotes = (filename_need_quotes (filename) ? "\"" : "");
- strcpy (cmd, prefix);
+ memcpy (cmd, prefix, end_prefix);
- sprintf (cmd + end_prefix, "%s", DEFAULT_PREPROCESSOR_CMD);
+ char *out = stpcpy (cmd + end_prefix, DEFAULT_PREPROCESSOR_CMD);
if (
#if defined (__DJGPP__) || defined (__CYGWIN__) || defined (_WIN32)
@@ -409,13 +409,13 @@ look_for_default (char *cmd, const char *prefix, int end_prefix,
if (filename_need_quotes (cmd))
{
- char *cmd_copy = xmalloc (strlen (cmd));
- strcpy (cmd_copy, cmd);
- sprintf (cmd, "\"%s\"", cmd_copy);
- free (cmd_copy);
+ memmove (cmd + 1, cmd, out - cmd);
+ cmd[0] = '"';
+ out++;
+ *out++ = '"';
}
- sprintf (cmd + strlen (cmd), " %s %s %s%s%s",
+ sprintf (out, " %s %s %s%s%s",
DEFAULT_PREPROCESSOR_ARGS, preprocargs, fnquotes, filename, fnquotes);
if (verbose)
diff --git a/binutils/size.c b/binutils/size.c
index 94738977cb8..243c740159a 100644
--- a/binutils/size.c
+++ b/binutils/size.c
@@ -441,11 +441,9 @@ size_number (bfd_size_type num)
{
char buffer[40];
- sprintf (buffer, (radix == decimal ? "%" PRIu64
- : radix == octal ? "0%" PRIo64 : "0x%" PRIx64),
- (uint64_t) num);
-
- return strlen (buffer);
+ return sprintf (buffer, (radix == decimal ? "%" PRIu64
+ : radix == octal ? "0%" PRIo64 : "0x%" PRIx64),
+ (uint64_t) num);
}
static void
diff --git a/binutils/stabs.c b/binutils/stabs.c
index 311b73b8418..0acb7f1e0db 100644
--- a/binutils/stabs.c
+++ b/binutils/stabs.c
@@ -3030,7 +3030,7 @@ parse_stab_argtypes (void *dhandle, struct stab_handle *info,
if (!(is_destructor || is_full_physname_constructor || is_v3))
{
- unsigned int len;
+ unsigned int len, buf_len;
const char *const_prefix;
const char *volatile_prefix;
char buf[20];
@@ -3042,19 +3042,19 @@ parse_stab_argtypes (void *dhandle, struct stab_handle *info,
volatile_prefix = volatilep ? "V" : "";
if (len == 0)
- sprintf (buf, "__%s%s", const_prefix, volatile_prefix);
+ buf_len = sprintf (buf, "__%s%s", const_prefix, volatile_prefix);
else if (tagname != NULL && strchr (tagname, '<') != NULL)
{
/* Template methods are fully mangled. */
- sprintf (buf, "__%s%s", const_prefix, volatile_prefix);
+ buf_len = sprintf (buf, "__%s%s", const_prefix, volatile_prefix);
tagname = NULL;
len = 0;
}
else
- sprintf (buf, "__%s%s%d", const_prefix, volatile_prefix, len);
+ buf_len = sprintf (buf, "__%s%s%d", const_prefix, volatile_prefix, len);
mangled_name_len = ((is_constructor ? 0 : strlen (fieldname))
- + strlen (buf)
+ + buf_len
+ len
+ strlen (argtypes)
+ 1);
diff --git a/binutils/windmc.c b/binutils/windmc.c
index b1db2b538ae..9e9ed9e87ab 100644
--- a/binutils/windmc.c
+++ b/binutils/windmc.c
@@ -746,12 +746,14 @@ write_bin (void)
nd = convert_unicode_to_ACP (n->lang->sval);
/* Prepare filename for binary output. */
- filename = xmalloc (strlen (nd) + 4 + 1 + strlen (mcset_mc_basename) + 1 + strlen (mcset_rc_dir));
- strcpy (filename, mcset_rc_dir);
+ filename = xmalloc (strlen (nd) + 4 + 1 + strlen (mcset_mc_basename)
+ + 1 + strlen (mcset_rc_dir));
+ char *out = filename;
+ out = stpcpy (out, mcset_rc_dir);
if (mcset_prefix_bin)
- sprintf (filename + strlen (filename), "%s_", mcset_mc_basename);
- strcat (filename, nd);
- strcat (filename, ".bin");
+ out += sprintf (out, "%s_", mcset_mc_basename);
+ out = stpcpy (out, nd);
+ out = stpcpy (out, ".bin");
/* Write message file. */
windmc_write_bin (filename, &mc_nodes_lang[i], (c - i));
diff --git a/binutils/wrstabs.c b/binutils/wrstabs.c
index 955b610cd59..293189db2f8 100644
--- a/binutils/wrstabs.c
+++ b/binutils/wrstabs.c
@@ -678,27 +678,29 @@ stab_int_type (void *p, unsigned int size, bool unsignedp)
cache[size - 1] = tindex;
- sprintf (buf, "%ld=r%ld;", tindex, tindex);
+ int len = sprintf (buf, "%ld=r%ld;", tindex, tindex);
if (unsignedp)
{
- strcat (buf, "0;");
+ strcpy (buf + len, "0;");
+ len += 2;
if (size < sizeof (long))
- sprintf (buf + strlen (buf), "%ld;", ((long) 1 << (size * 8)) - 1);
+ sprintf (buf + len, "%ld;", ((long) 1 << (size * 8)) - 1);
else if (size == sizeof (long))
- strcat (buf, "-1;");
+ strcpy (buf + len, "-1;");
else if (size == 8)
- strcat (buf, "01777777777777777777777;");
+ strcpy (buf + len, "01777777777777777777777;");
else
abort ();
}
else
{
if (size <= sizeof (long))
- sprintf (buf + strlen (buf), "%ld;%ld;",
+ sprintf (buf + len, "%ld;%ld;",
(long) - ((unsigned long) 1 << (size * 8 - 1)),
(long) (((unsigned long) 1 << (size * 8 - 1)) - 1));
else if (size == 8)
- strcat (buf, "01000000000000000000000;0777777777777777777777;");
+ strcpy (buf + len,
+ "01000000000000000000000;0777777777777777777777;");
else
abort ();
}
@@ -828,19 +830,19 @@ stab_enum_type (void *p, const char *tag, const char **names,
len += strlen (*pn) + 22;
buf = xmalloc (len);
-
+ char *out = buf;
if (tag == NULL)
- strcpy (buf, "e");
+ out = stpcpy (out, "e");
else
{
tindex = info->type_index;
++info->type_index;
- sprintf (buf, "%s:T%ld=e", tag, tindex);
+ out += sprintf (out, "%s:T%ld=e", tag, tindex);
}
for (pn = names, pv = vals; *pn != NULL; pn++, pv++)
- sprintf (buf + strlen (buf), "%s:%ld,", *pn, (long) *pv);
- strcat (buf, ";");
+ out += sprintf (out, "%s:%ld,", *pn, (long) *pv);
+ strcpy (out, ";");
if (tag == NULL)
{
@@ -1031,12 +1033,9 @@ stab_array_type (void *p, bfd_signed_vma low, bfd_signed_vma high,
element = stab_pop_type (info);
buf = xmalloc (strlen (range) + strlen (element) + 70);
-
+ char *out = buf;
if (! stringp)
- {
- tindex = 0;
- *buf = '\0';
- }
+ tindex = 0;
else
{
/* We need to define a type in order to include the string
@@ -1044,10 +1043,10 @@ stab_array_type (void *p, bfd_signed_vma low, bfd_signed_vma high,
tindex = info->type_index;
++info->type_index;
definition = true;
- sprintf (buf, "%ld=@S;", tindex);
+ out += sprintf (out, "%ld=@S;", tindex);
}
- sprintf (buf + strlen (buf), "ar%s;%ld;%ld;%s",
+ sprintf (out, "ar%s;%ld;%ld;%s",
range, (long) low, (long) high, element);
free (range);
free (element);
@@ -1073,12 +1072,9 @@ stab_set_type (void *p, bool bitstringp)
s = stab_pop_type (info);
buf = xmalloc (strlen (s) + 26);
-
+ char *out = buf;
if (! bitstringp)
- {
- *buf = '\0';
- tindex = 0;
- }
+ tindex = 0;
else
{
/* We need to define a type in order to include the string
@@ -1086,10 +1082,10 @@ stab_set_type (void *p, bool bitstringp)
tindex = info->type_index;
++info->type_index;
definition = true;
- sprintf (buf, "%ld=@S;", tindex);
+ out += sprintf (out, "%ld=@S;", tindex);
}
- sprintf (buf + strlen (buf), "S%s", s);
+ sprintf (out, "S%s", s);
free (s);
return stab_push_string (info, buf, tindex, definition, 0);
@@ -1304,11 +1300,11 @@ stab_start_struct_type (void *p, const char *tag, unsigned int id,
long tindex;
bool definition;
char buf[40];
+ char *out = buf;
if (id == 0)
{
tindex = 0;
- *buf = '\0';
definition = false;
}
else
@@ -1317,11 +1313,11 @@ stab_start_struct_type (void *p, const char *tag, unsigned int id,
&size);
if (tindex < 0)
return false;
- sprintf (buf, "%ld=", tindex);
+ out += sprintf (out, "%ld=", tindex);
definition = true;
}
- sprintf (buf + strlen (buf), "%c%u",
+ sprintf (out, "%c%u",
structp ? 's' : 'u',
size);
@@ -1699,19 +1695,21 @@ stab_class_method_var (struct stab_write_handle *info, const char *physname,
else
typec = '*';
+ size_t cur_len = strlen (info->type_stack->methods);
info->type_stack->methods =
- xrealloc (info->type_stack->methods,
- (strlen (info->type_stack->methods) + strlen (type)
- + strlen (physname) + (contextp ? strlen (context) : 0) + 40));
-
- sprintf (info->type_stack->methods + strlen (info->type_stack->methods),
- "%s:%s;%c%c%c", type, physname, visc, qualc, typec);
+ xrealloc (info->type_stack->methods, (cur_len
+ + strlen (type)
+ + strlen (physname)
+ + (contextp ? strlen (context) : 0)
+ + 40));
+
+ char *out = info->type_stack->methods + cur_len;
+ out += sprintf (out, "%s:%s;%c%c%c", type, physname, visc, qualc, typec);
free (type);
if (contextp)
{
- sprintf (info->type_stack->methods + strlen (info->type_stack->methods),
- "%ld;%s;", (long) voffset, context);
+ sprintf (out, "%ld;%s;", (long) voffset, context);
free (context);
}
@@ -1800,36 +1798,36 @@ stab_end_class_type (void *p)
buf = xmalloc (len);
- strcpy (buf, info->type_stack->string);
+ char *out = stpcpy (buf, info->type_stack->string);
if (info->type_stack->baseclasses != NULL)
{
- sprintf (buf + strlen (buf), "!%u,", i);
+ out += sprintf (out, "!%u,", i);
for (i = 0; info->type_stack->baseclasses[i] != NULL; i++)
{
- strcat (buf, info->type_stack->baseclasses[i]);
+ out = stpcpy (out, info->type_stack->baseclasses[i]);
free (info->type_stack->baseclasses[i]);
}
free (info->type_stack->baseclasses);
info->type_stack->baseclasses = NULL;
}
- strcat (buf, info->type_stack->fields);
+ out = stpcpy (out, info->type_stack->fields);
free (info->type_stack->fields);
info->type_stack->fields = NULL;
if (info->type_stack->methods != NULL)
{
- strcat (buf, info->type_stack->methods);
+ out = stpcpy (out, info->type_stack->methods);
free (info->type_stack->methods);
info->type_stack->methods = NULL;
}
- strcat (buf, ";");
+ out = stpcpy (out, ";");
if (info->type_stack->vtable != NULL)
{
- strcat (buf, info->type_stack->vtable);
+ out = stpcpy (out, info->type_stack->vtable);
free (info->type_stack->vtable);
info->type_stack->vtable = NULL;
}
--
Alan Modra
Australia Development Lab, IBM
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-08-03 11:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-03 11:47 binutils sprintf optimisation Alan Modra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).