Update Android port

* exec/trace.c (handle_readlinkat): Adjust commentary to match
behavior.
* src/android.c (android_get_keysym_name): NULL terminate
*name_return.

diff --git a/exec/trace.c b/exec/trace.c
index 23db8ebcbc7ec8d079e2242b037091c91c0a419d..3b384792d0a4efdfda8cbd5a3c3497f89011cf6b 100644 (file)
--- a/exec/trace.c
+++ b/exec/trace.c
@@ -899,10 +899,10 @@ handle_exec (struct exec_tracee *tracee, USER_REGS_STRUCT *regs)
    CALLNO is the system call number, and REGS are the current user
    registers of the TRACEE.
 
-   If the first argument of a `readlinkat' system call is AT_FDCWD,
-   and the file name specified in either a `readlink' or `readlinkat'
+   If the file name specified in either a `readlink' or `readlinkat'
    system call is `/proc/self/exe', write the name of the executable
-   being run into the buffer specified in the system call.
+   being run into the buffer specified in the system call.  Do not
+   handle relative file names at the moment.
 
    Return the number of bytes written to the tracee's buffer in
    *RESULT.

diff --git a/src/android.c b/src/android.c
index 1662160bdd9b040c7f2a7df474bbe8d211f72546..048773a511d2da79df9478f0e68cb1d254f70178 100644 (file)
--- a/src/android.c
+++ b/src/android.c
@@ -6151,6 +6151,7 @@ android_get_keysym_name (int keysym, char *name_return, size_t size)
                                                   NULL);
   android_exception_check_nonnull ((void *) buffer, string);
   strncpy (name_return, buffer, size - 1);
+  name_return[size] = '\0';
 
   (*android_java_env)->ReleaseStringUTFChars (android_java_env,
                                              (jstring) string,