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

diff --git a/src/org/ibex/nestedvm/support_aux.c b/src/org/ibex/nestedvm/support_aux.c
index 9800e4a..bc32e8e 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,44 +30,86 @@ 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)
+
+#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)
 
-/* 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_WRAPPER4R(f,rt,t1,t2,t3,t4) \
+extern rt _##f##_r(struct _reent *ptr, t1 a, t2 b, t3 c, t4 d); \
+rt f(t1 a, t2 b, t3 c, t4 d) { return _##f##_r(_REENT,a,b,c,d); }
+#define REENT_WRAPPER4(f,t1,t2,t3,t4) REENT_WRAPPER4R(f,int,t1,t2,t3,t4)
 
-#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_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 *)
+REENT_WRAPPER4(getdents,int, char *, size_t,long *)
+REENT_WRAPPER1(dup,int)
+REENT_WRAPPER2R(pathconf,long,const char *,int)
 
-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;
-    while(size) {
-        n = read(fd,buf,size);
-        if(n <= 0) return -1;
-        size -= n;
-        buf += n;
+char *_getcwd_r(struct _reent *ptr, char *buf, size_t size) {
+    if(buf != NULL) {
+        buf = __getcwd_r(ptr,buf,size);
+        return (long)buf == -1 ? NULL : buf;
+    }
+    
+    size = 256;
+    for(;;) {
+        buf = malloc(size);
+        char *ret = __getcwd_r(ptr,buf,size);
+        if((long)ret != -1) return ret;
+        free(buf);
+        size *= 2;
+        if(ptr->_errno != ERANGE) return NULL;
+    }
+}
+
+pid_t _wait_r(struct _reent *ptr, int *status) {
+    return _waitpid_r(ptr,-1,status,0);
+}
+
+long _pathconf_r(struct _reent *ptr,const char *path, int name) {
+    switch(name) {
+        default:
+            fprintf(stderr,"WARNING: pathconf: Unknown \"name\": %d\n",name);
+            ptr->_errno = EINVAL;
+            return -1;
     }
-    return 0;
 }
 
 DIR *opendir(const char *path) {
@@ -88,37 +133,35 @@ DIR *opendir(const char *path) {
         return NULL;
     }
     dir->dd_fd = fd;
-    dir->dd_pos = 0;
+    dir->dd_buf = malloc(sizeof(struct dirent));
+    dir->dd_size = sizeof(struct dirent);
+    if(dir->dd_buf == NULL) {
+        close(fd);
+        free(dir);
+        return NULL;
+    }
+    dir->dd_loc = 0;
+    dir->dd_len = 0;
     return dir;
 }
 
-static int readdir_r(DIR *dir,struct dirent *entry, struct dirent **result) {
-    struct {
-        int inode;
-        int name_len;
-    } h;
-    if(dir->dd_fd < 0) return -1;
-again:
-    if(read_fully(dir->dd_fd,&h,sizeof(h)) < 0) goto fail;
-    if(h.name_len < 0 || h.name_len >= sizeof(entry->d_name)-1) goto fail;
-    
-    entry->d_ino = h.inode;
-    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;
-    
-    if(result) *result = entry;
-    return 0;
-fail:
-    if(result) *result = NULL; 
-    return -1;    
+struct dirent *readdir(DIR *dir) {
+    struct dirent *dp;
+    errno = 0;
+    if(dir->dd_loc == 0 || dir->dd_loc == dir->dd_len) {
+        dir->dd_len = getdents(dir->dd_fd,dir->dd_buf,dir->dd_size,NULL);
+        dir->dd_loc = 0;
+        if(dir->dd_len <= 0) { dir->dd_len = 0; return NULL; }
+    }
+    dp = (struct dirent*) (dir->dd_buf + dir->dd_loc);
+    if(dp->d_reclen == 0 || dp->d_reclen > dir->dd_len - dir->dd_loc) return NULL;
+    dir->dd_loc += dp->d_reclen;
+    return dp;
 }
 
-struct dirent *readdir(DIR *dir) { return readdir_r(dir,&dir->ent,NULL) == 0 ? &dir->ent : NULL; }
-
 int closedir(DIR *dir) {
-    close(dir->dd_fd);
+    int fd = dir->dd_fd;
+    free(dir->dd_buf);
     free(dir);
-    return 0;
+    return close(fd);
 }