|
yann@108
|
1 |
diff -ur uClibc-0.9.29/libc/inet/rpc/rcmd.c uClibc-0.9.29-patched/libc/inet/rpc/rcmd.c
|
|
yann@108
|
2 |
--- uClibc-0.9.29/libc/inet/rpc/rcmd.c 2007-01-10 11:46:19.000000000 -0600
|
|
yann@108
|
3 |
+++ uClibc-0.9.29-patched/libc/inet/rpc/rcmd.c 2007-05-09 18:05:21.638421151 -0500
|
|
yann@108
|
4 |
@@ -126,7 +126,7 @@
|
|
yann@108
|
5 |
libc_hidden_proto(listen)
|
|
yann@108
|
6 |
libc_hidden_proto(sigsetmask)
|
|
yann@108
|
7 |
libc_hidden_proto(getc_unlocked)
|
|
yann@108
|
8 |
-libc_hidden_proto(__fgetc_unlocked)
|
|
yann@108
|
9 |
+//libc_hidden_proto(fgetc_unlocked)
|
|
yann@108
|
10 |
libc_hidden_proto(fopen)
|
|
yann@108
|
11 |
libc_hidden_proto(fclose)
|
|
yann@108
|
12 |
libc_hidden_proto(fprintf)
|
|
yann@108
|
13 |
diff -ur uClibc-0.9.29/libc/inet/rpc/ruserpass.c uClibc-0.9.29-patched/libc/inet/rpc/ruserpass.c
|
|
yann@108
|
14 |
--- uClibc-0.9.29/libc/inet/rpc/ruserpass.c 2006-03-23 05:14:16.000000000 -0600
|
|
yann@108
|
15 |
+++ uClibc-0.9.29-patched/libc/inet/rpc/ruserpass.c 2007-05-09 18:05:21.638421151 -0500
|
|
yann@108
|
16 |
@@ -63,7 +63,7 @@
|
|
yann@108
|
17 |
libc_hidden_proto(fopen)
|
|
yann@108
|
18 |
libc_hidden_proto(fclose)
|
|
yann@108
|
19 |
libc_hidden_proto(getc_unlocked)
|
|
yann@108
|
20 |
-libc_hidden_proto(__fgetc_unlocked)
|
|
yann@108
|
21 |
+//libc_hidden_proto(__fgetc_unlocked)
|
|
yann@108
|
22 |
|
|
yann@108
|
23 |
#define _(X) (X)
|
|
yann@108
|
24 |
/* #include "ftp_var.h" */
|
|
yann@108
|
25 |
diff -ur uClibc-0.9.29/libc/misc/error/error.c uClibc-0.9.29-patched/libc/misc/error/error.c
|
|
yann@108
|
26 |
--- uClibc-0.9.29/libc/misc/error/error.c 2006-05-04 09:44:13.000000000 -0500
|
|
yann@108
|
27 |
+++ uClibc-0.9.29-patched/libc/misc/error/error.c 2007-05-09 18:05:21.646421810 -0500
|
|
yann@108
|
28 |
@@ -30,11 +30,14 @@
|
|
yann@108
|
29 |
libc_hidden_proto(strerror)
|
|
yann@108
|
30 |
libc_hidden_proto(fprintf)
|
|
yann@108
|
31 |
libc_hidden_proto(exit)
|
|
yann@108
|
32 |
+//#undef putc
|
|
yann@108
|
33 |
libc_hidden_proto(putc)
|
|
yann@108
|
34 |
+libc_hidden_proto(fputc)
|
|
yann@108
|
35 |
libc_hidden_proto(vfprintf)
|
|
yann@108
|
36 |
libc_hidden_proto(fflush)
|
|
yann@108
|
37 |
-libc_hidden_proto(fputc)
|
|
yann@108
|
38 |
-libc_hidden_proto(__fputc_unlocked)
|
|
yann@108
|
39 |
+//#ifdef __UCLIBC_HAS_STDIO_PUTC_MACRO__
|
|
yann@108
|
40 |
+libc_hidden_proto(fputc_unlocked)
|
|
yann@108
|
41 |
+//#endif
|
|
yann@108
|
42 |
|
|
yann@108
|
43 |
/* This variable is incremented each time `error' is called. */
|
|
yann@108
|
44 |
unsigned int error_message_count = 0;
|
|
yann@108
|
45 |
diff -ur uClibc-0.9.29/libc/misc/ttyent/getttyent.c uClibc-0.9.29-patched/libc/misc/ttyent/getttyent.c
|
|
yann@108
|
46 |
--- uClibc-0.9.29/libc/misc/ttyent/getttyent.c 2006-12-07 17:24:02.000000000 -0600
|
|
yann@108
|
47 |
+++ uClibc-0.9.29-patched/libc/misc/ttyent/getttyent.c 2007-05-09 18:05:21.646421810 -0500
|
|
yann@108
|
48 |
@@ -44,8 +44,10 @@
|
|
yann@108
|
49 |
libc_hidden_proto(__fsetlocking)
|
|
yann@108
|
50 |
libc_hidden_proto(rewind)
|
|
yann@108
|
51 |
libc_hidden_proto(fgets_unlocked)
|
|
yann@108
|
52 |
+//#undef getc_unlocked
|
|
yann@108
|
53 |
libc_hidden_proto(getc_unlocked)
|
|
yann@108
|
54 |
-libc_hidden_proto(__fgetc_unlocked)
|
|
yann@108
|
55 |
+//#undef fgetc_unlocked
|
|
yann@108
|
56 |
+libc_hidden_proto(fgetc_unlocked)
|
|
yann@108
|
57 |
libc_hidden_proto(fopen)
|
|
yann@108
|
58 |
libc_hidden_proto(fclose)
|
|
yann@108
|
59 |
libc_hidden_proto(abort)
|
|
yann@108
|
60 |
diff -ur uClibc-0.9.29/libc/pwd_grp/pwd_grp.c uClibc-0.9.29-patched/libc/pwd_grp/pwd_grp.c
|
|
yann@108
|
61 |
--- uClibc-0.9.29/libc/pwd_grp/pwd_grp.c 2007-04-13 03:32:18.000000000 -0500
|
|
yann@108
|
62 |
+++ uClibc-0.9.29-patched/libc/pwd_grp/pwd_grp.c 2007-05-09 18:05:21.638421151 -0500
|
|
yann@108
|
63 |
@@ -43,11 +43,12 @@
|
|
yann@108
|
64 |
libc_hidden_proto(strtoul)
|
|
yann@108
|
65 |
libc_hidden_proto(rewind)
|
|
yann@108
|
66 |
libc_hidden_proto(fgets_unlocked)
|
|
yann@108
|
67 |
-libc_hidden_proto(__fputc_unlocked)
|
|
yann@108
|
68 |
libc_hidden_proto(sprintf)
|
|
yann@108
|
69 |
libc_hidden_proto(fopen)
|
|
yann@108
|
70 |
libc_hidden_proto(fclose)
|
|
yann@108
|
71 |
libc_hidden_proto(fprintf)
|
|
yann@108
|
72 |
+//#undef fputc_unlocked
|
|
yann@108
|
73 |
+libc_hidden_proto(fputc_unlocked)
|
|
yann@108
|
74 |
#ifdef __UCLIBC_HAS_XLOCALE__
|
|
yann@108
|
75 |
libc_hidden_proto(__ctype_b_loc)
|
|
yann@108
|
76 |
#elif __UCLIBC_HAS_CTYPE_TABLES__
|
|
yann@108
|
77 |
@@ -801,7 +802,7 @@
|
|
yann@108
|
78 |
|
|
yann@108
|
79 |
do {
|
|
yann@108
|
80 |
if (!*m) {
|
|
yann@108
|
81 |
- if (__fputc_unlocked('\n', f) >= 0) {
|
|
yann@108
|
82 |
+ if (fputc_unlocked('\n', f) >= 0) {
|
|
yann@108
|
83 |
rv = 0;
|
|
yann@108
|
84 |
}
|
|
yann@108
|
85 |
break;
|
|
yann@108
|
86 |
@@ -867,7 +868,7 @@
|
|
yann@108
|
87 |
goto DO_UNLOCK;
|
|
yann@108
|
88 |
}
|
|
yann@108
|
89 |
|
|
yann@108
|
90 |
- if (__fputc_unlocked('\n', stream) > 0) {
|
|
yann@108
|
91 |
+ if (fputc_unlocked('\n', stream) > 0) {
|
|
yann@108
|
92 |
rv = 0;
|
|
yann@108
|
93 |
}
|
|
yann@108
|
94 |
|
|
yann@108
|
95 |
diff -ur uClibc-0.9.29/libc/stdio/_scanf.c uClibc-0.9.29-patched/libc/stdio/_scanf.c
|
|
yann@108
|
96 |
--- uClibc-0.9.29/libc/stdio/_scanf.c 2007-01-20 12:32:10.000000000 -0600
|
|
yann@108
|
97 |
+++ uClibc-0.9.29-patched/libc/stdio/_scanf.c 2007-05-09 18:05:21.642421481 -0500
|
|
yann@108
|
98 |
@@ -86,7 +86,8 @@
|
|
yann@108
|
99 |
libc_hidden_proto(vsscanf)
|
|
yann@108
|
100 |
libc_hidden_proto(fclose)
|
|
yann@108
|
101 |
libc_hidden_proto(getc_unlocked)
|
|
yann@108
|
102 |
-libc_hidden_proto(__fgetc_unlocked)
|
|
yann@108
|
103 |
+//#undef fgetc_unlocked
|
|
yann@108
|
104 |
+libc_hidden_proto(fgetc_unlocked)
|
|
yann@108
|
105 |
#ifdef __UCLIBC_HAS_WCHAR__
|
|
yann@108
|
106 |
libc_hidden_proto(wcslen)
|
|
yann@108
|
107 |
libc_hidden_proto(vfwscanf)
|
|
yann@108
|
108 |
diff -ur uClibc-0.9.29/libc/stdio/fgetc.c uClibc-0.9.29-patched/libc/stdio/fgetc.c
|
|
yann@108
|
109 |
--- uClibc-0.9.29/libc/stdio/fgetc.c 2006-01-15 16:41:03.000000000 -0600
|
|
yann@108
|
110 |
+++ uClibc-0.9.29-patched/libc/stdio/fgetc.c 2007-05-09 18:05:21.642421481 -0500
|
|
yann@108
|
111 |
@@ -13,13 +13,13 @@
|
|
yann@108
|
112 |
#undef getc
|
|
yann@108
|
113 |
#undef getc_unlocked
|
|
yann@108
|
114 |
|
|
yann@108
|
115 |
-libc_hidden_proto(__fgetc_unlocked)
|
|
yann@108
|
116 |
+libc_hidden_proto(fgetc_unlocked)
|
|
yann@108
|
117 |
|
|
yann@108
|
118 |
#ifdef __DO_UNLOCKED
|
|
yann@108
|
119 |
|
|
yann@108
|
120 |
libc_hidden_proto(fflush_unlocked)
|
|
yann@108
|
121 |
|
|
yann@108
|
122 |
-int __fgetc_unlocked(FILE *stream)
|
|
yann@108
|
123 |
+int fgetc_unlocked(FILE *stream)
|
|
yann@108
|
124 |
{
|
|
yann@108
|
125 |
__STDIO_STREAM_VALIDATE(stream);
|
|
yann@108
|
126 |
|
|
yann@108
|
127 |
@@ -73,26 +73,22 @@
|
|
yann@108
|
128 |
|
|
yann@108
|
129 |
return EOF;
|
|
yann@108
|
130 |
}
|
|
yann@108
|
131 |
-libc_hidden_def(__fgetc_unlocked)
|
|
yann@108
|
132 |
-
|
|
yann@108
|
133 |
-libc_hidden_proto(fgetc_unlocked)
|
|
yann@108
|
134 |
-strong_alias(__fgetc_unlocked,fgetc_unlocked)
|
|
yann@108
|
135 |
libc_hidden_def(fgetc_unlocked)
|
|
yann@108
|
136 |
|
|
yann@108
|
137 |
//libc_hidden_proto(__getc_unlocked)
|
|
yann@108
|
138 |
-//strong_alias(__fgetc_unlocked,__getc_unlocked)
|
|
yann@108
|
139 |
+//strong_alias(fgetc_unlocked,__getc_unlocked)
|
|
yann@108
|
140 |
//libc_hidden_def(__getc_unlocked)
|
|
yann@108
|
141 |
|
|
yann@108
|
142 |
libc_hidden_proto(getc_unlocked)
|
|
yann@108
|
143 |
-strong_alias(__fgetc_unlocked,getc_unlocked)
|
|
yann@108
|
144 |
+strong_alias(fgetc_unlocked,getc_unlocked)
|
|
yann@108
|
145 |
libc_hidden_def(getc_unlocked)
|
|
yann@108
|
146 |
|
|
yann@108
|
147 |
#ifndef __UCLIBC_HAS_THREADS__
|
|
yann@108
|
148 |
libc_hidden_proto(fgetc)
|
|
yann@108
|
149 |
-strong_alias(__fgetc_unlocked,fgetc)
|
|
yann@108
|
150 |
+strong_alias(fgetc_unlocked,fgetc)
|
|
yann@108
|
151 |
libc_hidden_def(fgetc)
|
|
yann@108
|
152 |
|
|
yann@108
|
153 |
-strong_alias(__fgetc_unlocked,getc)
|
|
yann@108
|
154 |
+strong_alias(fgetc_unlocked,getc)
|
|
yann@108
|
155 |
#endif
|
|
yann@108
|
156 |
|
|
yann@108
|
157 |
#elif defined __UCLIBC_HAS_THREADS__
|
|
yann@108
|
158 |
diff -ur uClibc-0.9.29/libc/stdio/fgets.c uClibc-0.9.29-patched/libc/stdio/fgets.c
|
|
yann@108
|
159 |
--- uClibc-0.9.29/libc/stdio/fgets.c 2006-01-15 16:41:03.000000000 -0600
|
|
yann@108
|
160 |
+++ uClibc-0.9.29-patched/libc/stdio/fgets.c 2007-05-09 18:05:21.638421151 -0500
|
|
yann@108
|
161 |
@@ -10,8 +10,7 @@
|
|
yann@108
|
162 |
libc_hidden_proto(fgets_unlocked)
|
|
yann@108
|
163 |
|
|
yann@108
|
164 |
#ifdef __DO_UNLOCKED
|
|
yann@108
|
165 |
-
|
|
yann@108
|
166 |
-libc_hidden_proto(__fgetc_unlocked)
|
|
yann@108
|
167 |
+libc_hidden_proto(fgetc_unlocked)
|
|
yann@108
|
168 |
|
|
yann@108
|
169 |
char *fgets_unlocked(char *__restrict s, int n,
|
|
yann@108
|
170 |
register FILE * __restrict stream)
|
|
yann@108
|
171 |
@@ -38,7 +37,7 @@
|
|
yann@108
|
172 |
break;
|
|
yann@108
|
173 |
}
|
|
yann@108
|
174 |
} else {
|
|
yann@108
|
175 |
- if ((c = __fgetc_unlocked(stream)) == EOF) {
|
|
yann@108
|
176 |
+ if ((c = fgetc_unlocked(stream)) == EOF) {
|
|
yann@108
|
177 |
if (__FERROR_UNLOCKED(stream)) {
|
|
yann@108
|
178 |
goto ERROR;
|
|
yann@108
|
179 |
}
|
|
yann@108
|
180 |
diff -ur uClibc-0.9.29/libc/stdio/fputc.c uClibc-0.9.29-patched/libc/stdio/fputc.c
|
|
yann@108
|
181 |
--- uClibc-0.9.29/libc/stdio/fputc.c 2007-04-14 12:03:18.000000000 -0500
|
|
yann@108
|
182 |
+++ uClibc-0.9.29-patched/libc/stdio/fputc.c 2007-05-09 20:50:51.350629927 -0500
|
|
yann@108
|
183 |
@@ -16,7 +16,7 @@
|
|
yann@108
|
184 |
|
|
yann@108
|
185 |
#ifdef __DO_UNLOCKED
|
|
yann@108
|
186 |
|
|
yann@108
|
187 |
-int __fputc_unlocked(int c, register FILE *stream)
|
|
yann@108
|
188 |
+int fputc_unlocked(int c, register FILE *stream)
|
|
yann@108
|
189 |
{
|
|
yann@108
|
190 |
__STDIO_STREAM_VALIDATE(stream);
|
|
yann@108
|
191 |
|
|
yann@108
|
192 |
@@ -70,22 +70,22 @@
|
|
yann@108
|
193 |
BAD:
|
|
yann@108
|
194 |
return EOF;
|
|
yann@108
|
195 |
}
|
|
yann@108
|
196 |
-libc_hidden_def(__fputc_unlocked)
|
|
yann@108
|
197 |
+libc_hidden_def(fputc_unlocked)
|
|
yann@108
|
198 |
|
|
yann@108
|
199 |
/* exposing these would be fundamentally *wrong*! fix you, instead! */
|
|
yann@108
|
200 |
/* libc_hidden_proto(fputc_unlocked) */
|
|
yann@108
|
201 |
-strong_alias(__fputc_unlocked,fputc_unlocked)
|
|
yann@108
|
202 |
+/* strong_alias(__fputc_unlocked,fputc_unlocked) */
|
|
yann@108
|
203 |
/* exposing these would be fundamentally *wrong*! fix you, instead! */
|
|
yann@108
|
204 |
/* libc_hidden_def(fputc_unlocked) */
|
|
yann@108
|
205 |
|
|
yann@108
|
206 |
libc_hidden_proto(putc_unlocked)
|
|
yann@108
|
207 |
-strong_alias(__fputc_unlocked,putc_unlocked)
|
|
yann@108
|
208 |
+strong_alias(fputc_unlocked,putc_unlocked)
|
|
yann@108
|
209 |
libc_hidden_def(putc_unlocked)
|
|
yann@108
|
210 |
#ifndef __UCLIBC_HAS_THREADS__
|
|
yann@108
|
211 |
-strong_alias(__fputc_unlocked,fputc)
|
|
yann@108
|
212 |
+strong_alias(fputc_unlocked,fputc)
|
|
yann@108
|
213 |
|
|
yann@108
|
214 |
libc_hidden_proto(putc)
|
|
yann@108
|
215 |
-strong_alias(__fputc_unlocked,putc)
|
|
yann@108
|
216 |
+strong_alias(fputc_unlocked,putc)
|
|
yann@108
|
217 |
libc_hidden_def(putc)
|
|
yann@108
|
218 |
#endif
|
|
yann@108
|
219 |
|
|
yann@108
|
220 |
diff -ur uClibc-0.9.29/libc/stdio/getchar.c uClibc-0.9.29-patched/libc/stdio/getchar.c
|
|
yann@108
|
221 |
--- uClibc-0.9.29/libc/stdio/getchar.c 2006-12-19 22:30:25.000000000 -0600
|
|
yann@108
|
222 |
+++ uClibc-0.9.29-patched/libc/stdio/getchar.c 2007-05-09 18:05:21.642421481 -0500
|
|
yann@108
|
223 |
@@ -7,7 +7,8 @@
|
|
yann@108
|
224 |
|
|
yann@108
|
225 |
#include "_stdio.h"
|
|
yann@108
|
226 |
|
|
yann@108
|
227 |
-libc_hidden_proto(__fgetc_unlocked)
|
|
yann@108
|
228 |
+//#undef fgetc_unlocked
|
|
yann@108
|
229 |
+libc_hidden_proto(fgetc_unlocked)
|
|
yann@108
|
230 |
|
|
yann@108
|
231 |
#undef getchar
|
|
yann@108
|
232 |
#ifdef __DO_UNLOCKED
|
|
yann@108
|
233 |
diff -ur uClibc-0.9.29/libc/stdio/getdelim.c uClibc-0.9.29-patched/libc/stdio/getdelim.c
|
|
yann@108
|
234 |
--- uClibc-0.9.29/libc/stdio/getdelim.c 2006-02-13 02:52:46.000000000 -0600
|
|
yann@108
|
235 |
+++ uClibc-0.9.29-patched/libc/stdio/getdelim.c 2007-05-09 18:05:21.642421481 -0500
|
|
yann@108
|
236 |
@@ -11,8 +11,8 @@
|
|
yann@108
|
237 |
#include "_stdio.h"
|
|
yann@108
|
238 |
|
|
yann@108
|
239 |
libc_hidden_proto(getdelim)
|
|
yann@108
|
240 |
-
|
|
yann@108
|
241 |
-libc_hidden_proto(__fgetc_unlocked)
|
|
yann@108
|
242 |
+//#undef fgetc_unlocked
|
|
yann@108
|
243 |
+libc_hidden_proto(fgetc_unlocked)
|
|
yann@108
|
244 |
|
|
yann@108
|
245 |
/* Note: There is a defect in this function. (size_t vs ssize_t). */
|
|
yann@108
|
246 |
|
|
yann@108
|
247 |
diff -ur uClibc-0.9.29/libc/stdio/old_vfprintf.c uClibc-0.9.29-patched/libc/stdio/old_vfprintf.c
|
|
yann@108
|
248 |
--- uClibc-0.9.29/libc/stdio/old_vfprintf.c 2006-01-22 13:35:08.000000000 -0600
|
|
yann@108
|
249 |
+++ uClibc-0.9.29-patched/libc/stdio/old_vfprintf.c 2007-05-09 18:05:21.642421481 -0500
|
|
yann@108
|
250 |
@@ -149,7 +149,8 @@
|
|
yann@108
|
251 |
libc_hidden_proto(strnlen)
|
|
yann@108
|
252 |
libc_hidden_proto(memcpy)
|
|
yann@108
|
253 |
libc_hidden_proto(putc_unlocked)
|
|
yann@108
|
254 |
-libc_hidden_proto(__fputc_unlocked)
|
|
yann@108
|
255 |
+//#undef fputc_unlocked
|
|
yann@108
|
256 |
+libc_hidden_proto(fputc_unlocked)
|
|
yann@108
|
257 |
libc_hidden_proto(__glibc_strerror_r)
|
|
yann@108
|
258 |
|
|
yann@108
|
259 |
/* #undef __UCLIBC_HAS_FLOATS__ */
|
|
yann@108
|
260 |
diff -ur uClibc-0.9.29/libc/stdio/putchar.c uClibc-0.9.29-patched/libc/stdio/putchar.c
|
|
yann@108
|
261 |
--- uClibc-0.9.29/libc/stdio/putchar.c 2006-01-13 18:58:03.000000000 -0600
|
|
yann@108
|
262 |
+++ uClibc-0.9.29-patched/libc/stdio/putchar.c 2007-05-09 18:05:21.642421481 -0500
|
|
yann@108
|
263 |
@@ -7,7 +7,8 @@
|
|
yann@108
|
264 |
|
|
yann@108
|
265 |
#include "_stdio.h"
|
|
yann@108
|
266 |
|
|
yann@108
|
267 |
-libc_hidden_proto(__fputc_unlocked)
|
|
yann@108
|
268 |
+//#undef fputc_unlocked
|
|
yann@108
|
269 |
+libc_hidden_proto(fputc_unlocked)
|
|
yann@108
|
270 |
|
|
yann@108
|
271 |
#undef putchar
|
|
yann@108
|
272 |
#ifdef __DO_UNLOCKED
|
|
yann@108
|
273 |
diff -ur uClibc-0.9.29/libc/stdio/puts.c uClibc-0.9.29-patched/libc/stdio/puts.c
|
|
yann@108
|
274 |
--- uClibc-0.9.29/libc/stdio/puts.c 2006-01-13 18:58:03.000000000 -0600
|
|
yann@108
|
275 |
+++ uClibc-0.9.29-patched/libc/stdio/puts.c 2007-05-09 18:05:21.642421481 -0500
|
|
yann@108
|
276 |
@@ -7,7 +7,8 @@
|
|
yann@108
|
277 |
|
|
yann@108
|
278 |
#include "_stdio.h"
|
|
yann@108
|
279 |
|
|
yann@108
|
280 |
-libc_hidden_proto(__fputc_unlocked)
|
|
yann@108
|
281 |
+//#undef fputc_unlocked
|
|
yann@108
|
282 |
+libc_hidden_proto(fputc_unlocked)
|
|
yann@108
|
283 |
libc_hidden_proto(fputs_unlocked)
|
|
yann@108
|
284 |
|
|
yann@108
|
285 |
int puts(register const char * __restrict s)
|
|
yann@108
|
286 |
@@ -25,7 +26,7 @@
|
|
yann@108
|
287 |
/* Note: Nonportable as fputs need only return nonnegative on success. */
|
|
yann@108
|
288 |
if ((n = fputs_unlocked(s, stream)) != EOF) {
|
|
yann@108
|
289 |
++n;
|
|
yann@108
|
290 |
- if (__fputc_unlocked('\n', stream) == EOF) {
|
|
yann@108
|
291 |
+ if (fputc_unlocked('\n', stream) == EOF) {
|
|
yann@108
|
292 |
n = EOF;
|
|
yann@108
|
293 |
}
|
|
yann@108
|
294 |
}
|
|
yann@108
|
295 |
diff -ur uClibc-0.9.29/libc/stdio/putwchar.c uClibc-0.9.29-patched/libc/stdio/putwchar.c
|
|
yann@108
|
296 |
--- uClibc-0.9.29/libc/stdio/putwchar.c 2006-01-14 14:16:19.000000000 -0600
|
|
yann@108
|
297 |
+++ uClibc-0.9.29-patched/libc/stdio/putwchar.c 2007-05-09 18:05:21.642421481 -0500
|
|
yann@108
|
298 |
@@ -22,7 +22,8 @@
|
|
yann@108
|
299 |
|
|
yann@108
|
300 |
#elif defined __UCLIBC_HAS_THREADS__
|
|
yann@108
|
301 |
|
|
yann@108
|
302 |
-libc_hidden_proto(__fputc_unlocked)
|
|
yann@108
|
303 |
+//#undef fputc_unlocked
|
|
yann@108
|
304 |
+libc_hidden_proto(fputc_unlocked)
|
|
yann@108
|
305 |
/* psm: should this be fputwc? */
|
|
yann@108
|
306 |
libc_hidden_proto(fputc)
|
|
yann@108
|
307 |
|
|
yann@108
|
308 |
diff -ur uClibc-0.9.29/libc/sysdeps/linux/common/bits/uClibc_stdio.h uClibc-0.9.29-patched/libc/sysdeps/linux/common/bits/uClibc_stdio.h
|
|
yann@108
|
309 |
--- uClibc-0.9.29/libc/sysdeps/linux/common/bits/uClibc_stdio.h 2007-01-28 07:16:58.000000000 -0600
|
|
yann@108
|
310 |
+++ uClibc-0.9.29-patched/libc/sysdeps/linux/common/bits/uClibc_stdio.h 2007-05-09 20:56:02.408110608 -0500
|
|
yann@108
|
311 |
@@ -381,33 +381,29 @@
|
|
yann@108
|
312 |
# define __FEOF(__stream) __FEOF_UNLOCKED(__stream)
|
|
yann@108
|
313 |
#endif
|
|
yann@108
|
314 |
|
|
yann@108
|
315 |
-extern int __fgetc_unlocked(FILE *__stream);
|
|
yann@108
|
316 |
-extern int __fputc_unlocked(int __c, FILE *__stream);
|
|
yann@108
|
317 |
-
|
|
yann@108
|
318 |
/* First define the default definitions.
|
|
yann@108
|
319 |
They are overridden below as necessary. */
|
|
yann@108
|
320 |
-#define __FGETC_UNLOCKED(__stream) (__fgetc_unlocked)((__stream))
|
|
yann@108
|
321 |
+#define __FGETC_UNLOCKED(__stream) (fgetc_unlocked)((__stream))
|
|
yann@108
|
322 |
#define __FGETC(__stream) (fgetc)((__stream))
|
|
yann@108
|
323 |
-#define __GETC_UNLOCKED_MACRO(__stream) (__fgetc_unlocked)((__stream))
|
|
yann@108
|
324 |
-#define __GETC_UNLOCKED(__stream) (__fgetc_unlocked)((__stream))
|
|
yann@108
|
325 |
+#define __GETC_UNLOCKED_MACRO(__stream) (fgetc_unlocked)((__stream))
|
|
yann@108
|
326 |
+#define __GETC_UNLOCKED(__stream) (fgetc_unlocked)((__stream))
|
|
yann@108
|
327 |
#define __GETC(__stream) (fgetc)((__stream))
|
|
yann@108
|
328 |
|
|
yann@108
|
329 |
-#define __FPUTC_UNLOCKED(__c, __stream) (__fputc_unlocked)((__c),(__stream))
|
|
yann@108
|
330 |
+#define __FPUTC_UNLOCKED(__c, __stream) (fputc_unlocked)((__c),(__stream))
|
|
yann@108
|
331 |
#define __FPUTC(__c, __stream) (fputc)((__c),(__stream))
|
|
yann@108
|
332 |
-#define __PUTC_UNLOCKED_MACRO(__c, __stream) (__fputc_unlocked)((__c),(__stream))
|
|
yann@108
|
333 |
-#define __PUTC_UNLOCKED(__c, __stream) (__fputc_unlocked)((__c),(__stream))
|
|
yann@108
|
334 |
+#define __PUTC_UNLOCKED_MACRO(__c, __stream) (fputc_unlocked)((__c),(__stream))
|
|
yann@108
|
335 |
+#define __PUTC_UNLOCKED(__c, __stream) (fputc_unlocked)((__c),(__stream))
|
|
yann@108
|
336 |
#define __PUTC(__c, __stream) (fputc)((__c),(__stream))
|
|
yann@108
|
337 |
|
|
yann@108
|
338 |
|
|
yann@108
|
339 |
#ifdef __STDIO_GETC_MACRO
|
|
yann@108
|
340 |
-
|
|
yann@108
|
341 |
extern FILE *__stdin; /* For getchar() macro. */
|
|
yann@108
|
342 |
|
|
yann@108
|
343 |
# undef __GETC_UNLOCKED_MACRO
|
|
yann@108
|
344 |
# define __GETC_UNLOCKED_MACRO(__stream) \
|
|
yann@108
|
345 |
( ((__stream)->__bufpos < (__stream)->__bufgetc_u) \
|
|
yann@108
|
346 |
? (*(__stream)->__bufpos++) \
|
|
yann@108
|
347 |
- : __fgetc_unlocked(__stream) )
|
|
yann@108
|
348 |
+ : fgetc_unlocked(__stream) )
|
|
yann@108
|
349 |
|
|
yann@108
|
350 |
# if 0
|
|
yann@108
|
351 |
/* Classic macro approach. getc{_unlocked} can have side effects. */
|
|
yann@108
|
352 |
@@ -453,20 +449,17 @@
|
|
yann@108
|
353 |
# endif
|
|
yann@108
|
354 |
# endif
|
|
yann@108
|
355 |
|
|
yann@108
|
356 |
-#else
|
|
yann@108
|
357 |
-
|
|
yann@108
|
358 |
#endif /* __STDIO_GETC_MACRO */
|
|
yann@108
|
359 |
|
|
yann@108
|
360 |
|
|
yann@108
|
361 |
#ifdef __STDIO_PUTC_MACRO
|
|
yann@108
|
362 |
-
|
|
yann@108
|
363 |
extern FILE *__stdout; /* For putchar() macro. */
|
|
yann@108
|
364 |
|
|
yann@108
|
365 |
# undef __PUTC_UNLOCKED_MACRO
|
|
yann@108
|
366 |
# define __PUTC_UNLOCKED_MACRO(__c, __stream) \
|
|
yann@108
|
367 |
( ((__stream)->__bufpos < (__stream)->__bufputc_u) \
|
|
yann@108
|
368 |
? (*(__stream)->__bufpos++) = (__c) \
|
|
yann@108
|
369 |
- : __fputc_unlocked((__c),(__stream)) )
|
|
yann@108
|
370 |
+ : (fputc_unlocked((__c),(__stream)) )
|
|
yann@108
|
371 |
|
|
yann@108
|
372 |
# if 0
|
|
yann@108
|
373 |
/* Classic macro approach. putc{_unlocked} can have side effects.*/
|
|
yann@108
|
374 |
@@ -489,7 +482,8 @@
|
|
yann@108
|
375 |
}) )
|
|
yann@108
|
376 |
|
|
yann@108
|
377 |
# undef __PUTC_UNLOCKED
|
|
yann@108
|
378 |
-# define __PUTC_UNLOCKED(__c, __stream) __FPUTC_UNLOCKED((__c), (__stream))
|
|
yann@108
|
379 |
+# define __PUTC_UNLOCKED(__c, __stream) \
|
|
yann@108
|
380 |
+ __FPUTC_UNLOCKED((__c), (__stream))
|
|
yann@108
|
381 |
|
|
yann@108
|
382 |
# ifdef __UCLIBC_HAS_THREADS__
|
|
yann@108
|
383 |
# undef __FPUTC
|
|
yann@108
|
384 |
diff -ur uClibc-0.9.29/libc/unistd/getpass.c uClibc-0.9.29-patched/libc/unistd/getpass.c
|
|
yann@108
|
385 |
--- uClibc-0.9.29/libc/unistd/getpass.c 2006-07-05 05:58:38.000000000 -0500
|
|
yann@108
|
386 |
+++ uClibc-0.9.29-patched/libc/unistd/getpass.c 2007-05-09 18:05:21.642421481 -0500
|
|
yann@108
|
387 |
@@ -36,7 +36,8 @@
|
|
yann@108
|
388 |
libc_hidden_proto(fputs)
|
|
yann@108
|
389 |
libc_hidden_proto(fputc)
|
|
yann@108
|
390 |
libc_hidden_proto(putc)
|
|
yann@108
|
391 |
-libc_hidden_proto(__fputc_unlocked)
|
|
yann@108
|
392 |
+//#undef fputc_unlocked
|
|
yann@108
|
393 |
+libc_hidden_proto(fputc_unlocked)
|
|
yann@108
|
394 |
|
|
yann@108
|
395 |
/* It is desirable to use this bit on systems that have it.
|
|
yann@108
|
396 |
The only bit of terminal state we want to twiddle is echoing, which is
|