1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
$NetBSD: patch-as,v 1.3 2010/09/27 12:01:49 taca Exp $
* Use stdarg(3) not varargs(3).
--- sbr/concat.c.orig 1993-12-01 13:01:21.000000000 +0900
+++ sbr/concat.c
@@ -2,34 +2,40 @@
#include "../h/mh.h"
#include <stdio.h>
-#include <varargs.h>
+#include <stdarg.h>
/* VARARGS */
-char *concat (va_alist)
-va_dcl
+char *concat (char *first, ...)
{
register char *cp,
*dp,
*sp;
register unsigned len;
- register va_list list;
+ va_list list;
len = 1;
- va_start (list);
- while (cp = va_arg (list, char *))
- len += strlen (cp);
- va_end (list);
+ if (first) {
+ len += strlen(first);
+ va_start (list, first);
+ while (cp = va_arg (list, char *))
+ len += strlen (cp);
+ va_end (list);
+ }
dp = sp = malloc (len);
if (dp == NULL)
adios (NULLCP, "unable to allocate string storage");
- va_start (list);
- while (cp = va_arg (list, char *))
- sp = copy (cp, sp);
- va_end (list);
+ *sp = '\0';
+ if (first) {
+ sp = copy (first, sp);
+ va_start (list, first);
+ while (cp = va_arg (list, char *))
+ sp = copy (cp, sp);
+ va_end (list);
+ }
return dp;
}
|
