Commit 01df9708 authored by Jonas Termansen's avatar Jonas Termansen

Refactored libmaxsi/io.cpp into multiple files.

This creates more object files in the static library which reduces the size
of statically linked files as only the relevant object files are included.
In my experience, it reduced the size of the system initrd from 1.9 MiB to
1.6 MiB which is valuable.
parent db5d216c
......@@ -42,7 +42,6 @@ sortix-sound.o \
readparamstring.o \
process.o \
thread.o \
io.o \
ioleast.o \
winsize.o \
terminal.o \
......@@ -66,6 +65,34 @@ sort.o \
string.o \
error.o \
format.o \
access.o \
chdir.o \
chmod.o \
close.o \
dup.o \
errorprint.o \
fchmod.o \
fcntl.o \
fstat.o \
ftruncate.o \
getcwd.o \
getdtablesize.o \
lseek.o \
mbtowc.o \
mkdir.o \
mktemp.o \
open.o \
pipe.o \
print.o \
read.o \
readdirents.o \
rmdir.o \
scan.o \
stat.o \
truncate.o \
umask.o \
unlink.o \
write.o \
UNPROCHEADERDIRS:=$(shell find include -type d)
UNPROCHEADERS:=$(shell find include -type f)
......
/*******************************************************************************
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/>.
access.cpp
Check real user's permissions for a file
*******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/syscall.h>
#include <unistd.h>
namespace Maxsi {
DEFN_SYSCALL2(int, SysAccess, SYSCALL_ACCESS, const char*, int);
extern "C" int access(const char* pathname, int mode)
{
return SysAccess(pathname, mode);
}
} // namespace Maxsi
/*******************************************************************************
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/>.
chdir.cpp
Changes the current working directory.
*******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/syscall.h>
namespace Maxsi {
DEFN_SYSCALL1(int, SysChDir, SYSCALL_CHDIR, const char*);
extern "C" int chdir(const char* path)
{
return SysChDir(path);
}
} // namespace Maxsi
/*******************************************************************************
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/>.
chmod.cpp
Changes the mode bits of a file.
*******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/syscall.h>
#include <sys/stat.h>
#include <errno.h>
namespace Maxsi {
// TODO: Implement this in the kernel.
extern "C" int chmod(const char* path, mode_t mode)
{
errno = ENOSYS;
return -1;
}
} // namespace Maxsi
/*******************************************************************************
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/>.
close.cpp
Closes a file descriptor.
*******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/syscall.h>
#include <unistd.h>
namespace Maxsi {
DEFN_SYSCALL1(int, SysClose, SYSCALL_CLOSE, int);
extern "C" int close(int fd)
{
return SysClose(fd);
}
} // namespace Maxsi
/*******************************************************************************
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/>.
dup.cpp
Duplicates a file descriptor.
*******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/syscall.h>
#include <unistd.h>
namespace Maxsi {
DEFN_SYSCALL1(int, SysDup, SYSCALL_DUP, int);
extern "C" int dup(int fd)
{
return SysDup(fd);
}
} // namespace Maxsi
/*******************************************************************************
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/>.
errorprint.cpp
Functions for printing error messages to the terminal.
*******************************************************************************/
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <error.h>
extern "C" void gnu_error(int status, int errnum, const char *format, ...)
{
fprintf(stderr, "%s: ", program_invocation_name);
va_list list;
va_start(list, format);
vfprintf(stderr, format, list);
va_end(list);
if ( errnum )
fprintf(stderr, ": %s", strerror(errnum));
fprintf(stderr, "\n");
if ( status )
exit(status);
}
extern "C" void perror(const char* s)
{
error(0, errno, "%s", s);
}
/*******************************************************************************
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/>.
fchmod.cpp
Changes the mode bits of an open file.
*******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/syscall.h>
#include <sys/stat.h>
#include <errno.h>
namespace Maxsi {
// TODO: Implement this in the kernel.
extern "C" int fchmod(int fd, mode_t mode)
{
errno = ENOSYS;
return -1;
}
} // namespace Maxsi
/*******************************************************************************
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/>.
fcntl.cpp
Manipulates a file descriptor.
*******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/syscall.h>
#include <fcntl.h>
namespace Maxsi {
DEFN_SYSCALL3(int, SysFCntl, SYSCALL_FCNTL, int, int, unsigned long);
extern "C" int fcntl(int fd, int cmd, unsigned long arg)
{
return SysFCntl(fd, cmd, arg);
}
} // namespace Maxsi
/*******************************************************************************
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/>.
fstat.cpp
Retrieves status of an open file.
*******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/syscall.h>
#include <sys/stat.h>
namespace Maxsi {
DEFN_SYSCALL2(int, SysFStat, SYSCALL_FSTAT, int, struct stat*);
extern "C" int fstat(int fd, struct stat* st)
{
return SysFStat(fd, st);
}
} // namespace Maxsi
/*******************************************************************************
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/>.
ftruncate.cpp
Truncates an open file to a specific size.
*******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/syscall.h>
namespace Maxsi {
DEFN_SYSCALL2(int, SysFTruncate, SYSCALL_FTRUNCATE, int, off_t);
extern "C" int ftruncate(int fd, off_t length)
{
return SysFTruncate(fd, length);
}
} // namespace Maxsi
/*******************************************************************************
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/>.
getcwd.cpp
Returns the current working directory.
*******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/syscall.h>
namespace Maxsi {
DEFN_SYSCALL2(char*, SysGetCWD, SYSCALL_GETCWD, char*, size_t);
extern "C" char* getcwd(char* buf, size_t size)
{
return SysGetCWD(buf, size);
}
} // namespace Maxsi
/*******************************************************************************
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/>.
getdtablesize.cpp
Get descriptor table size.
*******************************************************************************/
#include <unistd.h>
// TODO: This has been replaced with sysconf(_SC_OPEN_MAX). This is only
// here for compatibility with gzip and should be removed as soon as sysconf
// is implemented.
extern "C" int getdtablesize(void)
{
return 0x10000;
}
/*******************************************************************************
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/>.
io.cpp
Functions for management of input and output.
*******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/syscall.h>
#include <libmaxsi/io.h>
#include <libmaxsi/format.h>
#include <libmaxsi/string.h>
#include <libmaxsi/memory.h>
#include <sys/readdirents.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#include <error.h>
#include <stdlib.h>
#include <stdio.h>
namespace Maxsi
{
DEFN_SYSCALL1(size_t, SysPrint, SYSCALL_PRINT_STRING, const char*);
DEFN_SYSCALL3(ssize_t, SysRead, SYSCALL_READ, int, void*, size_t);
DEFN_SYSCALL3(ssize_t, SysWrite, SYSCALL_WRITE, int, const void*, size_t);
DEFN_SYSCALL1(int, SysPipe, SYSCALL_PIPE, int*);
DEFN_SYSCALL1(int, SysClose, SYSCALL_CLOSE, int);
DEFN_SYSCALL1(int, SysDup, SYSCALL_DUP, int);
DEFN_SYSCALL3(int, SysOpen, SYSCALL_OPEN, const char*, int, mode_t);
DEFN_SYSCALL3(int, SysReadDirEnts, SYSCALL_READDIRENTS, int, struct sortix_dirent*, size_t);
DEFN_SYSCALL1(int, SysChDir, SYSCALL_CHDIR, const char*);
DEFN_SYSCALL2(char*, SysGetCWD, SYSCALL_GETCWD, char*, size_t);
DEFN_SYSCALL1(int, SysUnlink, SYSCALL_UNLINK, const char*);
DEFN_SYSCALL3_VOID(SysSeek, SYSCALL_SEEK, int, off_t*, int);
DEFN_SYSCALL2(int, SysMkDir, SYSCALL_MKDIR, const char*, mode_t);
DEFN_SYSCALL1(int, SysRmDir, SYSCALL_RMDIR, const char*);
DEFN_SYSCALL2(int, SysTruncate, SYSCALL_TRUNCATE, const char*, off_t);
DEFN_SYSCALL2(int, SysFTruncate, SYSCALL_FTRUNCATE, int, off_t);
DEFN_SYSCALL2(int, SysStat, SYSCALL_STAT, const char*, struct stat*);
DEFN_SYSCALL2(int, SysFStat, SYSCALL_FSTAT, int, struct stat*);
DEFN_SYSCALL3(int, SysFCntl, SYSCALL_FCNTL, int, int, unsigned long);
DEFN_SYSCALL2(int, SysAccess, SYSCALL_ACCESS, const char*, int);
size_t Print(const char* string)
{
size_t stringlen = String::Length(string);
return writeall(1, string, stringlen);
}
size_t PrintCallback(void* user, const char* string, size_t stringlen)
{
return writeall(1, string, stringlen);
}
size_t PrintF(const char* format, ...)
{
va_list list;
va_start(list, format);
size_t result = Maxsi::Format::Virtual(PrintCallback, NULL, format, list);
va_end(list);
return result;
}
#ifdef LIBMAXSI_LIBC
size_t FileWriteCallback(void* user, const char* string, size_t stringlen)
{
FILE* fp = (FILE*) user;
return fwrite(string, 1, stringlen, fp);
}
extern "C" int vfprintf(FILE* fp, const char* /*restrict*/ format, va_list list)
{
size_t result = Maxsi::Format::Virtual(FileWriteCallback, fp, format, list);
return (int) result;
}
extern "C" int fprintf(FILE* fp, const char* /*restrict*/ format, ...)
{
va_list list;
va_start(list, format);
size_t result = vfprintf(fp, format, list);
va_end(list);
return (int) result;
}
extern "C" int vprintf(const char* /*restrict*/ format, va_list list)
{
size_t result = vfprintf(stdout, format, list);
return (int) result;
}
extern "C" int printf(const char* /*restrict*/ format, ...)
{
va_list list;
va_start(list, format);
size_t result = vprintf(format, list);
va_end(list);
return (int) result;
}
// TODO: This is an ugly hack to help build binutils.
#warning Ugly sscanf hack to help build binutils
extern "C" int sscanf(const char* s, const char* format, ...)
{
if ( strcmp(format, "%x") != 0 )
{
fprintf(stderr, "sscanf hack doesn't implement: '%s'\n", format);
abort();
}
va_list list;
va_start(list, format);
unsigned* dec = va_arg(list, unsigned*);
*dec = strtol(s, NULL, 16);
return strlen(s);
}
typedef struct vsnprintf_struct
{
char* str;
size_t size;
size_t produced;
size_t written;
} vsnprintf_t;
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;
Memory::Copy(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;
Maxsi::Format::Virtual(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;
}
extern "C" void gnu_error(int status, int errnum, const char *format, ...)
{
fprintf(stderr, "%s: ", program_invocation_name);
va_list list;
va_start(list, format);
vfprintf(stderr, format, list);
va_end(list);
if ( errnum ) { fprintf(stderr, ": %s", strerror(errnum)); }
fprintf(stderr, "\n");
if ( status ) { exit(status); }
}
extern "C" void perror(const char* s)
{
error(0, errno, "%s", s);
}
extern "C" ssize_t read(int fd, void* buf, size_t count)
{
retry:
ssize_t result = SysRead(fd, buf, count);
if ( result < 0 && errno == EAGAIN ) { goto retry; }
return result;
}
extern "C" ssize_t write(int fd, const void* buf, size_t count)
{
retry:
ssize_t result = SysWrite(fd, buf, count);
if ( result < 0 && errno == EAGAIN ) { goto retry; }
return result;
}