summaryrefslogtreecommitdiff
path: root/japanese/mh/files/patch-sbr:concat.c
blob: b3d83a61ac4123b44a29d3bc3d2cf45e778fdf2f (plain) (blame)
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
60
Index: sbr/concat.c
diff -u sbr/concat.c.orig sbr/concat.c
--- sbr/concat.c.orig	Wed Dec  1 13:01:21 1993
+++ sbr/concat.c	Fri Jul 18 14:42:47 2003
@@ -2,13 +2,12 @@
 
 #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,
@@ -17,19 +16,26 @@
     register    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");
+	err ("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;
 }
-- 
��ߒ�� �ȥ ��� �����󒥿�����͒�Ò�Ȓ�ߒ����񒲣���  http://www.imasy.org/~ume/
ume@mahoroba.org  ume@bisd.hitachi.co.jp  ume@{,jp.}FreeBSD.org
��ג�풥���钥���ϒ�񒤤�����͒�Β�Ւ�ޒ�ǒ�ϒ�ʒ����񒤫��쒤���̒��ư���  I hate Modula-3 :-)