Diff markup
001 001
002 002
003 003
004 004
005 005
006 006
007 007
008 008
009 009
010 010
011 011
012 012
013 013
014 014
015 015
016 016
017 017
018 018
019 019
020 #include "klibc.h" 020 #include "klibc.h"
021 021
022 022
023 void *memcpy(void *dst0, const void *src0, reg 023 void *memcpy(void *dst0, const void *src0, register unsigned int size)
024 { 024 {
025 char *dst; 025 char *dst;
026 const char *src; 026 const char *src;
027 for (dst = (char*)dst0, src = (const char*)s 027 for (dst = (char*)dst0, src = (const char*)src0 ;
028 size > 0 ; 028 size > 0 ;
029 dst++, src++, size--) 029 dst++, src++, size--)
030 *dst = *src; 030 *dst = *src;
031 return dst0; 031 return dst0;
032 } 032 }
033 033
034 034
035 void *memset(void *dst0, register int c, regis 035 void *memset(void *dst0, register int c, register unsigned int length)
036 { 036 {
037 char *dst; 037 char *dst;
038 for (dst = (char*) dst0 ; 038 for (dst = (char*) dst0 ;
039 length > 0 ; 039 length > 0 ;
040 dst++, length --) 040 dst++, length --)
041 *dst = (char)c; 041 *dst = (char)c;
042 return dst0; 042 return dst0;
043 } 043 }
044 044
045 int memcmp(const void *s1, const void *s2, sos 045 int memcmp(const void *s1, const void *s2, sos_size_t len)
046 { 046 {
047 const unsigned char *c1, *c2; 047 const unsigned char *c1, *c2;
048 unsigned int i; 048 unsigned int i;
049 049
050 for (i = 0, c1 = s1, c2 = s2; i < len; i++, 050 for (i = 0, c1 = s1, c2 = s2; i < len; i++, c1++, c2++)
051 { 051 {
052 if(*c1 != *c2) 052 if(*c1 != *c2)
053 return *c1 - *c2; 053 return *c1 - *c2;
054 } 054 }
055 055
056 return 0; 056 return 0;
057 } 057 }
058 058
059 059
060 unsigned int strlen(register const char *str) 060 unsigned int strlen(register const char *str)
061 { 061 {
062 unsigned int retval = 0; 062 unsigned int retval = 0;
063 063
064 while (*str++) 064 while (*str++)
065 retval++; 065 retval++;
066 066
067 return retval; 067 return retval;
068 } 068 }
069 069
070 070
071 unsigned int strnlen(const char * s, sos_size_ 071 unsigned int strnlen(const char * s, sos_size_t count)
072 { 072 {
073 const char *sc; 073 const char *sc;
074 074
075 for (sc = s; count-- && *sc != '\0'; ++sc) 075 for (sc = s; count-- && *sc != '\0'; ++sc)
076 continue; 076 continue;
077 077
078 return sc - s; 078 return sc - s;
079 } 079 }
080 080
081 081
082 char *strzcpy(register char *dst, register con 082 char *strzcpy(register char *dst, register const char *src, register int len)
083 { 083 {
084 int i; 084 int i;
085 085
086 if (len <= 0) 086 if (len <= 0)
087 return dst; 087 return dst;
088 088
089 for (i = 0; i < len; i++) 089 for (i = 0; i < len; i++)
090 { 090 {
091 dst[i] = src[i]; 091 dst[i] = src[i];
092 if(src[i] == '\0') 092 if(src[i] == '\0')
093 return dst; 093 return dst;
094 } 094 }
095 095
096 dst[len-1] = '\0'; 096 dst[len-1] = '\0';
097 return dst; 097 return dst;
098 } 098 }
099 099
100 100
101 char *strzcat (char *dest, const char *src, so 101 char *strzcat (char *dest, const char *src, sos_size_t n)
102 { 102 {
103 char *res = dest; 103 char *res = dest;
104 104
105 for ( ; *dest ; dest++); 105 for ( ; *dest ; dest++);
106 106
107 for ( ; *src ; src++, dest++) { 107 for ( ; *src ; src++, dest++) {
108 *dest = *src; 108 *dest = *src;
109 n--; 109 n--;
110 if (n <= 0) 110 if (n <= 0)
111 break; 111 break;
112 } 112 }
113 113
114 *dest = '\0'; 114 *dest = '\0';
115 return res; 115 return res;
116 } 116 }
117 117
118 int strcmp(register const char *s1, register c 118 int strcmp(register const char *s1, register const char *s2)
119 { 119 {
120 while (*s1 == *s2++) 120 while (*s1 == *s2++)
121 if (*s1++ == 0) 121 if (*s1++ == 0)
122 return (0); 122 return (0);
123 123
124 return (*(const unsigned char *)s1 - *(const 124 return (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1));
125 } 125 }
126 126
127 127
128 int strncmp(register const char *s1, register 128 int strncmp(register const char *s1, register const char *s2, register int len)
129 { 129 {
130 char c1 = '\0', c2 = '\0'; 130 char c1 = '\0', c2 = '\0';
131 131
132 while (len > 0) 132 while (len > 0)
133 { 133 {
134 c1 = (unsigned char) *s1++; 134 c1 = (unsigned char) *s1++;
135 c2 = (unsigned char) *s2++; 135 c2 = (unsigned char) *s2++;
136 if (c1 == '\0' || c1 != c2) 136 if (c1 == '\0' || c1 != c2)
137 return c1 - c2; 137 return c1 - c2;
138 len--; 138 len--;
139 } 139 }
140 140
141 return c1 - c2; 141 return c1 - c2;
142 } 142 }
143 143
144 144
>> 145 static unsigned long int _random_seed = 93186752;
>> 146
>> 147
>> 148
>> 149
>> 150
>> 151
>> 152 unsigned long int random (void)
>> 153 {
>> 154
>> 155
>> 156
>> 157
>> 158 static unsigned int a = 1588635695, q = 2, r = 1117695901;
>> 159
>> 160
>> 161
>> 162
>> 163
>> 164
>> 165
>> 166
>> 167
>> 168 _random_seed = a*(_random_seed % q) - r*(_random_seed / q);
>> 169 return _random_seed;
>> 170 }
>> 171
>> 172
>> 173 void srandom (unsigned long int seed)
>> 174 {
>> 175 _random_seed = seed;
>> 176 }
>> 177
>> 178
145 179
146 180
147 int vsnprintf(char *buff, sos_size_t len, cons 181 int vsnprintf(char *buff, sos_size_t len, const char * format, va_list ap)
148 { 182 {
149 sos_size_t i, result; 183 sos_size_t i, result;
>> 184 sos_bool_t fmt_modifiers = FALSE;
>> 185 sos_bool_t prefix_long = FALSE;
>> 186 sos_bool_t prefix_long_long = FALSE;
150 187
151 if (!buff || !format || (len < 0)) 188 if (!buff || !format || (len < 0))
152 return -1; 189 return -1;
153 190
154 #define PUTCHAR(thechar) \ 191 #define PUTCHAR(thechar) \
155 do { \ 192 do { \
156 if (result < len-1) \ 193 if (result < len-1) \
157 *buff++ = (thechar); \ 194 *buff++ = (thechar); \
158 result++; \ 195 result++; \
159 } while (0) 196 } while (0)
160 197
161 result = 0; 198 result = 0;
162 for(i=0 ; format[i] != '\0' ; i++){ !! 199 for(i=0 ; format[i] != '\0' ; i++)
163 switch (format[i]) !! 200 {
164 { !! 201 if (!fmt_modifiers && (format[i] != '%'))
165 case '%': !! 202 {
166 i++; !! 203 PUTCHAR(format[i]);
167 switch(format[i]) !! 204 continue;
168 { !! 205 }
169 case '%': !! 206
>> 207 switch (format[i])
>> 208 {
>> 209 case '%':
>> 210 if (fmt_modifiers)
170 { 211 {
171 PUTCHAR('%'); 212 PUTCHAR('%');
>> 213 fmt_modifiers = FALSE;
172 break; 214 break;
173 } 215 }
174 case 'i':; !! 216
175 case 'd': !! 217 fmt_modifiers = TRUE;
176 { !! 218 prefix_long = FALSE;
177 int integer = va_arg(ap,int); !! 219 prefix_long_long = FALSE;
178 int cpt2 = 0; !! 220 break;
179 char buff_int[16]; !! 221
180 !! 222 case 'l':
181 if (integer<0) !! 223 if (prefix_long)
182 PUTCHAR('-'); !! 224 prefix_long_long = TRUE;
183 !! 225 else
184 !! 226 prefix_long = TRUE;
185 !! 227 break;
186 do { !! 228
187 int m10 = integer%10; !! 229 case 'u':
188 m10 = (m10 < 0)? -m10:m10; !! 230 {
189 buff_int[cpt2++]=(char)('0'+ m !! 231 if (! prefix_long_long)
190 integer=integer/10; !! 232 {
191 } while(integer!=0); !! 233 unsigned int integer = va_arg(ap,unsigned int);
192 !! 234 int cpt2 = 0;
193 for(cpt2 = cpt2 - 1 ; cpt2 >= 0 !! 235 char buff_int[16];
194 PUTCHAR(buff_int[cpt2]); !! 236
195 !! 237 do {
196 break; !! 238 int m10 = integer%10;
197 } !! 239 buff_int[cpt2++]=(char)('0'+ m10);
>> 240 integer=integer/10;
>> 241 } while(integer!=0);
198 242
199 case 'c': !! 243 for(cpt2 = cpt2 - 1 ; cpt2 >= 0 ; cpt2--)
200 { !! 244 PUTCHAR(buff_int[cpt2]);
201 int value = va_arg(ap,int); !! 245 }
202 PUTCHAR((char)value); !! 246 else
203 break; !! 247 {
204 } !! 248 unsigned long long int integer
>> 249 = va_arg(ap,unsigned long long int);
>> 250 int cpt2 = 0;
>> 251 char buff_int[32];
>> 252
>> 253 do {
>> 254 int m10 = integer%10;
>> 255 buff_int[cpt2++]=(char)('0'+ m10);
>> 256 integer=integer/10;
>> 257 } while(integer!=0);
205 258
206 case 's': !! 259 for(cpt2 = cpt2 - 1 ; cpt2 >= 0 ; cpt2--)
207 { !! 260 PUTCHAR(buff_int[cpt2]);
208 char *string = va_arg(ap,char *) !! 261 }
209 if (! string) !! 262 }
210 string = "(null)"; !! 263 fmt_modifiers = FALSE;
211 for( ; *string != '\0' ; string+ !! 264 break;
212 PUTCHAR(*string); <<
213 break; <<
214 } <<
215 265
216 case 'x': !! 266 case 'i':
217 { !! 267 case 'd':
218 unsigned int hexa = va_arg(ap,in !! 268 {
219 unsigned int nb; !! 269 if (! prefix_long_long)
220 int i, had_nonzero = 0; !! 270 {
221 for(i=0 ; i < 8 ; i++) !! 271 int integer = va_arg(ap,int);
222 { !! 272 int cpt2 = 0;
223 nb = (unsigned int)(hexa << !! 273 char buff_int[16];
224 nb = (nb >> 28) & 0xf; !! 274
225 !! 275 if (integer<0)
226 if (nb == 0) !! 276 PUTCHAR('-');
227 { !! 277
228 if (had_nonzero) !! 278
229 PUTCHAR('0'); !! 279
230 } !! 280 do {
231 else !! 281 int m10 = integer%10;
232 { !! 282 m10 = (m10 < 0)? -m10:m10;
233 had_nonzero = 1; !! 283 buff_int[cpt2++]=(char)('0'+ m10);
234 if (nb < 10) !! 284 integer=integer/10;
235 PUTCHAR('0'+nb); !! 285 } while(integer!=0);
236 else !! 286
237 PUTCHAR('a'+(nb-10)); !! 287 for(cpt2 = cpt2 - 1 ; cpt2 >= 0 ; cpt2--)
238 } !! 288 PUTCHAR(buff_int[cpt2]);
239 } !! 289 }
240 if (! had_nonzero) !! 290 else
241 PUTCHAR('0'); !! 291 {
242 break; !! 292 long long int integer = va_arg(ap,long long int);
243 } !! 293 int cpt2 = 0;
>> 294 char buff_int[32];
>> 295
>> 296 if (integer<0)
>> 297 PUTCHAR('-');
>> 298
>> 299
>> 300
>> 301 do {
>> 302 int m10 = integer%10;
>> 303 m10 = (m10 < 0)? -m10:m10;
>> 304 buff_int[cpt2++]=(char)('0'+ m10);
>> 305 integer=integer/10;
>> 306 } while(integer!=0);
>> 307
>> 308 for(cpt2 = cpt2 - 1 ; cpt2 >= 0 ; cpt2--)
>> 309 PUTCHAR(buff_int[cpt2]);
>> 310 }
>> 311 }
>> 312 fmt_modifiers = FALSE;
>> 313 break;
>> 314
>> 315 case 'c':
>> 316 {
>> 317 int value = va_arg(ap,int);
>> 318 PUTCHAR((char)value);
>> 319 fmt_modifiers = FALSE;
244 break; 320 break;
245 <<
246 default: <<
247 PUTCHAR('%'); <<
248 PUTCHAR(format[i]); <<
249 } 321 }
250 break; !! 322
251 !! 323 case 's':
252 default: !! 324 {
253 PUTCHAR(format[i]); !! 325 char *string = va_arg(ap,char *);
254 } !! 326 if (! string)
255 } !! 327 string = "(null)";
256 !! 328 for( ; *string != '\0' ; string++)
>> 329 PUTCHAR(*string);
>> 330 fmt_modifiers = FALSE;
>> 331 break;
>> 332 }
>> 333
>> 334 case 'p':
>> 335 PUTCHAR('0');
>> 336 PUTCHAR('x');
>> 337 case 'x':
>> 338 {
>> 339 unsigned long long int hexa;
>> 340 unsigned long long int nb;
>> 341 int i, had_nonzero = 0;
>> 342
>> 343 if (prefix_long_long)
>> 344 hexa = va_arg(ap,unsigned long long int);
>> 345 else
>> 346 hexa = va_arg(ap,unsigned int);
>> 347
>> 348 for(i=0 ; i < 16 ; i++)
>> 349 {
>> 350 nb = (unsigned long long int)(hexa << (i*4));
>> 351 nb = (nb >> 60) & 0xf;
>> 352
>> 353 if (nb == 0)
>> 354 {
>> 355 if (had_nonzero)
>> 356 PUTCHAR('0');
>> 357 }
>> 358 else
>> 359 {
>> 360 had_nonzero = 1;
>> 361 if (nb < 10)
>> 362 PUTCHAR('0'+nb);
>> 363 else
>> 364 PUTCHAR('a'+(nb-10));
>> 365 }
>> 366 }
>> 367 if (! had_nonzero)
>> 368 PUTCHAR('0');
>> 369 }
>> 370 fmt_modifiers = FALSE;
>> 371 break;
>> 372
>> 373 default:
>> 374 PUTCHAR('%');
>> 375 if (prefix_long)
>> 376 PUTCHAR('l');
>> 377 if (prefix_long_long)
>> 378 PUTCHAR('l');
>> 379 PUTCHAR(format[i]);
>> 380 fmt_modifiers = FALSE;
>> 381 }
>> 382 }
>> 383
257 *buff = '\0'; 384 *buff = '\0';
258 return result; 385 return result;
259 } 386 }
260 387
261 388
262 int snprintf(char * buff, sos_size_t len, cons 389 int snprintf(char * buff, sos_size_t len, const char *format, ...)
263 { 390 {
264 va_list ap; 391 va_list ap;
265 392
266 va_start(ap, format); 393 va_start(ap, format);
267 len = vsnprintf(buff, len, format, ap); 394 len = vsnprintf(buff, len, format, ap);
268 va_end(ap); 395 va_end(ap);
269 396
270 return len; 397 return len;
271 } 398 }