Compare commits
No commits in common. "04f49a681919d19f62875b96fe8bd5dd0542c763" and "1f5073d0ace873011e0d697aeb7df6d3493d50e4" have entirely different histories.
04f49a6819
...
1f5073d0ac
|
@ -24,7 +24,7 @@ struct ifreq
|
|||
struct sockaddr ifru_netmask;
|
||||
struct sockaddr ifru_gwaddr;
|
||||
struct sockaddr ifru_hwaddr;
|
||||
unsigned char __min_storage[sizeof(struct sockaddr) + 6];
|
||||
unsigned char __min_storage[sizeof(sockaddr) + 6];
|
||||
} ifr_ifru;
|
||||
};
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
__BEGIN_DECLS
|
||||
|
||||
#define __need_size_t
|
||||
#define __need_size_t 1
|
||||
#include <stddef.h>
|
||||
|
||||
#define TTY_CMD_SET 0x01
|
||||
|
|
|
@ -102,15 +102,6 @@ char* ctermid(char* buffer)
|
|||
return target;
|
||||
}
|
||||
|
||||
int dprintf(int fildes, const char* __restrict format, ...)
|
||||
{
|
||||
va_list arguments;
|
||||
va_start(arguments, format);
|
||||
int ret = vdprintf(fildes, format, arguments);
|
||||
va_end(arguments);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int fclose(FILE* file)
|
||||
{
|
||||
ScopeLock _(file);
|
||||
|
@ -820,41 +811,6 @@ int ungetc(int c, FILE* stream)
|
|||
return ungetc_unlocked(c, stream);
|
||||
}
|
||||
|
||||
int vdprintf(int fildes, const char* __restrict format, va_list arguments)
|
||||
{
|
||||
struct print_info
|
||||
{
|
||||
int fildes;
|
||||
size_t offset;
|
||||
char buffer[512];
|
||||
};
|
||||
|
||||
print_info info {
|
||||
.fildes = fildes,
|
||||
.offset = 0,
|
||||
.buffer = {},
|
||||
};
|
||||
|
||||
const int ret = printf_impl(format, arguments,
|
||||
[](int c, void* _info) -> int
|
||||
{
|
||||
auto* info = static_cast<print_info*>(_info);
|
||||
info->buffer[info->offset++] = c;
|
||||
if (info->offset >= sizeof(info->buffer))
|
||||
{
|
||||
write(info->fildes, info->buffer, info->offset);
|
||||
info->offset = 0;
|
||||
}
|
||||
return 0;
|
||||
}, static_cast<void*>(&info)
|
||||
);
|
||||
|
||||
if (info.offset)
|
||||
write(info.fildes, info.buffer, info.offset);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int vfprintf(FILE* file, const char* format, va_list arguments)
|
||||
{
|
||||
ScopeLock _(file);
|
||||
|
|
Loading…
Reference in New Issue