rough work in progress; may not build

[tripe-android] / jni.c

diff --git a/jni.c b/jni.c
index 934be91..f65e464 100644 (file)
--- a/jni.c
+++ b/jni.c
@@ -319,17 +319,17 @@ static const struct errtab { const char *tag; int err; } errtab[] = {
                     ECANCELED ENOKEY EKEYEXPIRED EKEYREVOKED EKEYREJECTED
                     EOWNERDEAD ENOTRECOVERABLE ERFKILL EHWPOISON)))
        (save-excursion
-         (goto-char (point-min))
-         (search-forward (concat "***" "BEGIN errtab" "***"))
-         (beginning-of-line 2)
-         (delete-region (point)
-                        (progn
-                          (search-forward "***END***")
-                          (beginning-of-line)
-                          (point)))
-         (dolist (err errors)
-           (insert (format "#ifdef %s\n  { \"%s\", %s },\n#endif\n"
-                           err err err)))))
+        (goto-char (point-min))
+        (search-forward (concat "***" "BEGIN errtab" "***"))
+        (beginning-of-line 2)
+        (delete-region (point)
+                       (progn
+                         (search-forward "***END***")
+                         (beginning-of-line)
+                         (point)))
+        (dolist (err errors)
+          (insert (format "#ifdef %s\n  { \"%s\", %s },\n#endif\n"
+                          err err err)))))
   */
   /***BEGIN errtab***/
 #ifdef EPERM
@@ -762,6 +762,48 @@ JNIEXPORT jobject JNIFUNC(errtab)(JNIEnv *jni, jobject cls)
 JNIEXPORT jobject JNIFUNC(strerror)(JNIEnv *jni, jobject cls, jint err)
   { return (wrap_cstring(jni, strerror(err))); }
 
+/*----- Messing with file descriptors -------------------------------------*/
+
+static void fdguts(JNIEnv *jni, jclass *cls, jfieldID *fid)
+{
+  *cls = (*jni)->FindClass(jni, "java/io/FileDescriptor"); assert(cls);
+  *fid = (*jni)->GetFieldID(jni, *cls, "fd", "I"); // OpenJDK
+  if (!*fid) *fid = (*jni)->GetFieldID(jni, *cls, "descriptor", "I"); // Android
+  assert(*fid);
+}
+
+static int fdint(JNIEnv *jni, jobject jfd)
+{
+  jclass cls;
+  jfieldID fid;
+
+  fdguts(jni, &cls, &fid);
+  return ((*jni)->GetIntField(jni, jfd, fid));
+}
+
+static jobject newfd(JNIEnv *jni, int fd)
+{
+  jobject jfd;
+  jclass cls;
+  jmethodID init;
+  jfieldID fid;
+
+  fdguts(jni, &cls, &fid);
+  init = (*jni)->GetMethodID(jni, cls, "<init>", "()V"); assert(init);
+  jfd = (*jni)->NewObject(jni, cls, init);
+  (*jni)->SetIntField(jni, jfd, fid, fd);
+  return (jfd);
+}
+
+JNIEXPORT jint JNIFUNC(fdint)(JNIEnv *jni, jobject cls, jobject jfd)
+  { return (fdint(jni, jfd)); }
+
+JNIEXPORT jobject JNIFUNC(newfd)(JNIEnv *jni, jobject cls, jint fd)
+  { return (newfd(jni, fd)); }
+
+JNIEXPORT jboolean JNIFUNC(isatty)(JNIEnv *jni, jobject cls, jobject jfd)
+  { return (isatty(fdint(jni, jfd))); }
+
 /*----- Low-level file operations -----------------------------------------*/
 
 /* Java has these already, as methods on `java.io.File' objects.  Alas, these
@@ -853,8 +895,8 @@ end:
   put_cstring(jni, to, tostr);
 }
 
-#define LKF_EXCL 1u
-#define LKF_WAIT 2u
+#define LKF_EXCL 0x1000u
+#define LKF_WAIT 0x2000u
 struct lockf {
   struct native_base _base;
   int fd;
@@ -875,7 +917,7 @@ JNIEXPORT wrapper JNIFUNC(lock)(JNIEnv *jni, jobject cls,
   pathstr = get_cstring(jni, path); if (!pathstr) goto end;
 
 again:
-  fd = open(pathstr, O_RDWR | O_CREAT); if (fd < 0) goto err;
+  fd = open(pathstr, O_RDWR | O_CREAT, flags&07777); if (fd < 0) goto err;
   if (fstat(fd, &st0)) goto err;
   f = fcntl(fd, F_GETFD); if (f < 0) goto err;
   if (fcntl(fd, F_SETFD, f | FD_CLOEXEC)) goto err;
@@ -927,7 +969,7 @@ static jobject xltstat(JNIEnv *jni, const struct stat *st)
   jclass cls;
   jmethodID init;
   jint modehack;
- 
+
   modehack = st->st_mode&07777;
   if (S_ISFIFO(st->st_mode)) modehack |= 0010000;
   else if (S_ISCHR(st->st_mode)) modehack |= 0020000;