oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

merge strcpy_truncate branch

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5027 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-06-09 19:25:40 +00:00
parent e255dfc950
commit a5f54865d4
87 changed files with 689 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/roken/concat.c
View File

@@ -64,7 +64,7 @@ roken_vconcat (char *s, size_t len, va_list args)
if (n >= len)
return -1;
strncpy (s, a, n);
memcpy (s, a, n);
s += n;
len -= n;
}
@@ -82,7 +82,6 @@ roken_vmconcat (char **s, size_t max_len, va_list args)
p = malloc(1);
if(p == NULL)
return 0;
*p = 0;
len = 1;
while ((a = va_arg(args, const char*))) {
size_t n = strlen (a);
@@ -97,9 +96,10 @@ roken_vmconcat (char **s, size_t max_len, va_list args)
return 0;
}
p = q;
memcpy (p + len - 1, a, n);
len += n;
strcat(p, a);
}
p[len - 1] = '\0';
*s = p;
return len;
}