X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibposix.so_src%2Funistd.c;h=dca29630e7e2f5b5e7a60175e681cd77df76e6df;hb=23511012ba2a6063770da17c6564839860b9ed64;hp=7cfb71abd00f8d4091b14864ce24e2e3514b672a;hpb=4d184c30a3385600c0d87a2f93b4259c8c973e73;p=tpg%2Facess2.git diff --git a/Usermode/Libraries/libposix.so_src/unistd.c b/Usermode/Libraries/libposix.so_src/unistd.c index 7cfb71ab..dca29630 100644 --- a/Usermode/Libraries/libposix.so_src/unistd.c +++ b/Usermode/Libraries/libposix.so_src/unistd.c @@ -10,6 +10,9 @@ #include #include #include +#include +#include +#include // === CODE === int unlink(const char *pathname) @@ -42,7 +45,15 @@ int open(const char *path, int openmode, ...) if( openmode & O_NONBLOCK ) openflags |= OPENFLAG_NONBLOCK; - return _SysOpen(path, openflags, create_mode); + int ret = _SysOpen(path, openflags, create_mode); + _SysDebug("open('%s', 0%o, 0%o) = %i", path, openmode, create_mode, ret); + return ret; +} + +int access(const char *path, int openmode) +{ + errno = EINVAL; + return -1; } int creat(const char *path, mode_t mode) @@ -75,6 +86,11 @@ int seek(int fd, int whence, off_t 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); @@ -94,17 +110,31 @@ int dup(int oldfd) { _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 + _SysDebug("dup2(%i,%i)", 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 @@ -124,6 +154,10 @@ uid_t getuid(void) { return _SysGetUID(); } +gid_t getgid(void) +{ + return _SysGetGID(); +} uid_t geteuid(void) { @@ -131,6 +165,41 @@ uid_t geteuid(void) 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; +} + +unsigned int alarm(unsigned int seconds) +{ + static int64_t alarm_time; + if( seconds > 0 ) + { + alarm_time = _SysTimestamp() + seconds * 1000; + // TODO: Schedule SIGALRM + } + return (alarm_time - _SysTimestamp()) / 1000; +} + int kill(pid_t pid, int signal) { // TODO: Need special handling? @@ -139,18 +208,17 @@ int kill(pid_t pid, int signal) int select(int nfd, fd_set *rfd, fd_set *wfd, fd_set *efd, struct timeval *timeout) { - + int64_t ltimeout = 0, *ltimeoutp = NULL; if( timeout ) { - long long int ltimeout = 0; 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]) @@ -158,6 +226,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); + _SysDebug("pipe({%i,%i})", pipefd[0], pipefd[1]); return 0; } @@ -166,18 +235,78 @@ int chdir(const char *dir) return _SysChdir(dir); } -int mkdir(const char *pathname, mode_t mode) +int rmdir(const char *pathname) { - _SysDebug("TODO: POSIX mkdir(%i, 0%o)", pathname, mode); +// return _SysUnlink(pathname); + _SysDebug("TODO: POSIX rmdir('%s')", pathname); + errno = ENOTIMPL; 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]; + 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); + fflush(stdin); // clear stdin buffer 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; } +char *ttyname(int fd) +{ + static char ttyname_buf[32]; + errno = ttyname_r(fd, ttyname_buf, sizeof(ttyname_buf)); + if(errno) return NULL; + + return ttyname_buf; +} +int ttyname_r(int fd, char *buf, size_t buflen) +{ + int type = _SysIOCtl(fd, DRV_IOCTL_TYPE, NULL); + if( type == -1 ) + return errno; + if( type != DRV_TYPE_TERMINAL ) + return ENOTTY; + + _SysIOCtl(fd, PTY_IOCTL_GETID, NULL); + + _SysDebug("TODO: ttyname_r"); + + return ENOTIMPL; +} + +int isatty(int fd) +{ + if( fd < 0 ) { + errno = EBADF; + return 0; + } + + int type = _SysIOCtl(fd, DRV_IOCTL_TYPE, NULL); + if( type == -1 ) + return 0; + if( type != DRV_TYPE_TERMINAL ) { + errno = ENOTTY; + // NOTE: Pre POSIX 2001, EINVAL was returned + return 0; + } + return 1; +}