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
|
$NetBSD: patch-ac,v 1.3 2011/09/13 07:28:48 mef Exp $
Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
--- lib/cconv.c.orig 2002-10-03 09:35:28.000000000 +0000
+++ lib/cconv.c
@@ -604,6 +604,7 @@ static char *rcsid = "$Id: cconv.c,v 10.
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include <X11/Xutil.h>
@@ -790,7 +791,7 @@ static wchar *promptsave(wchar *);
static int parseLine(uchar *, uchar **, int);
static FILE *openfile(char *);
static int doinclude(uchar *, Files *, void (*)());
-static uchar *getline(uchar *, int, Files *, void (*)());
+static uchar *get_line(uchar *, int, Files *, void (*)());
static int readRuleFile(ccRule, char *);
static int registMode(ccRule, int, uchar **);
static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
@@ -1035,8 +1036,8 @@ void (*efunc)();
return 0;
}
-/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
-static uchar *getline(line, linesize, files, efunc)
+/* get_line -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
+static uchar *get_line(line, linesize, files, efunc)
uchar *line;
int linesize;
Files *files;
@@ -1100,7 +1101,7 @@ char *file;
rule->nmode = 0;
rule->initialmode = -1;
- while (getline(line, sizeof(line), &files, efunc)) {
+ while (get_line(line, sizeof(line), &files, efunc)) {
(void)Strcpy(tmp, line);
if ((argc = parseLine(tmp, argv, 20)) == 0)
continue;
@@ -1269,7 +1270,7 @@ uchar **av;
cdbuf.cdbuf = NULL;
/* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */
- while (getline(line, sizeof(line), files, efunc)) {
+ while (get_line(line, sizeof(line), files, efunc)) {
/* '#' $B$G;O$^$k9T$O%3%a%s%H(B */
if (*line == '\0' || *line == '\n' || *line == '#')
continue;
@@ -1282,7 +1283,7 @@ uchar **av;
}
/* $B%k!<%k$N%9%H%"(B */
- cdp->key = inkey;
+ cdp->key = (ulong *) inkey;
cdp->mask = modmask;
cdp->context = *context ? wstrsave(srec, wrev(context)) : 0;
cdp->result = *result ? wstrsave(srec, result) : 0;
|
