1 --- vnc_unixsrc/vncviewer/sockets.c.orig 2015-02-11 17:15:14.717149236 +0100
2 +++ vnc_unixsrc/vncviewer/sockets.c 2015-02-11 17:20:41.402046099 +0100
7 - fprintf(stderr,programName);
8 + fputs(programName, stderr);
16 - fprintf(stderr,programName);
17 + fputs(programName, stderr);
24 if (select(rfbsock+1, NULL, &fds, NULL, NULL) <= 0) {
25 - fprintf(stderr,programName);
26 + fputs(programName, stderr);
32 - fprintf(stderr,programName);
33 + fputs(programName, stderr);
39 sock = socket(AF_INET, SOCK_STREAM, 0);
41 - fprintf(stderr,programName);
42 + fputs(programName, stderr);
43 perror(": ConnectToTcpAddr: socket");
47 if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
48 - fprintf(stderr,programName);
49 + fputs(programName, stderr);
50 perror(": ConnectToTcpAddr: connect");
55 if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
56 (char *)&one, sizeof(one)) < 0) {
57 - fprintf(stderr,programName);
58 + fputs(programName, stderr);
59 perror(": ConnectToTcpAddr: setsockopt");
64 sock = socket(AF_INET, SOCK_STREAM, 0);
66 - fprintf(stderr,programName);
67 + fputs(programName, stderr);
68 perror(": FindFreeTcpPort: socket");
73 sock = socket(AF_INET, SOCK_STREAM, 0);
75 - fprintf(stderr,programName);
76 + fputs(programName, stderr);
77 perror(": ListenAtTcpPort: socket");
81 if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
82 (const char *)&one, sizeof(one)) < 0) {
83 - fprintf(stderr,programName);
84 + fputs(programName, stderr);
85 perror(": ListenAtTcpPort: setsockopt");
90 if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
91 - fprintf(stderr,programName);
92 + fputs(programName, stderr);
93 perror(": ListenAtTcpPort: bind");
98 if (listen(sock, 5) < 0) {
99 - fprintf(stderr,programName);
100 + fputs(programName, stderr);
101 perror(": ListenAtTcpPort: listen");
104 @@ -330,14 +330,14 @@
106 sock = accept(listenSock, (struct sockaddr *) &addr, &addrlen);
108 - fprintf(stderr,programName);
109 + fputs(programName, stderr);
110 perror(": AcceptTcpConnection: accept");
114 if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
115 (char *)&one, sizeof(one)) < 0) {
116 - fprintf(stderr,programName);
117 + fputs(programName, stderr);
118 perror(": AcceptTcpConnection: setsockopt");
122 SetNonBlocking(int sock)
124 if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) {
125 - fprintf(stderr,programName);
126 + fputs(programName, stderr);
127 perror(": AcceptTcpConnection: fcntl");
130 @@ -422,18 +422,18 @@
134 - fprintf(stderr,"ReadExact: ");
135 + fputs("ReadExact: ", stderr);
137 for (i = 0; i < len; i++)
139 if ((i % 16 == 0) && (i != 0)) {
140 - fprintf(stderr," ");
141 + fputs(" ", stderr);
144 str[i % 16] = (((c > 31) && (c < 127)) ? c : '.');
145 fprintf(stderr,"%02x ",(unsigned char)c);
147 - fprintf(stderr," ");
148 + fputs(" ", stderr);
151 fprintf(stderr,"%s\n",str);
154 for (j = i % 16; j < 16; j++)
156 - fprintf(stderr," ");
157 - if ((j % 4) == 3) fprintf(stderr," ");
158 + fputs(" ", stderr);
159 + if ((j % 4) == 3) fputs(" ", stderr);
162 fprintf(stderr,"%s\n",str);
163 --- vnc_unixsrc/Xvnc/lib/xtrans/Xtransint.h.orig 2015-02-11 17:34:49.860782937 +0100
164 +++ vnc_unixsrc/Xvnc/lib/xtrans/Xtransint.h 2015-02-11 17:36:57.193426450 +0100
166 int hack= 0, saveerrno=errno; \
168 gettimeofday(&tp,0); \
169 - fprintf(stderr, __xtransname); fflush(stderr); \
170 + fputs(__xtransname, stderr); fflush(stderr); \
171 fprintf(stderr, x+hack,a,b,c); fflush(stderr); \
172 fprintf(stderr, "timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \
176 #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \
177 int hack= 0, saveerrno=errno; \
178 - fprintf(stderr, __xtransname); fflush(stderr); \
179 + fputs(__xtransname, stderr); fflush(stderr); \
180 fprintf(stderr, x+hack,a,b,c); fflush(stderr); \
183 --- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c.orig 2015-02-11 17:48:52.206219560 +0100
184 +++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c 2015-02-11 17:49:17.019418469 +0100
185 @@ -943,7 +943,7 @@ void rfbLog(char *format, ...)
188 strftime(buf, 255, "%d/%m/%y %T ", localtime(&clock));
189 - fprintf(stderr, buf);
190 + fputs(buf, stderr);
192 vfprintf(stderr, format, args);