From b2724c87872aaec55dd7e5529aa029c3108b43a5 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 19 Jun 2014 17:26:56 -0400 Subject: use xstrfmt to replace xmalloc + strcpy/strcat It's easy to get manual allocation calculations wrong, and the use of strcpy/strcat raise red flags for people looking for buffer overflows (though in this case each site was fine). It's also shorter to use xstrfmt, and the printf-format tends to be easier for a reader to see what the final string will look like. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- shell.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'shell.c') diff --git a/shell.c b/shell.c index 5c0d47a5cc..ace62e4b65 100644 --- a/shell.c +++ b/shell.c @@ -46,11 +46,7 @@ static int is_valid_cmd_name(const char *cmd) static char *make_cmd(const char *prog) { - char *prefix = xmalloc((strlen(prog) + strlen(COMMAND_DIR) + 2)); - strcpy(prefix, COMMAND_DIR); - strcat(prefix, "/"); - strcat(prefix, prog); - return prefix; + return xstrfmt("%s/%s", COMMAND_DIR, prog); } static void cd_to_homedir(void) -- cgit v1.2.3