From aef60abe6a1772e18634984a94bd70f57d57ccdd Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 16 Feb 2017 10:19:59 +0100 Subject: dirmngr: Replace stpcpy chains by strconcat. * dirmngr/certcache.c (find_cert_bysn): Use strconcat. (find_cert_bysubject): Ditto. * dirmngr/http.c (store_header): Ditto. * dirmngr/ldap.c (make_url): Ditto. * dirmngr/server.c (get_cert_local_ski): Ditto. (do_get_cert_local): Use xstrconcat. -- Signed-off-by: Werner Koch --- dirmngr/server.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'dirmngr/server.c') diff --git a/dirmngr/server.c b/dirmngr/server.c index bca3a61e4..32ce5bb33 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -367,10 +367,7 @@ do_get_cert_local (ctrl_t ctrl, const char *name, const char *command) ksba_cert_t cert; if (name) - { - buf = xmalloc ( strlen (command) + 1 + strlen(name) + 1); - strcpy (stpcpy (stpcpy (buf, command), " "), name); - } + buf = xstrconcat (command, " ", name, NULL); else buf = xstrdup (command); @@ -475,15 +472,13 @@ get_cert_local_ski (ctrl_t ctrl, const char *name, ksba_sexp_t keyid) return NULL; } - buf = xtrymalloc (15 + strlen (hexkeyid) + 2 + strlen(name) + 1); + buf = strconcat ("SENDCERT_SKI ", hexkeyid, " /", name, NULL); if (!buf) { - log_error ("can't allocate enough memory: %s\n", strerror (errno)); xfree (hexkeyid); return NULL; } - strcpy (stpcpy (stpcpy (stpcpy (buf, "SENDCERT_SKI "), hexkeyid)," /"),name); xfree (hexkeyid); rc = assuan_inquire (ctrl->server_local->assuan_ctx, buf, -- cgit v1.2.3