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
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
|
From: Steve Langasek <vorlon@debian.org>
Subject: informational messages should go to stdout, only errors to stderr
---
input-events.c | 10 +++++-----
input-kbd.c | 16 ++++++++--------
input-recv.c | 2 +-
input-send.c | 4 ++--
input.c | 28 ++++++++++++++--------------
5 files changed, 30 insertions(+), 30 deletions(-)
--- a/input-events.c
+++ b/input-events.c
@@ -31,10 +31,10 @@ static void show_events(int nr, int time
close(fd);
return;
}
- fprintf(stderr,"grabbed input device\n");
+ printf("grabbed input device\n");
}
- fprintf(stderr,"waiting for events\n");
+ printf("waiting for events\n");
quit = 0;
for (;;) {
/* wait for input */
@@ -48,7 +48,7 @@ static void show_events(int nr, int time
quit = 1;
break;
case 0:
- fprintf(stderr,"timeout, quitting\n");
+ printf("timeout, quitting\n");
quit = 1;
break;
}
@@ -63,7 +63,7 @@ static void show_events(int nr, int time
quit = 1;
break;
case 0:
- fprintf(stderr,"EOF\n");
+ printf("EOF\n");
quit = 1;
break;
default:
@@ -81,7 +81,7 @@ static void show_events(int nr, int time
close(fd);
return;
}
- fprintf(stderr,"released input device\n");
+ printf("released input device\n");
}
close(fd);
}
--- a/input-kbd.c
+++ b/input-kbd.c
@@ -80,7 +80,7 @@ static struct kbd_map* kbd_map_read(int
map->keys++;
}
if (map->keys) {
- fprintf(stderr,"map: %d keys, size: %d/%d\n",
+ printf("map: %d keys, size: %d/%d\n",
map->keys, map->size, map->alloc);
return map;
} else {
@@ -96,7 +96,7 @@ static int kbd_map_write(int fh, struct
for (i = 0; i < map->size; i++) {
rc = ioctl(fh, EVIOCSKEYCODE, &map->map[i]);
if (0 != rc) {
- fprintf(stderr,"ioctl EVIOCSKEYCODE(%d,%d): %s\n",
+ printf("ioctl EVIOCSKEYCODE(%d,%d): %s\n",
map->map[i].scancode,map->map[i].keycode,
strerror(errno));
return -1;
@@ -172,8 +172,8 @@ static struct kbd_map* kbd_map_parse(FIL
else
entry.keycode = i;
- fprintf(stderr,"set: ");
- kbd_key_print(stderr,entry.scancode,entry.keycode);
+ printf("set: ");
+ kbd_key_print(stdout,entry.scancode,entry.keycode);
if (map->size >= map->alloc) {
map->alloc += 64;
@@ -200,9 +200,9 @@ static void kbd_print_bits(int fd)
if (!test_bit(bit,bits))
continue;
if (EV_TYPE_NAME[EV_KEY][bit]) {
- fprintf(stderr,"bits: %s\n", EV_TYPE_NAME[EV_KEY][bit]);
+ printf("bits: %s\n", EV_TYPE_NAME[EV_KEY][bit]);
} else {
- fprintf(stderr,"bits: unknown [%d]\n", bit);
+ printf("bits: unknown [%d]\n", bit);
}
}
}
@@ -230,7 +230,7 @@ static int set_kbd(int fd, unsigned int
else {
fp = fopen(mapfile,"r");
if (NULL == fp) {
- fprintf(stderr,"open %s: %s\n",mapfile,strerror(errno));
+ printf("open %s: %s\n",mapfile,strerror(errno));
close(fd);
return -1;
}
--- a/input-recv.c
+++ b/input-recv.c
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
rc = read(sock,&ev,sizeof(ev));
if (rc != sizeof(ev)) {
- fprintf(stderr,"read ret=%d (expected %d), errno=%s\n",
+ printf("read ret=%d (expected %d), errno=%s\n",
rc,(int)sizeof(ev),strerror(errno));
exit(1);
}
--- a/input-send.c
+++ b/input-send.c
@@ -45,7 +45,7 @@ static void conn_new(void)
conn->peerhost,INET6_ADDRSTRLEN,
conn->peerserv,32,
NI_NUMERICHOST | NI_NUMERICSERV);
- fprintf(stderr,"connect from [%s]\n",conn->peerhost);
+ printf("connect from [%s]\n",conn->peerhost);
}
fcntl(conn->socket,F_SETFL,O_NONBLOCK);
@@ -56,7 +56,7 @@ static void conn_new(void)
static void conn_del(struct connection *conn)
{
if (tcp_verbose)
- fprintf(stderr,"connection from [%s] closed\n",conn->peerhost);
+ printf("connection from [%s] closed\n",conn->peerhost);
close(conn->socket);
list_del(&conn->list);
free(conn);
--- a/input.c
+++ b/input.c
@@ -95,7 +95,7 @@ int device_open(int nr, int verbose)
return -1;
}
if (verbose)
- fprintf(stderr,"%s\n",filename);
+ printf("%s\n",filename);
return fd;
}
@@ -138,14 +138,14 @@ int device_info(int nr, int fd, int verb
pos ? " " : "",
EV_NAME[evt]);
}
- fprintf(stderr, "%2d: %04x:%04x %-6.6s %-16.16s %-24.24s %-16s\n", nr,
+ printf("%2d: %04x:%04x %-6.6s %-16.16s %-24.24s %-16s\n", nr,
id.vendor, id.product, BUS_NAME[id.bustype],
phys, name, buf);
} else {
- fprintf(stderr, " id : %04x:%04x, %s, v%d\n",
+ printf(" id : %04x:%04x, %s, v%d\n",
id.vendor, id.product, BUS_NAME[id.bustype], id.version);
- fprintf(stderr, " phys : \"%s\"\n",phys);
- fprintf(stderr, " name : \"%s\"\n",name);
+ printf(" phys : \"%s\"\n",phys);
+ printf(" name : \"%s\"\n",name);
for (evt = 0; evt < evts*8 && evt < EV_MAX; evt++) {
if (evt == EV_SYN || evt == EV_REP)
@@ -168,7 +168,7 @@ int device_info(int nr, int fd, int verb
}
if (pos >= sizeof(buf) ||
((verbose > 1) && (evt == EV_ABS))) {
- fprintf(stderr, " %-4.4s : [ %d codes ]\n",
+ printf(" %-4.4s : [ %d codes ]\n",
EV_NAME[evt], count);
if (verbose > 1) {
for (bit = 0, count = 0, pos = 0;
@@ -178,24 +178,24 @@ int device_info(int nr, int fd, int verb
continue;
if (evt == EV_ABS) {
ioctl(fd, EVIOCGABS(bit), &abs);
- fprintf(stderr, " "
+ printf(" "
"%-16s [ %5d, %5d ]\n",
EV_TYPE_NAME[evt][bit],
abs.minimum,
abs.maximum);
} else {
- fprintf(stderr, " %s\n",
+ printf(" %s\n",
EV_TYPE_NAME[evt][bit]);
}
}
}
} else {
- fprintf(stderr, " %-4.4s : %s\n",
+ printf(" %-4.4s : %s\n",
EV_NAME[evt], buf);
}
}
- fprintf(stderr,"\n");
+ printf("\n");
}
return 0;
@@ -210,11 +210,11 @@ void print_event(struct input_event *eve
t = event->time.tv_sec;
strftime(ts,sizeof(ts),"%H:%M:%S",localtime(&t));
- fprintf(stderr,"%s.%06ld: %s",ts,event->time.tv_usec,
+ printf("%s.%06ld: %s",ts,event->time.tv_usec,
EV_NAME[event->type]);
switch (event->type) {
case EV_KEY:
- fprintf(stderr," %s %s",
+ printf(" %s %s",
ev_type_name(EV_KEY, event->code),
event->value ? "pressed" : "released");
break;
@@ -225,14 +225,14 @@ void print_event(struct input_event *eve
case EV_SND:
case EV_REP:
case EV_SW:
- fprintf(stderr," %s %d",
+ printf(" %s %d",
ev_type_name(event->type, event->code), event->value);
break;
default:
- fprintf(stderr," code=%u value=%d",
+ printf(" code=%u value=%d",
(unsigned int)event->code, event->value);
}
- fprintf(stderr,"\n");
+ printf("\n");
}
/* ---------------------------------------------------------------------
|
