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
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
$NetBSD: patch-cw,v 1.3 2006/01/05 18:25:57 joerg Exp $
--- lib/libxview/textsw/txt_again.c.orig Tue Jun 29 07:17:32 1993
+++ lib/libxview/textsw/txt_again.c Thu Dec 20 10:11:57 2001
@@ -28,6 +28,8 @@ Pkg_private CHAR *STRNCPY();
Pkg_private Es_index textsw_do_input();
Pkg_private Es_index textsw_do_pending_delete();
+static int textsw_string_min_free();
+
string_t null_string = {0, 0, 0};
#define TEXT_DELIMITER "\\"
@@ -182,6 +184,7 @@ textsw_string_min_free(ptr_to_string, mi
* Following is stolen from 3.2ALPHA sprintf(str, fmt, va_alist) SIDE_EFFECT:
* TXTSW_STRING_FREE(ptr_to_string) is modified by this routine.
*/
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
#ifndef SVR4
/* VARARGS2 */
@@ -325,6 +328,46 @@ va_dcl
#endif /* SVR4 */
+#elif defined(__DragonFly__)
+static int
+textsw_printf(register string_t *ptr_to_string, char *fmt, ...)
+{
+ int result;
+ va_list args;
+
+ VA_START(args, fmt);
+ result = vsnprintf(TXTSW_STRING_FREE(ptr_to_string), ptr_to_string->max_length - TXTSW_STRING_LENGTH(ptr_to_string), fmt, args);
+ if (result >=0)
+ TXTSW_STRING_FREE(ptr_to_string) += result;
+ return(result);
+}
+
+
+#else /* __FreeBSD__ */
+/*inspiration taken from sprintf.c */
+
+static int
+textsw_printf(register string_t *ptr_to_string, char *fmt, ...)
+{
+ FILE _strbuf;
+ int result;
+ va_list args;
+ _strbuf._flags = __SWR | __SSTR;
+ _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_FREE(ptr_to_string);
+ _strbuf._bf._size = _strbuf._w = ptr_to_string->max_length - TXTSW_STRING_LENGTH(ptr_to_string);
+ VA_START(args, fmt);
+ result = vfprintf (&_strbuf, fmt, args);
+ va_end(args);
+ TXTSW_STRING_FREE(ptr_to_string) = (char *) _strbuf._p;
+#ifndef lint
+ if (result >= 0)
+ putc('\0', &_strbuf);
+#endif
+ return (result);
+}
+
+#endif /* __FreeBSD__ */
+
static void
textsw_record_buf(again, buffer, buffer_length)
register string_t *again;
@@ -619,6 +662,8 @@ textsw_record_trash_insert(textsw)
*/
/* VARARGS2 */
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+
static int
#ifdef ANSI_FUNC_PROTO
textsw_scanf(register string_t *ptr_to_string, register char *fmt, ...)
@@ -705,6 +750,57 @@ va_dcl
#endif /* OW_I18N */
}
+#elif defined(__DragonFly__)
+static int
+textsw_scanf(register string_t *ptr_to_string, char *fmt, ...)
+{
+ va_list args;
+ int result;
+ size_t len = TXTSW_STRING_LENGTH(ptr_to_string);
+ char *str = malloc(len + 1);
+ if (str == NULL)
+ return -1;
+ memcpy(str, TXTSW_STRING_BASE(ptr_to_string), len);
+ str[len] = '\0';
+ VA_START(args, fmt);
+ result = vsscanf(str, fmt, args);
+ va_end(args);
+ free(str);
+ return(result);
+}
+
+#else /* __FreeBSD__ */
+/*inspiration/code taken from sscanf.c */
+
+static int
+eofread(cookie, buf, len)
+ void *cookie;
+ char *buf;
+ int len;
+{
+
+ return (0);
+}
+
+static int
+textsw_scanf(register string_t *ptr_to_string, char *fmt, ...)
+{
+ FILE _strbuf;
+ int result;
+ va_list args;
+
+ memset(&_strbuf, '\0', sizeof(_strbuf));
+ _strbuf._flags = __SRD;
+ _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_BASE(ptr_to_string);
+ _strbuf._bf._size = _strbuf._r = TXTSW_STRING_LENGTH(ptr_to_string);
+ _strbuf._read = eofread;
+ VA_START(args, fmt);
+ result = __svfscanf(&_strbuf, fmt, args);
+ va_end(args);
+ TXTSW_STRING_BASE(ptr_to_string) = (char *) _strbuf._p;
+ return (result);
+}
+#endif /* __FreeBSD__ */
static int
textsw_next_is_delimiter(again)
|
