git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usermode/libposix - Hacking up some functions to compile dropbear
[tpg/acess2.git]
/
Usermode
/
Libraries
/
libposix.so_src
/
unistd.c
diff --git
a/Usermode/Libraries/libposix.so_src/unistd.c
b/Usermode/Libraries/libposix.so_src/unistd.c
index
5f97440
..
545ef16
100644
(file)
--- a/
Usermode/Libraries/libposix.so_src/unistd.c
+++ b/
Usermode/Libraries/libposix.so_src/unistd.c
@@
-10,6
+10,9
@@
#include <stdarg.h>
#include <sys/select.h>
#include <stdio.h>
#include <stdarg.h>
#include <sys/select.h>
#include <stdio.h>
+#include <string.h>
+#include <acess/devices/pty.h>
+#include <errno.h>
// === CODE ===
int unlink(const char *pathname)
// === CODE ===
int unlink(const char *pathname)
@@
-39,7
+42,12
@@
int open(const char *path, int openmode, ...)
va_end(args);
}
va_end(args);
}
- return _SysOpen(path, openflags, create_mode);
+ if( openmode & O_NONBLOCK )
+ openflags |= OPENFLAG_NONBLOCK;
+
+ int ret = _SysOpen(path, openflags, create_mode);
+ _SysDebug("open('%s', 0%o, 0%o) = %i", path, openmode, create_mode, ret);
+ return ret;
}
int creat(const char *path, mode_t mode)
}
int creat(const char *path, mode_t mode)
@@
-72,6
+80,11
@@
int seek(int fd, int whence, off_t dest)
return _SysSeek(fd, whence, dest);
}
return _SysSeek(fd, whence, dest);
}
+off_t lseek(int fd, off_t offset, int whence)
+{
+ return _SysSeek(fd, whence, offset);
+}
+
off_t tell(int fd)
{
return _SysTell(fd);
off_t tell(int fd)
{
return _SysTell(fd);
@@
-91,17
+104,31
@@
int dup(int oldfd)
{
_SysDebug("libposix: dup() does not share offsets/flags");
// NOTE: Acess's CopyFD doesn't cause offset sharing
{
_SysDebug("libposix: dup() does not share offsets/flags");
// NOTE: Acess's CopyFD doesn't cause offset sharing
- // TODO: Check that -1 does cause a new allocation
- return _SysCopyFD(oldfd, -1);
+ int ret = _SysCopyFD(oldfd, -1);
+ _SysDebug("dup(%i) = %i", oldfd, ret);
+ return ret;
}
int dup2(int oldfd, int newfd)
{
_SysDebug("libposix: dup2() does not share offsets/flags");
// NOTE: Acess's CopyFD doesn't cause offset sharing
}
int dup2(int oldfd, int newfd)
{
_SysDebug("libposix: dup2() does not share offsets/flags");
// NOTE: Acess's CopyFD doesn't cause offset sharing
+ _SysDebug("dup2(%i,%i)", oldfd, newfd);
return _SysCopyFD(oldfd, newfd);
}
return _SysCopyFD(oldfd, newfd);
}
+int chown(const char *path, uid_t owner, gid_t group)
+{
+ _SysDebug("TODO: chown(%s, %i, %i)", path, owner, group);
+ errno = ENOTIMPL;
+ return -1;
+}
+int chmod(const char *path, mode_t mode)
+{
+ _SysDebug("TODO: chmod(%s, 0%o)", path, mode);
+ errno = ENOTIMPL;
+ return -1;
+}
/*
* Set session ID to PID
/*
* Set session ID to PID
@@
-121,6
+148,10
@@
uid_t getuid(void)
{
return _SysGetUID();
}
{
return _SysGetUID();
}
+gid_t getgid(void)
+{
+ return _SysGetGID();
+}
uid_t geteuid(void)
{
uid_t geteuid(void)
{
@@
-128,6
+159,30
@@
uid_t geteuid(void)
return _SysGetUID();
}
return _SysGetUID();
}
+int seteuid(uid_t euid)
+{
+ _SysDebug("TODO: %s", __func__);
+ return 0;
+}
+int setegid(gid_t egid)
+{
+ _SysDebug("TODO: %s", __func__);
+ return 0;
+}
+
+unsigned int sleep(unsigned int seconds)
+{
+ int64_t start = _SysTimestamp();
+ _SysTimedSleep( seconds*1000 );
+ return (_SysTimestamp() - start) / 1000;
+}
+
+int usleep(useconds_t usec)
+{
+ _SysTimedSleep( (usec+999)/1000 );
+ return 0;
+}
+
int kill(pid_t pid, int signal)
{
// TODO: Need special handling?
int kill(pid_t pid, int signal)
{
// TODO: Need special handling?
@@
-136,18
+191,17
@@
int kill(pid_t pid, int signal)
int select(int nfd, fd_set *rfd, fd_set *wfd, fd_set *efd, struct timeval *timeout)
{
int select(int nfd, fd_set *rfd, fd_set *wfd, fd_set *efd, struct timeval *timeout)
{
-
+ long long int ltimeout = 0, *ltimeoutp = NULL;
if( timeout )
{
if( timeout )
{
- long long int ltimeout = 0;
ltimeout = timeout->tv_sec*1000 + timeout->tv_usec / 1000;
ltimeout = timeout->tv_sec*1000 + timeout->tv_usec / 1000;
- int ret = _SysSelect(nfd, rfd, wfd, efd, <imeout, 0);
- return ret;
- }
- else
- {
- return _SysSelect(nfd, rfd, wfd, efd, NULL, 0);
+ ltimeoutp = <imeout;
}
}
+ _SysDebug("select(%i,{0x%x},{0x%x},{0x%x},%lli)",
+ nfd, (rfd?rfd->flags[0]:0), (wfd?wfd->flags[0]:0), (efd?efd->flags[0]:0),
+ (ltimeoutp ? *ltimeoutp : -1)
+ );
+ return _SysSelect(nfd, rfd, wfd, efd, ltimeoutp, 0);
}
int pipe(int pipefd[2])
}
int pipe(int pipefd[2])
@@
-155,6
+209,7
@@
int pipe(int pipefd[2])
pipefd[0] = _SysOpen("/Devices/fifo/anon", OPENFLAG_READ|OPENFLAG_WRITE);
pipefd[1] = _SysCopyFD(pipefd[0], -1);
_SysFDFlags(pipefd[1], OPENFLAG_READ|OPENFLAG_WRITE, OPENFLAG_WRITE);
pipefd[0] = _SysOpen("/Devices/fifo/anon", OPENFLAG_READ|OPENFLAG_WRITE);
pipefd[1] = _SysCopyFD(pipefd[0], -1);
_SysFDFlags(pipefd[1], OPENFLAG_READ|OPENFLAG_WRITE, OPENFLAG_WRITE);
+ _SysDebug("pipe({%i,%i})", pipefd[0], pipefd[1]);
return 0;
}
return 0;
}
@@
-163,18
+218,37
@@
int chdir(const char *dir)
return _SysChdir(dir);
}
return _SysChdir(dir);
}
-int
mkdir(const char *pathname, mode_t mod
e)
+int
rmdir(const char *pathnam
e)
{
{
- _SysDebug("TODO: POSIX mkdir(%i, 0%o)", pathname, mode);
+// return _SysUnlink(pathname);
+ _SysDebug("TODO: POSIX rmdir('%s')", pathname);
+ errno = ENOTIMPL;
return -1;
}
return -1;
}
+int mkdir(const char *pathname, mode_t mode)
+{
+ _SysDebug("TODO: POSIX mkdir('%s', 0%o)", pathname, mode);
+ _SysMkDir(pathname);
+ return 0;
+}
+
char *getpass(const char *prompt)
{
static char passbuf[PASS_MAX+1];
char *getpass(const char *prompt)
{
static char passbuf[PASS_MAX+1];
+ struct ptymode oldmode, mode;
+ _SysIOCtl(STDIN_FILENO, PTY_IOCTL_GETMODE, &oldmode);
+ mode.InputMode = PTYIMODE_CANON;
+ mode.OutputMode = 0;
+ _SysIOCtl(STDIN_FILENO, PTY_IOCTL_SETMODE, &mode);
fprintf(stderr, "%s", prompt);
fgets(passbuf, PASS_MAX+1, stdin);
fprintf(stderr, "\n");
fprintf(stderr, "%s", prompt);
fgets(passbuf, PASS_MAX+1, stdin);
fprintf(stderr, "\n");
+ for( int i = strlen(passbuf); i > 0 && (passbuf[i-1] == '\r' || passbuf[i-1] == '\n'); i -- )
+ passbuf[i-1] = 0;
+
+ _SysIOCtl(STDIN_FILENO, PTY_IOCTL_SETMODE, &oldmode);
+
return passbuf;
}
return passbuf;
}
UCC
git Repository :: git.ucc.asn.au