Index: nkvd.c
==================================================================
--- nkvd.c
+++ nkvd.c
@@ -168,11 +168,12 @@
 static const char* redir_to;
 static size_t redir_len;
 static const char* hq;
 static size_t hq_len;
 
-void configdirs() {
+static void
+configdirs() {
 	const char* nkvd = getenv("nkvd_gulag");
 	if (nkvd != NULL) redir_to = nkvd, redir_len = strlen(nkvd);
 
 	const char* xdg = getenv("XDG_CONFIG_HOME");
 	if (xdg != NULL) redir_to = xdg, redir_len = strlen(xdg);
@@ -210,11 +211,12 @@
 #	undef CONFDIR
 
 	redir_to = buf;
 }
 
-bool checkpath(const char* path, size_t len, char* gulag) {
+static bool
+checkpath(const char* path, size_t len, char* gulag) {
 	char c[hq_len + len + 4];
 	strncpy(c, hq, hq_len);
 	c[hq_len] = '/';
 	c[hq_len+1] = '.';
 	c[hq_len+2] = 0;
@@ -241,11 +243,12 @@
 		/* no further questions, citizen */
 		return false;
 	}
 }
 
-bool interrogate(const char* path, size_t plen, char* gulag) {
+static bool
+interrogate(const char* path, size_t plen, char* gulag) {
 	/* papers, please */
 	if (path[0] != '/') for (size_t i = 64; i<PATH_MAX; i << 1) {
 		char cwd[i + plen + 1];
 		if (getcwd(cwd, i) == NULL) continue;
 		size_t cwdlen = strlen(cwd);
@@ -254,11 +257,12 @@
 		return checkpath(cwd,cwdlen + plen, gulag);
 	}
 	return checkpath(path, plen, gulag);
 }
 
-bool shitlist(const char* name) {
+static bool
+shitlist(const char* name) {
 #	ifdef _NO_GNU /* avoid POSIX weirdness */
 		{ char* name = strdup(name); /* yay shadowing! */
 #	endif
 
 	const char* base = basename(name);
@@ -304,12 +308,15 @@
 #define STAT_PARAMS  const char* volatile path, struct stat* volatile statbuf
 #define XSTAT_PARAMS int volatile ver, const char* volatile path, struct stat* volatile statbuf
 #define decl_stat_ptr(nm)  static int (*libc_##nm) (STAT_PARAMS)
 #define decl_xstat_ptr(nm) static int (*libc_##nm) (XSTAT_PARAMS)
 
-static int (*libc_open)  (const char*,int,...);
-static int (*libc_unlink)(const char*);
+static int (*libc_open)   (const char* volatile,int,...);
+static int (*libc_unlink) (const char* volatile);
+static int (*libc_access) (const char* volatile,int);
+static int (*libc_eaccess)(const char* volatile,int);
+static int (*libc_rename) (const char* volatile,const char* volatile);
 
 decl_stat_ptr(stat);
 decl_stat_ptr(stat64);
 decl_stat_ptr(lstat);
 decl_stat_ptr(lstat64);
@@ -319,11 +326,12 @@
 	decl_xstat_ptr(xstat64);
 	decl_xstat_ptr(lxstat);
 	decl_xstat_ptr(lxstat64);
 #endif
 
-int nkvd_stat(int (*volatile fn)(STAT_PARAMS), STAT_PARAMS) {
+static int
+nkvd_stat(int (*volatile fn)(STAT_PARAMS), STAT_PARAMS) {
 	if (intercept) {
 		size_t plen = strlen(path);
 		char gulag[redir_len + plen];
 		if (interrogate(path, plen, gulag)) {
 			return (*fn)(gulag,statbuf);
@@ -330,11 +338,12 @@
 		}
 	}
 	return (*fn)(path,statbuf);
 }
 
-int nkvd_xstat(int (*volatile fn)(XSTAT_PARAMS), XSTAT_PARAMS) {
+static int
+nkvd_xstat(int (*volatile fn)(XSTAT_PARAMS), XSTAT_PARAMS) {
 	if (intercept) {
 		size_t plen = strlen(path);
 		char gulag[redir_len + plen];
 		if (interrogate(path, plen, gulag)) {
 			return (*fn)(ver,gulag,statbuf);
@@ -368,10 +377,55 @@
 			return (*libc_unlink)(gulag);
 		}
 	}
 	return (*libc_unlink)(path);
 };
+
+typedef int(*intfn)(const char*,int);
+static int
+nkvd_intcall(intfn fn, const char* volatile path, int mode) {
+	if (intercept) {
+		size_t plen = strlen(path);
+		char gulag[redir_len + plen];
+		if (interrogate(path, plen, gulag)) {
+			return (*fn)(gulag,mode);
+		}
+	}
+	return (*fn)(path,mode);
+};
+
+int access (const char* volatile path, int mode)
+	{ nkvd_intcall(libc_access,path,mode); }
+
+int eaccess (const char* volatile path, int mode)
+	{ nkvd_intcall(libc_eaccess,path,mode); }
+
+#define max(a,b) ((a) > (b) ? (a) : (b))
+int rename(const char* volatile from,
+           const char* volatile to) {
+	if (intercept) {
+		const size_t fromlen = strlen(from),
+		               tolen = strlen(from);
+		char fromgulag[redir_len + tolen  ],
+		       togulag[redir_len + fromlen];
+
+		const char* fromfinal,
+		          * tofinal;
+
+		if (interrogate(from, fromlen, fromgulag))
+			fromfinal = fromgulag;
+		else fromfinal = from;
+
+		if (interrogate(to, tolen, togulag))
+			tofinal = togulag;
+		else tofinal = to;
+
+		return (*libc_rename)(fromfinal,tofinal);
+	}
+
+	return (*libc_rename)(from,to);
+};
 
 int open(const char* volatile path, int flags, ...) {
 	/* fuck you for using varargs, asshole */
 	va_list v; va_start(v,flags);
 	mode_t m;
@@ -386,10 +440,11 @@
 		}
 	}
 	return (*libc_open)(path, flags, m);
 }
 
+#include <stdio.h>
 int nkvd_init(int argc, const char** argv) {
 	wiretap_argc = argc;
 	wiretap_argv = argv;
 
 #	ifndef _USE_RTLD_NEXT
@@ -402,18 +457,25 @@
 				"compile command line.");
 #	endif
 
 #	define load_fn(fn,pfx) libc_##fn = dlsym(SYMSRC, #pfx #fn)
 		load_fn(open,);      load_fn(unlink,);
+		load_fn(access,);    load_fn(eaccess,);
+		load_fn(rename,);
 		load_fn(stat,);      load_fn(lstat,);
 		load_fn(stat64,);    load_fn(lstat64,);
 		
 #		ifndef _NO_GNU
 			load_fn(xstat,__);   load_fn(lxstat,__);
 			load_fn(xstat64,__); load_fn(lxstat64,__);
 #		endif
 #	undef load_fn
+#	define dump(v) printf("-- " #v ": %p", libc_##v)
+	dump(lstat);
+	dump(lstat64);
+	dump(lxstat);
+	dump(lxstat64);
 	
 	/* have enough stat fns been found for us to proceed? */
 	bool statfns = (  (libc_stat    && libc_lstat)
 	               || (libc_stat64  && libc_lstat64)
 #ifndef _NO_GNU
@@ -420,11 +482,12 @@
 	               || (libc_xstat   && libc_lxstat)
 	               || (libc_xstat64 && libc_lxstat64)
 #endif
 	               );
 
-	if (! (libc_open && statfns && libc_unlink))
+	if (! (libc_open && statfns && libc_unlink &&
+	       libc_access && libc_eaccess && libc_rename))
 		fail(-3, "your libc is defective. bailing.");
 
 	intercept = shitlist(argv[0]);
 	if (intercept) {
 		configdirs();