From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxBmX-0001Rm-QN for qemu-devel@nongnu.org; Wed, 18 Jun 2014 05:03:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxBmP-0000qW-5M for qemu-devel@nongnu.org; Wed, 18 Jun 2014 05:03:49 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:44991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxBmO-0000qN-VD for qemu-devel@nongnu.org; Wed, 18 Jun 2014 05:03:41 -0400 Received: by mail-wi0-f172.google.com with SMTP id hi2so7197950wib.17 for ; Wed, 18 Jun 2014 02:03:40 -0700 (PDT) Sender: Wim Vander Schelden From: lists@fixnum.org Date: Wed, 18 Jun 2014 11:02:39 +0200 Message-Id: <1403082159-14710-2-git-send-email-lists@fixnum.org> In-Reply-To: <1403082159-14710-1-git-send-email-lists@fixnum.org> References: <53A0AE7D.2090303@redhat.com> <1403082159-14710-1-git-send-email-lists@fixnum.org> Subject: [Qemu-devel] [PATCH] linux-user: added fake open() for /proc/self/cmdline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, Wim Vander Schelden From: Wim Vander Schelden Signed-off-by: Wim Vander Schelden --- linux-user/syscall.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c134c32..1be0f09 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4947,6 +4947,51 @@ int host_to_target_waitstatus(int status) return status; } +static int open_self_cmdline(void *cpu_env, int fd) +{ + int fd_orig = -1; + bool word_skipped = false; + + fd_orig = open("/proc/self/cmdline", O_RDONLY); + if (fd_orig < 0) { + return fd_orig; + } + + while (true) { + ssize_t nb_read; + char buf[128]; + char *cp_buf = buf; + + nb_read = read(fd_orig, buf, sizeof(buf)); + if (nb_read < 0) { + fd_orig = close(fd_orig); + return -1; + } else if (nb_read == 0) { + break; + } + + if (!word_skipped) { + /* Skip the first string, which is the path to qemu-*-static + instead of the actual command. */ + cp_buf = memchr(buf, 0, sizeof(buf)); + if (cp_buf) { + /* Null byte found, skip one string */ + cp_buf++; + nb_read -= cp_buf - buf; + word_skipped = true; + } + } + + if (word_skipped) { + if (write(fd, cp_buf, nb_read) != nb_read) { + return -1; + } + } + } + + return close(fd_orig); +} + static int open_self_maps(void *cpu_env, int fd) { #if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32) @@ -5148,6 +5193,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode) { "maps", open_self_maps, is_proc_myself }, { "stat", open_self_stat, is_proc_myself }, { "auxv", open_self_auxv, is_proc_myself }, + { "cmdline", open_self_cmdline, is_proc_myself }, #if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN) { "/proc/net/route", open_net_route, is_proc }, #endif -- 1.9.1