rt/mergerfs
1
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2026-10-26 19:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Start using std::filesystem::path for fusepath (#1522)
Some checks are pending
CodeQL / Analyze (push) Waiting to run
Details
mkdocs / deploy (push) Waiting to run
Details

Browse source
This commit is contained in:
trapexit 2025-09-17 23:51:16 -04:00 • committed by GitHub
parent f64ff9ca1e
commit 8c649d33ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
139 changed files with 1711 additions and 1663 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/option_parser.cpp
View file

@ -21,6 +21,7 @@
#include "errno.hpp"
#include "fmt/core.h"
#include "fs_glob.hpp"
#include "fs_path.hpp"
#include "fs_statvfs_cache.hpp"
#include "hw_cpu.hpp"
#include "num.hpp"
@ -33,7 +34,6 @@
#include "fuse_config.hpp"
#include <array>
#include <filesystem>
#include <fstream>
#include <iomanip>
#include <iostream>
@ -47,9 +47,6 @@
#include <string.h>
#include <unistd.h>
using std::string;
using std::vector;
enum
{
MERGERFS_OPT_HELP,
@ -97,7 +94,7 @@ _set_fsname(Config &cfg_,
{
if(cfg_.fsname->empty())
{
vector<string> paths;
std::vector<std::string> paths;
cfg_.branches->to_paths(paths);
@ -225,7 +222,7 @@ _process_branches(Config &cfg_,
const char *arg_)
{
int rv;
string arg;
std::string arg;
arg = arg_;
rv = cfg_.set_raw("branches",arg);
@ -242,7 +239,7 @@ _process_mount(Config &cfg_,
const char *arg_)
{
int rv;
string arg;
std::string arg;
arg = arg_;
rv = cfg_.set_raw("mount",arg);
@ -347,8 +344,8 @@ void
_check_for_mount_loop(Config &cfg_,
Config::ErrVec *errs_)
{
fs::Path mount;
fs::PathVector branches;
fs::path mount;
std::vector<fs::path> branches;
std::error_code ec;
mount = *cfg_.mountpoint;