Make sprintf family freestanding.
And use them in the kernel.
This commit is contained in:
parent
fd256bbb51
commit
1b26d1bacf
|
@ -76,6 +76,7 @@ memory.o \
|
||||||
readparamstring.o \
|
readparamstring.o \
|
||||||
rewind.o \
|
rewind.o \
|
||||||
sort.o \
|
sort.o \
|
||||||
|
sprint.o \
|
||||||
sscanf.o \
|
sscanf.o \
|
||||||
stpcpy.o \
|
stpcpy.o \
|
||||||
strcasecmp.o \
|
strcasecmp.o \
|
||||||
|
|
|
@ -62,60 +62,3 @@ extern "C" int printf(const char* /*restrict*/ format, ...)
|
||||||
va_end(list);
|
va_end(list);
|
||||||
return (int) result;
|
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;
|
|
||||||
}
|
|
||||||
|
|
|
@ -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;
|
||||||
|
}
|
|
@ -31,6 +31,7 @@
|
||||||
#include <sortix/mman.h>
|
#include <sortix/mman.h>
|
||||||
#include <libmaxsi/string.h>
|
#include <libmaxsi/string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "x86-family/memorymanagement.h"
|
#include "x86-family/memorymanagement.h"
|
||||||
|
@ -423,9 +424,9 @@ bool BGADriver::DetectModes() const
|
||||||
char bppstr[64];
|
char bppstr[64];
|
||||||
char xresstr[64];
|
char xresstr[64];
|
||||||
char yresstr[64];
|
char yresstr[64];
|
||||||
bppstr[String::ConvertUInt32(bpp, bppstr)] = 0;
|
snprintf(bppstr, 64, "%u", bpp);
|
||||||
xresstr[String::ConvertUInt32(w, xresstr)] = 0;
|
snprintf(xresstr, 64, "%u", w);
|
||||||
yresstr[String::ConvertUInt32(h, yresstr)] = 0;
|
snprintf(yresstr, 64, "%u", h);
|
||||||
char* modestr = String::Combine(6, "width=", xresstr, ",height=",
|
char* modestr = String::Combine(6, "width=", xresstr, ",height=",
|
||||||
yresstr, ",bpp=", bppstr);
|
yresstr, ",bpp=", bppstr);
|
||||||
if ( !modestr ) { return false; }
|
if ( !modestr ) { return false; }
|
||||||
|
|
Loading…
Reference in New Issue