nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sprintf family freestanding. 

And use them in the kernel.
This commit is contained in:
Jonas 'Sortie' Termansen 2012-09-23 12:32:53 +02:00
parent fd256bbb51
commit 1b26d1bacf
4 changed files with 91 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libmaxsi/Makefile
View File

@ -76,6 +76,7 @@ memory.o \
readparamstring.o \
rewind.o \
sort.o \
sprint.o \
sscanf.o \
stpcpy.o \
strcasecmp.o \

57
libmaxsi/print.cpp
View File

@ -62,60 +62,3 @@ extern "C" int printf(const char* /*restrict*/ format, ...)
va_end(list);
return (int) result;
}
typedef struct vsnprintf_struct
{
char* str;
size_t size;
size_t produced;
size_t written;
} vsnprintf_t;
static size_t StringPrintCallback(void* user, const char* string, size_t stringlen)
{
vsnprintf_t* info = (vsnprintf_t*) user;
if ( info->produced < info->size )
{
size_t available = info->size - info->produced;
size_t possible = (stringlen < available) ? stringlen : available;
memcpy(info->str + info->produced, string, possible);
info->written += possible;
}
info->produced += stringlen;
return stringlen;
}
extern "C" int vsnprintf(char* restrict str, size_t size, const char* restrict format, va_list list)
{
vsnprintf_t info;
info.str = str;
info.size = (size) ? size-1 : 0;
info.produced = 0;
info.written = 0;
vprintf_callback(StringPrintCallback, &info, format, list);
if ( size ) { info.str[info.written] = '\0'; }
return (int) info.produced;
}
extern "C" int snprintf(char* restrict str, size_t size, const char* restrict format, ...)
{
va_list list;
va_start(list, format);
int result = vsnprintf(str, size, format, list);
va_end(list);
return result;
}
extern "C" int vsprintf(char* restrict str, const char* restrict format, va_list list)
{
return vsnprintf(str, SIZE_MAX, format, list);
}
extern "C" int sprintf(char* restrict str, const char* restrict format, ...)
{
va_list list;
va_start(list, format);
int result = vsprintf(str, format, list);
va_end(list);
return result;
}

86
libmaxsi/sprint.cpp Normal file
View File

@ -0,0 +1,86 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
This file is part of LibMaxsi.
LibMaxsi is free software: you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
LibMaxsi is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
details.
You should have received a copy of the GNU Lesser General Public License
along with LibMaxsi. If not, see <http://www.gnu.org/licenses/>.
sprint.cpp
Provides the stubs for the sprintf family of functions.
*******************************************************************************/
#include <stddef.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
typedef struct vsnprintf_struct
{
char* str;
size_t size;
size_t produced;
size_t written;
} vsnprintf_t;
static size_t StringPrintCallback(void* user, const char* string, size_t stringlen)
{
vsnprintf_t* info = (vsnprintf_t*) user;
if ( info->produced < info->size )
{
size_t available = info->size - info->produced;
size_t possible = (stringlen < available) ? stringlen : available;
memcpy(info->str + info->produced, string, possible);
info->written += possible;
}
info->produced += stringlen;
return stringlen;
}
extern "C" int vsnprintf(char* restrict str, size_t size, const char* restrict format, va_list list)
{
vsnprintf_t info;
info.str = str;
info.size = (size) ? size-1 : 0;
info.produced = 0;
info.written = 0;
vprintf_callback(StringPrintCallback, &info, format, list);
if ( size ) { info.str[info.written] = '\0'; }
return (int) info.produced;
}
extern "C" int snprintf(char* restrict str, size_t size, const char* restrict format, ...)
{
va_list list;
va_start(list, format);
int result = vsnprintf(str, size, format, list);
va_end(list);
return result;
}
extern "C" int vsprintf(char* restrict str, const char* restrict format, va_list list)
{
return vsnprintf(str, SIZE_MAX, format, list);
}
extern "C" int sprintf(char* restrict str, const char* restrict format, ...)
{
va_list list;
va_start(list, format);
int result = vsprintf(str, format, list);
va_end(list);
return result;
}

7
sortix/bga.cpp
View File

@ -31,6 +31,7 @@
#include <sortix/mman.h>
#include <libmaxsi/string.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "x86-family/memorymanagement.h"
@ -423,9 +424,9 @@ bool BGADriver::DetectModes() const
char bppstr[64];
char xresstr[64];
char yresstr[64];
bppstr[String::ConvertUInt32(bpp, bppstr)] = 0;
xresstr[String::ConvertUInt32(w, xresstr)] = 0;
yresstr[String::ConvertUInt32(h, yresstr)] = 0;
snprintf(bppstr, 64, "%u", bpp);
snprintf(xresstr, 64, "%u", w);
snprintf(yresstr, 64, "%u", h);
char* modestr = String::Combine(6, "width=", xresstr, ",height=",
yresstr, ",bpp=", bppstr);
if ( !modestr ) { return false; }