X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2Fsupport_aux.c;h=05c83e0b64ca24da7793b22a9b78e63a323f9852;hb=c05ff743b8c3d0b1d9db59ac08aa5845d7107bac;hp=c3098993a3e54dd8959baf5ee771e063ffe65c72;hpb=896193619af1e0534356ac622494ae77c7e42594;p=nestedvm.git

diff --git a/src/org/ibex/nestedvm/support_aux.c b/src/org/ibex/nestedvm/support_aux.c
index c309899..05c83e0 100644
--- a/src/org/ibex/nestedvm/support_aux.c
+++ b/src/org/ibex/nestedvm/support_aux.c
@@ -11,9 +11,10 @@
 #include <signal.h>
 #include <sys/sysctl.h>
 #include <sys/utsname.h>
-#include <nestedvm/sockets.h>
 #include <paths.h>
 
+#include <nestedvm/socket.h>
+
 int _syscall_set_errno(struct _reent *ptr, int err) {
     ptr->_errno = -err;
     return -1;
@@ -155,6 +156,19 @@ long _pathconf_r(struct _reent *ptr,const char *path, int name) {
     }
 }
 
+int _sysctl_r(struct _reent *ptr, int *name, int namelen, void *oldp, size_t *oldlen, void *newp, size_t newlen) {
+    if(name[0] != CTL_USER) return _sysctl(name,namelen,oldp,oldlen,newp,newlen);
+    if(newp != NULL) { ptr->_errno = EPERM; return -1; }
+    if(namelen != 2) { ptr->_errno = EINVAL; return -1; }
+    
+    switch(name[1]) {
+        default:
+            fprintf(stderr,"WARNING: sysctl: Unknown name: %d\n",name[1]);
+            ptr->_errno = EINVAL;
+            return -1;
+    }
+}
+
 void sync() {
     /* do nothing*/
 }
@@ -425,6 +439,88 @@ const char *path;
     return(bname);
 }
 
+/* FreeBSD's uname */
+int
+uname(name)
+struct utsname *name;
+{
+	int mib[2], rval;
+	size_t len;
+	char *p;
+	int oerrno;
+    
+	rval = 0;
+    
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_OSTYPE;
+	len = sizeof(name->sysname);
+	oerrno = errno;
+	if (sysctl(mib, 2, &name->sysname, &len, NULL, 0) == -1) {
+		if(errno == ENOMEM)
+			errno = oerrno;
+		else
+			rval = -1;
+	}
+	name->sysname[sizeof(name->sysname) - 1] = '\0';
+    
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_HOSTNAME;
+	len = sizeof(name->nodename);
+	oerrno = errno;
+	if (sysctl(mib, 2, &name->nodename, &len, NULL, 0) == -1) {
+		if(errno == ENOMEM)
+			errno = oerrno;
+		else
+			rval = -1;
+	}
+	name->nodename[sizeof(name->nodename) - 1] = '\0';
+    
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_OSRELEASE;
+	len = sizeof(name->release);
+	oerrno = errno;
+	if (sysctl(mib, 2, &name->release, &len, NULL, 0) == -1) {
+		if(errno == ENOMEM)
+			errno = oerrno;
+		else
+			rval = -1;
+	}
+	name->release[sizeof(name->release) - 1] = '\0';
+    
+	/* The version may have newlines in it, turn them into spaces. */
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_VERSION;
+	len = sizeof(name->version);
+	oerrno = errno;
+	if (sysctl(mib, 2, &name->version, &len, NULL, 0) == -1) {
+		if (errno == ENOMEM)
+			errno = oerrno;
+		else
+			rval = -1;
+	}
+	name->version[sizeof(name->version) - 1] = '\0';
+	for (p = name->version; len--; ++p) {
+		if (*p == '\n' || *p == '\t') {
+			if (len > 1)
+				*p = ' ';
+			else
+				*p = '\0';
+		}
+	}
+    
+	mib[0] = CTL_HW;
+	mib[1] = HW_MACHINE;
+	len = sizeof(name->machine);
+	oerrno = errno;
+	if (sysctl(mib, 2, &name->machine, &len, NULL, 0) == -1) {
+		if (errno == ENOMEM)
+			errno = oerrno;
+		else
+			rval = -1;
+	}
+	name->machine[sizeof(name->machine) - 1] = '\0';
+	return (rval);
+}
 
 /* FreeBSD's daemon() - modified for nestedvm */
 int