[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/10] linux-user: clean-up padding on /proc/self/maps
From: |
Alex Bennée |
Subject: |
[PATCH v2 09/10] linux-user: clean-up padding on /proc/self/maps |
Date: |
Wed, 1 Apr 2020 10:47:58 +0100 |
Don't use magic spaces, calculate the justification for the file
field like the kernel does with seq_pad.
Signed-off-by: Alex Bennée <address@hidden>
---
linux-user/syscall.c | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0246df01573..b921432f4ff 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7235,6 +7235,7 @@ static int open_self_maps(void *cpu_env, int fd)
TaskState *ts = cpu->opaque;
GSList *map_info = read_self_maps();
GSList *s;
+ int count;
for (s = map_info; s; s = g_slist_next(s)) {
MapInfo *e = (MapInfo *) s->data;
@@ -7253,20 +7254,24 @@ static int open_self_maps(void *cpu_env, int fd)
}
if (h2g(min) == ts->info->stack_limit) {
- path = " [stack]";
+ path = "[stack]";
} else {
path = e->path;
}
- dprintf(fd, TARGET_ABI_FMT_ptr "-" TARGET_ABI_FMT_ptr
- " %c%c%c%c %08" PRIx64 " %s %d %s%s\n",
- h2g(min), h2g(max - 1) + 1,
- e->is_read ? 'r' : '-',
- e->is_write ? 'w' : '-',
- e->is_exec ? 'x' : '-',
- e->is_priv ? 'p' : '-',
- e->offset, e->dev, e->inode,
- path ? " " : "", path ? path : "");
+ count = dprintf(fd, TARGET_ABI_FMT_ptr "-" TARGET_ABI_FMT_ptr
+ " %c%c%c%c %08" PRIx64 " %s %d",
+ h2g(min), h2g(max - 1) + 1,
+ e->is_read ? 'r' : '-',
+ e->is_write ? 'w' : '-',
+ e->is_exec ? 'x' : '-',
+ e->is_priv ? 'p' : '-',
+ e->offset, e->dev, e->inode);
+ if (path) {
+ dprintf(fd, "%*s%s\n", 73 - count, "", path);
+ } else {
+ dprintf(fd, "\n");
+ }
}
}
@@ -7277,9 +7282,10 @@ static int open_self_maps(void *cpu_env, int fd)
* We only support execution from the vsyscall page.
* This is as if CONFIG_LEGACY_VSYSCALL_XONLY=y from v5.3.
*/
- dprintf(fd, TARGET_FMT_lx "-" TARGET_FMT_lx
- " --xp 00000000 00:00 0 [vsyscall]\n",
- TARGET_VSYSCALL_PAGE, TARGET_VSYSCALL_PAGE + TARGET_PAGE_SIZE);
+ count = dprintf(fd, TARGET_FMT_lx "-" TARGET_FMT_lx
+ " --xp 00000000 00:00 0",
+ TARGET_VSYSCALL_PAGE, TARGET_VSYSCALL_PAGE +
TARGET_PAGE_SIZE);
+ dprintf(fd, "%*s%s\n", 73 - count, "", "[vsyscall]");
#endif
return 0;
--
2.20.1
- [PATCH v2 03/10] tests/tcg: remove extraneous pasting macros, (continued)
- [PATCH v2 03/10] tests/tcg: remove extraneous pasting macros, Alex Bennée, 2020/04/01
- [PATCH v2 02/10] linux-user: protect fcntl64 with an #ifdef, Alex Bennée, 2020/04/01
- [PATCH v2 04/10] linux-user: more debug for init_guest_space, Alex Bennée, 2020/04/01
- [PATCH v2 05/10] target/xtensa: add FIXME for translation memory leak, Alex Bennée, 2020/04/01
- [PATCH v2 06/10] gdbstub: fix compiler complaining, Alex Bennée, 2020/04/01
- [PATCH v2 07/10] softfloat: Fix BAD_SHIFT from normalizeFloatx80Subnormal, Alex Bennée, 2020/04/01
- [PATCH v2 08/10] linux-user: factor out reading of /proc/self/maps, Alex Bennée, 2020/04/01
- [PATCH v2 09/10] linux-user: clean-up padding on /proc/self/maps,
Alex Bennée <=
- [PATCH v2 10/10] linux-user: completely re-write init_guest_space, Alex Bennée, 2020/04/01