X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2Fsupport_aux.c;h=59164cba59b55d6b3e59cab345e6d2727374ba2d;hp=9800e4a3ad37182612afd8b7da3b73b298ffdae0;hb=c59b7cfc7a6b67574d38c5c8eb7732bad37236b0;hpb=ef1c27c7eff6c432f3ad7a21671947b87539acb2

diff --git a/src/org/ibex/nestedvm/support_aux.c b/src/org/ibex/nestedvm/support_aux.c
index 9800e4a..59164cb 100644
--- a/src/org/ibex/nestedvm/support_aux.c
+++ b/src/org/ibex/nestedvm/support_aux.c
@@ -13,11 +13,14 @@ int _syscall_set_errno(struct _reent *ptr, int err) {
     return -1;
 }
 
-extern int _stat_r(struct _reent *ptr, const char *path, struct stat *sb);
-int _lstat_r(struct _reent *ptr, const char *path, struct stat *sb) {
-    return _stat_r(ptr,path,sb);
+extern int _stat_r(struct _reent *, const char *, struct stat *);
+int _access_r(struct _reent *ptr, const char *pathname, int mode) {
+    struct stat statbuf;
+    if(_stat_r(ptr,pathname,&statbuf) < 0) return -1;
+    return 0;
 }
 
+/* NestedVM doesn't, and probably never will, support this security related stuff */
 uid_t getuid() { return 0; }
 gid_t getgid() { return 0; }
 uid_t geteuid() { return 0; }
@@ -27,34 +30,48 @@ int getgroups(int gidsetlen, gid_t *gidset) {
     return 1;
 }
 mode_t umask(mode_t new) { return 0022; }
+int _chmod_r(struct _reent *ptr, const char *f, mode_t mode) { return 0; }
+int _fchmod_r(struct _reent *ptr, int fd, mode_t mode) { return 0; }
+int _chown_r(struct _reent *ptr, const char *f, uid_t uid, gid_t gid) { return 0; }
+int _fchown_r(struct _reent *ptr, int fd, uid_t uid, gid_t gid) { return 0; }
 
-static int syscall_nosys(struct _reent *ptr) {
-    ptr->_errno = ENOSYS;
-    return -1;
-}
+#define REENT_WRAPPER1R(f,rt,t1) \
+    extern rt _##f##_r(struct _reent *ptr, t1 a); \
+    rt f(t1 a) { return _##f##_r(_REENT,a); }
+#define REENT_WRAPPER1(f,t1) REENT_WRAPPER1R(f,int,t1)
 
-int _access_r(struct _reent *ptr, const char *pathname, int mode) {
-    struct stat statbuf;
-    if(_stat_r(ptr,pathname,&statbuf) < 0) return -1;
-    return 0;
-}
+#define REENT_WRAPPER2R(f,rt,t1,t2) \
+    extern rt _##f##_r(struct _reent *ptr, t1 a, t2 b); \
+    rt f(t1 a, t2 b) { return _##f##_r(_REENT,a,b); }
+#define REENT_WRAPPER2(f,t1,t2) REENT_WRAPPER2R(f,int,t1,t2)
 
-/* FIXME: These should be in newlib */
-int access(const char *pathname, int mode) { return _access_r(_REENT,pathname,mode); }
-extern int _rmdir_r(struct _reent *ptr, const char *pathname);
-int rmdir(const char *pathname) { return _rmdir_r(_REENT,pathname); }
-extern long _sysconf_r(struct _reent *ptr, int n);
-long sysconf(int n) { return _sysconf_r(_REENT,n); }
+#define REENT_WRAPPER3R(f,rt,t1,t2,t3) \
+    extern rt _##f##_r(struct _reent *ptr, t1 a, t2 b, t3 c); \
+    rt f(t1 a, t2 b, t3 c) { return _##f##_r(_REENT,a,b,c); }
+#define REENT_WRAPPER3(f,t1,t2,t3) REENT_WRAPPER3R(f,int,t1,t2,t3)
 
-#define SYSCALL_NOSYS_R(name) int _##name##_r(struct _reent *ptr) { return syscall_nosys(ptr); }
+REENT_WRAPPER2(mkdir,const char *,mode_t)
+REENT_WRAPPER2(access,const char *,int)
+REENT_WRAPPER1(rmdir,const char *)
+REENT_WRAPPER1R(sysconf,long,int)
+REENT_WRAPPER1(chdir,const char*)
+REENT_WRAPPER2(utime,const char *,const struct utimbuf *)
+REENT_WRAPPER1(pipe,int *)
+REENT_WRAPPER2(dup2,int,int)
+REENT_WRAPPER3(waitpid,pid_t,int *,int)
+REENT_WRAPPER2R(getcwd,char *,char *,size_t)
+REENT_WRAPPER2(symlink,const char *,const char *)
+REENT_WRAPPER3(readlink,const char *, char *,int)
+REENT_WRAPPER3(chown,const char *,uid_t,gid_t)
+REENT_WRAPPER3(fchown,int,uid_t,gid_t)
+REENT_WRAPPER2(chmod,const char *,mode_t)
+REENT_WRAPPER2(fchmod,int,mode_t)
+REENT_WRAPPER2(lstat,const char *,struct stat *)
 
-SYSCALL_NOSYS_R(link)
-SYSCALL_NOSYS_R(symlink)
-SYSCALL_NOSYS_R(readlink)
-SYSCALL_NOSYS_R(chown)
-SYSCALL_NOSYS_R(fchown)
-SYSCALL_NOSYS_R(chmod)
-SYSCALL_NOSYS_R(fchmod)
+extern int __execve_r(struct _reent *ptr, const char *path, char *const argv[], char *const envp[]);
+int _execve(const char *path, char *const argv[], char *const envp[]) {
+    return __execve_r(_REENT,path,argv,envp);
+}
 
 static int read_fully(int fd, void *buf, size_t size) {
     int n;
@@ -88,11 +105,11 @@ DIR *opendir(const char *path) {
         return NULL;
     }
     dir->dd_fd = fd;
-    dir->dd_pos = 0;
+    //dir->dd_pos = 0;
     return dir;
 }
 
-static int readdir_r(DIR *dir,struct dirent *entry, struct dirent **result) {
+int readdir_r(DIR *dir,struct dirent *entry, struct dirent **result) {
     struct {
         int inode;
         int name_len;
@@ -106,7 +123,7 @@ again:
     if(read_fully(dir->dd_fd,entry->d_name,h.name_len) < 0) goto fail;
     
     entry->d_name[h.name_len] = '\0';
-    dir->dd_pos += h.name_len + 8;
+    //dir->dd_pos += h.name_len + 8;
     
     if(result) *result = entry;
     return 0;
@@ -115,7 +132,10 @@ fail:
     return -1;    
 }
 
-struct dirent *readdir(DIR *dir) { return readdir_r(dir,&dir->ent,NULL) == 0 ? &dir->ent : NULL; }
+// FIXME: Rewrite all this dirent stuff in terms of a getdirentries syscall
+static struct dirent static_dir_ent;
+
+struct dirent *readdir(DIR *dir) { return readdir_r(dir,&static_dir_ent,NULL) == 0 ? &static_dir_ent : NULL; }
 
 int closedir(DIR *dir) {
     close(dir->dd_fd);