[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] 9pfs-local: simplify/optimize local_mapped_attr
From: |
Aneesh Kumar K.V |
Subject: |
[Qemu-devel] [PATCH 1/6] 9pfs-local: simplify/optimize local_mapped_attr_path() |
Date: |
Mon, 16 Mar 2015 15:39:38 +0530 |
From: Michael Tokarev <address@hidden>
Omit one unnecessary memory allocation for components
of the path and create the resulting path directly given
lengths of the components.
Do not use basename(3) because there are 2 versions of
this function which differs when argument ends with
slash character, use strrchr() instead so we have
consistent result. This also makes sure the function
will do the right thing in corner cases (eg, empty
pathname is given), when basename(3) return entirely
another string.
Signed-off-by: Michael Tokarev <address@hidden>
Signed-off-by: Aneesh Kumar K.V <address@hidden>
---
hw/9pfs/virtio-9p-local.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
index d05c91779f2c..84efb31cfec4 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -45,19 +45,17 @@
static char *local_mapped_attr_path(FsContext *ctx, const char *path)
{
- char *dir_name;
- char *tmp_path = g_strdup(path);
- char *base_name = basename(tmp_path);
- char *buffer;
-
- /* NULL terminate the directory */
- dir_name = tmp_path;
- *(base_name - 1) = '\0';
-
- buffer = g_strdup_printf("%s/%s/%s/%s",
- ctx->fs_root, dir_name, VIRTFS_META_DIR, base_name);
- g_free(tmp_path);
- return buffer;
+ int dirlen;
+ const char *name = strrchr(path, '/');
+ if (name) {
+ dirlen = name - path;
+ ++name;
+ } else {
+ name = path;
+ dirlen = 0;
+ }
+ return g_strdup_printf("%s/%.*s/%s/%s", ctx->fs_root,
+ dirlen, path, VIRTFS_META_DIR, name);
}
static FILE *local_fopen(const char *path, const char *mode)
--
2.1.0
- [Qemu-devel] [PULL] VirtFS update, Aneesh Kumar K.V, 2015/03/16
- [Qemu-devel] [PATCH 5/6] virtfs-proxy: Fix possible overflow, Aneesh Kumar K.V, 2015/03/16
- [Qemu-devel] [PATCH 3/6] hw/9pfs/virtio-9p-posix-acl: Fix out-of-bounds access, Aneesh Kumar K.V, 2015/03/16
- [Qemu-devel] [PATCH 1/6] 9pfs-local: simplify/optimize local_mapped_attr_path(),
Aneesh Kumar K.V <=
- [Qemu-devel] [PATCH 6/6] virtio: Fix memory leaks reported by Coverity, Aneesh Kumar K.V, 2015/03/16
- [Qemu-devel] [PATCH 4/6] fsdev/virtfs-proxy-helper: Fix improper use of negative value, Aneesh Kumar K.V, 2015/03/16
- [Qemu-devel] [PATCH 2/6] 9pfs-proxy: tiny cleanups in proxy_pwritev and proxy_preadv, Aneesh Kumar K.V, 2015/03/16
- Re: [Qemu-devel] [PULL] VirtFS update, Peter Maydell, 2015/03/16