From 4f80aafa3940abf4050290e6c8b63c45716e0db0 Mon Sep 17 00:00:00 2001 From: Freeyorp Date: Wed, 19 Jun 2024 08:52:07 +0000 Subject: shared: Also print path Try to be even more helpful, since configuration can vary. --- src/shared/lib.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/shared/lib.cpp b/src/shared/lib.cpp index d7d1a4e..c0a4371 100644 --- a/src/shared/lib.cpp +++ b/src/shared/lib.cpp @@ -35,35 +35,35 @@ namespace tmwa { static - void try_read(const io::DirFd& dirfd, ZString filename) + void try_read(const io::DirFd& dirfd, LString dir_path, ZString filename) { io::ReadFile rf(dirfd, filename); if (!rf.is_open()) { - FPRINTF(stderr, "Could not open %s\n"_fmt, filename); + FPRINTF(stderr, "Could not open %s/%s\n"_fmt, dir_path, filename); abort(); } AString line; if (!rf.getline(line)) { - FPRINTF(stderr, "Could not read from %s\n"_fmt, filename); + FPRINTF(stderr, "Could not read from %s/%s\n"_fmt, dir_path, filename); abort(); } } static - void try_write(const io::DirFd& dirfd, ZString filename) + void try_write(const io::DirFd& dirfd, LString dir_path, ZString filename) { io::WriteFile wf(dirfd, filename); if (!wf.is_open()) { - FPRINTF(stderr, "Could not open %s\n"_fmt, filename); + FPRINTF(stderr, "Could not open %s/%s\n"_fmt, dir_path, filename); abort(); } wf.put_line("Hello, World!"_s); if (!wf.close()) { - FPRINTF(stderr, "Could not write to %s\n"_fmt, filename); + FPRINTF(stderr, "Could not write to %s/%s\n"_fmt, dir_path, filename); abort(); } } @@ -77,13 +77,17 @@ namespace tmwa io::DirFd root(portable_root); - io::DirFd etc(root, PACKAGESYSCONFDIR.xslice_t(portable)); - io::DirFd var(root, PACKAGELOCALSTATEDIR.xslice_t(portable)); - io::DirFd share(root, PACKAGEDATADIR.xslice_t(portable)); + LString etc_path = PACKAGESYSCONFDIR.xslice_t(portable); + LString var_path = PACKAGELOCALSTATEDIR.xslice_t(portable); + LString share_path = PACKAGEDATADIR.xslice_t(portable); - try_read(etc, "shared.conf"_s); - try_read(share, "shared.data"_s); - try_write(var, "shared.test"_s); + io::DirFd etc(root, etc_path); + io::DirFd var(root, var_path); + io::DirFd share(root, share_path); + + try_read(etc, etc_path, "shared.conf"_s); + try_read(share, share_path, "shared.data"_s); + try_write(var, var_path, "shared.test"_s); // io::FD::open(); } -- cgit v1.2.3-70-g09d2