From d6ab2a098576d99526ef4494a42ea18d58d1e796 Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Sun, 8 Jul 2018 17:06:44 +0200
Subject: [PATCH] newci: revert modification on goodfixname function
---
psys/src/newci.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/psys/src/newci.c b/psys/src/newci.c
index 36d430e..4722a89 100644
--- a/psys/src/newci.c
+++ b/psys/src/newci.c
@@ -67,21 +67,15 @@ static void goodfixname(char *name, char *ext, char *home, int force)
{
size_t i;
int hassuffix;
+ char STR1[256];
size_t len = strlen(name);
/* fs_zapspaces(name); */
if (len > 2 && name[0] == '*' && name[1] == '*')
{
- char *sz_tmp = malloc(sizeof(char) * len + 1);
- strcpy(sz_tmp, name);
+ strcpy_overlap(name, name + 2);
- /* expand to can add home */
- len += strlen(home) + 1; /* name + home + '\0' */
- name = realloc(name, sizeof(char) * len);
-
- /* Add home value before the name value */
- sprintf(name, "%s%s", home, sz_tmp);
- free(sz_tmp);
+ sprintf(name, "%s%s", home, strcpy(STR1, name));
}
if (force)
--
GitLab