alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #294 from tmuehlbacher/subvol-fix

Browse Source 
fix(subvol): canonicalize requires path to exist
This commit is contained in:
koverstreet 2024-06-10 18:30:00 -04:00 committed by GitHub
commit e743caf71c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/commands/subvolume.rs
View File

@ -1,4 +1,4 @@
use std::path::PathBuf; use std::{env, path::PathBuf};
use bch_bindgen::c::BCH_SUBVOL_SNAPSHOT_RO; use bch_bindgen::c::BCH_SUBVOL_SNAPSHOT_RO;
use clap::{Parser, Subcommand}; use clap::{Parser, Subcommand};
@ -42,9 +42,13 @@ pub fn subvolume(argv: Vec<String>) -> i32 {
match cli.subcommands { match cli.subcommands {
Subcommands::Create { targets } => { Subcommands::Create { targets } => {
for target in targets { for target in targets {
let target = target let target = if target.is_absolute() {
.canonicalize() target
.expect("unable to canonicalize a target path"); } else {
env::current_dir()
.map(|p| p.join(target))
.expect("unable to get current directory")
};
if let Some(dirname) = target.parent() { if let Some(dirname) = target.parent() {
let fs = unsafe { BcachefsHandle::open(dirname) }; let fs = unsafe { BcachefsHandle::open(dirname) };
@ -56,7 +60,7 @@ pub fn subvolume(argv: Vec<String>) -> i32 {
Subcommands::Delete { target } => { Subcommands::Delete { target } => {
let target = target let target = target
.canonicalize() .canonicalize()
.expect("unable to canonicalize a target path"); .expect("subvolume path does not exist or can not be canonicalized");
if let Some(dirname) = target.parent() { if let Some(dirname) = target.parent() {
let fs = unsafe { BcachefsHandle::open(dirname) }; let fs = unsafe { BcachefsHandle::open(dirname) };