diff options
| author | Christian Schoenebeck | 2022-03-01 21:33:49 +0100 |
|---|---|---|
| committer | Christian Schoenebeck | 2022-03-07 11:49:31 +0100 |
| commit | 1983d8b0d6b013f025905c7d37e3f0261edc328b (patch) | |
| tree | 70b64ffd40f8ecc9407e807f23052dbd0c8e5a04 /hw | |
| parent | 9p: darwin: meson: Allow VirtFS on Darwin (diff) | |
| download | qemu-1983d8b0d6b013f025905c7d37e3f0261edc328b.tar.gz qemu-1983d8b0d6b013f025905c7d37e3f0261edc328b.tar.xz qemu-1983d8b0d6b013f025905c7d37e3f0261edc328b.zip | |
9pfs: move qemu_dirent_dup() from osdep -> 9p-util
Function qemu_dirent_dup() is currently only used by 9pfs server, so move
it from project global header osdep.h to 9pfs specific header 9p-util.h.
Link: https://lore.kernel.org/qemu-devel/CAFEAcA_=HAUNomKD2wurSVaAHa5mrk22A1oHKLWUDjk7v6Khmg@mail.gmail.com/
Based-on: <20220227223522.91937-12-wwcohen@gmail.com>
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <E1nP9Oz-00043L-KJ@lizzy.crudebyte.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/9pfs/9p-util.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h index 73b08c5561..408d71c8f7 100644 --- a/hw/9pfs/9p-util.h +++ b/hw/9pfs/9p-util.h @@ -114,6 +114,36 @@ static inline off_t qemu_dirent_off(struct dirent *dent) #endif } +/** + * Duplicate directory entry @dent. + * + * It is highly recommended to use this function instead of open coding + * duplication of @c dirent objects, because the actual @c struct @c dirent + * size may be bigger or shorter than @c sizeof(struct dirent) and correct + * handling is platform specific (see gitlab issue #841). + * + * @dent - original directory entry to be duplicated + * @returns duplicated directory entry which should be freed with g_free() + */ +static inline struct dirent *qemu_dirent_dup(struct dirent *dent) +{ + size_t sz = 0; +#if defined _DIRENT_HAVE_D_RECLEN + /* Avoid use of strlen() if platform supports d_reclen. */ + sz = dent->d_reclen; +#endif + /* + * Test sz for zero even if d_reclen is available + * because some drivers may set d_reclen to zero. + */ + if (sz == 0) { + /* Fallback to the most portable way. */ + sz = offsetof(struct dirent, d_name) + + strlen(dent->d_name) + 1; + } + return g_memdup(dent, sz); +} + /* * As long as mknodat is not available on macOS, this workaround * using pthread_fchdir_np is needed. qemu_mknodat is defined in |