Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6411 → Rev 6412

/programs/develop/ktcc/trunk/libc/stdio/fopen.c
128,7 → 128,7
res->filesize=0;
res->filepos=0;
res->mode=imode;
res->filename=getfullpath(filename);
res->filename=(char*)getfullpath(filename);
 
if ((imode==FILE_OPEN_READ) || (imode==FILE_OPEN_APPEND))
{
/programs/develop/ktcc/trunk/libc/stdio/format_print.c
414,9 → 414,11
flag_unsigned=1;
break;
case 'x':
case 'p':
format_flag=1;
break;
case 'X':
case 'P':
flag_register=1;
format_flag=1;
break;
451,7 → 453,7
{
case 'c':
case 'C':
if ((pos+1)<maxlen)
if ((pos+1)<=maxlen)
{
//*s=(int)va_arg(argp,char*);
*s=*((char *)argp);
463,11 → 465,10
case 'S':
str=va_arg(argp,char*);
length=strlen(str);
if ((pos+length)<maxlen)
{
if (pos + length > maxlen)
length = maxlen - pos;
memcpy(s,str,length);
s=s+length;pos=pos+length;
}
break;
case 'd':
case 'D':
478,7 → 479,7
if (flag_long==2) {intdigit=va_arg(argp,long long);}
//intdigit=*((long*)argp);
//argp=argp+4;
if ((intdigit>0) && (flag_plus==1) && (pos+1<maxlen))
if ((intdigit>0) && (flag_plus==1) && (pos+1<=maxlen))
{
*s='+';
s++;
485,11 → 486,10
pos++;
}
length=formatted_long_to_string(intdigit,0,buf);
if ((pos+length)<maxlen)
{
if (pos + length > maxlen)
length = maxlen - pos;
memcpy(s,buf,length);
s=s+length;pos=pos+length;
}
break;
case 'o':
if (flag_long==0) {intdigit=va_arg(argp,int);}
499,11 → 499,10
//argp=argp+4;
 
length=formatted_octa_to_string(intdigit,0,flag_register,buf);
if ((pos+length)<maxlen)
{
if (pos + length > maxlen)
length = maxlen - pos;
memcpy(s,buf,length);
s=s+length;pos=pos+length;
}
break;
case 'u':
case 'U':
516,12 → 515,13
}
 
length=formatted_long_to_string(intdigit,0,buf);
if ((pos+length)<maxlen)
{
if (pos + length > maxlen)
length = maxlen - pos;
memcpy(s,buf,length);
s=s+length;pos=pos+length;
}
break;
case 'p':
case 'P':
case 'x':
case 'X':
if (flag_long==0) {intdigit=va_arg(argp,int);}
531,11 → 531,10
//argp=argp+4;
 
length=formatted_hex_to_string(intdigit,0,flag_register,buf);
if ((pos+length)<maxlen)
{
if (pos + length > maxlen)
length = maxlen - pos;
memcpy(s,buf,length);
s=s+length;pos=pos+length;
}
break;
case 'z':
case 'Z':
546,11 → 545,10
}
 
length=formatted_long_to_string(intdigit,0,buf);
if ((pos+length)<maxlen)
{
if (pos + length > maxlen)
length = maxlen - pos;
memcpy(s,buf,length);
s=s+length;pos=pos+length;
}
break;
default:;
 
717,10 → 715,7
}
else
{
if (*fmt=='\0') {break;}
*s=*fmt;
fmt++;
s++;
if (!(*s++ = *fmt++)) break;
pos++;
}
exit_check:;
/programs/develop/ktcc/trunk/libc/stdio/fprintf.c
1,4 → 1,5
#include <stdio.h>
#include <stdlib.h>
 
int format_print(char *dest, size_t maxlen, const char *fmt,va_list argp);
 
/programs/develop/ktcc/trunk/libc/stdio/fscanf.c
4,7 → 4,7
int c;
while(1)
{
c=getc(file);
c=fgetc(file);
if (c!=' ' && c!='\r' && c!='\n')
{
ungetc(c,file);
12,6 → 12,7
}
}
}
 
int fscanf(FILE* file,const char* format, ...)
{
int res;
34,7 → 35,7
c=fgetc(file);
if (c!=*format)
{
fungetc(c,file);
ungetc(c,file);
return -1;
}
format++;
/programs/develop/ktcc/trunk/libc/stdio/fseek.c
1,6 → 1,7
#include <stdio.h>
int fseek(FILE* file,long offset,int origin)
{
fpos_t pos;
if (origin==SEEK_CUR)
offset+=file->filepos;
else if (origin==SEEK_END)
7,5 → 8,6
offset+=file->filesize;
else if (origin!=SEEK_SET)
return EOF;
return fsetpos(file,offset);
pos = offset;
return fsetpos(file, &pos);
}
/programs/develop/ktcc/trunk/libc/stdio/printf.c
1,4 → 1,4
 
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <kolibrisys.h>