Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

- make SystemCmd take vector of strings #841

Merged
merged 1 commit into from
Oct 13, 2023
Merged

- make SystemCmd take vector of strings #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LIBVERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.2.0
7.3.0
2 changes: 1 addition & 1 deletion client/misc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ Differ::run(const string& f1, const string& f2) const
tmp += " " + extensions;
tmp += " " + quote(f1) + " " + quote(f2);

SystemCmd cmd(tmp);
SystemCmd cmd({ SH_BIN, "-c", tmp });

for (const string& line : cmd.get_stdout())
cout << line << endl;
Expand Down
1 change: 1 addition & 0 deletions package/snapper.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Fri Oct 13 08:56:18 CEST 2023 - [email protected]

- fix diff for lvm based configs (bsc#1216191)
- make SystemCmd take vector of strings

-------------------------------------------------------------------
Thu Sep 14 15:45:53 CEST 2023 - [email protected]
Expand Down
14 changes: 7 additions & 7 deletions snapper/Ext4.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ namespace snapper
int r1 = mkdir((subvolume + "/.snapshots").c_str(), 0700);
if (r1 == 0)
{
SystemCmd cmd1(CHATTRBIN " +x " + quote(subvolume + "/.snapshots"));
SystemCmd cmd1({ CHATTRBIN, "+x", subvolume + "/.snapshots" });
if (cmd1.retcode() != 0)
throw CreateConfigFailedException("chattr failed");
}
Expand All @@ -104,7 +104,7 @@ namespace snapper
int r2 = mkdir((subvolume + "/.snapshots/.info").c_str(), 0700);
if (r2 == 0)
{
SystemCmd cmd2(CHATTRBIN " -x " + quote(subvolume + "/.snapshots/.info"));
SystemCmd cmd2({ CHATTRBIN, "-x", subvolume + "/.snapshots/.info" });
if (cmd2.retcode() != 0)
throw CreateConfigFailedException("chattr failed");
}
Expand Down Expand Up @@ -174,11 +174,11 @@ namespace snapper
if (num_parent != 0 || !read_only)
throw std::logic_error("not implemented");

SystemCmd cmd1(TOUCHBIN " " + quote(snapshotFile(num)));
SystemCmd cmd1({ TOUCHBIN, snapshotFile(num) });
if (cmd1.retcode() != 0)
throw CreateSnapshotFailedException();

SystemCmd cmd2(CHSNAPBIN " +S " + quote(snapshotFile(num)));
SystemCmd cmd2({ CHSNAPBIN, "+S", snapshotFile(num) });
if (cmd2.retcode() != 0)
throw CreateSnapshotFailedException();
}
Expand All @@ -187,7 +187,7 @@ namespace snapper
void
Ext4::deleteSnapshot(unsigned int num) const
{
SystemCmd cmd(CHSNAPBIN " -S " + quote(snapshotFile(num)));
SystemCmd cmd({ CHSNAPBIN, "-S", snapshotFile(num) });
if (cmd.retcode() != 0)
throw DeleteSnapshotFailedException();
}
Expand All @@ -212,7 +212,7 @@ namespace snapper
if (isSnapshotMounted(num))
return;

SystemCmd cmd1(CHSNAPBIN " +n " + quote(snapshotFile(num)));
SystemCmd cmd1({ CHSNAPBIN, "+n", snapshotFile(num) });
if (cmd1.retcode() != 0)
throw MountSnapshotFailedException();

Expand All @@ -237,7 +237,7 @@ namespace snapper
// if (!umount(snapshotDir(num)))
// throw UmountSnapshotFailedException();

SystemCmd cmd1(CHSNAPBIN " -n " + quote(snapshotFile(num)));
SystemCmd cmd1({ CHSNAPBIN, "-n", snapshotFile(num) });
if (cmd1.retcode() != 0)
throw UmountSnapshotFailedException();

Expand Down
13 changes: 6 additions & 7 deletions snapper/Hooks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) [2011-2015] Novell, Inc.
* Copyright (c) 2022 SUSE LLC
* Copyright (c) [2022-2023] SUSE LLC
*
* All Rights Reserved.
*
Expand Down Expand Up @@ -53,10 +53,9 @@ namespace snapper
std::sort(scripts.begin(), scripts.end());
for (const string& script : scripts)
{
string cmd_line = dir.fullname(script);
for (const string& arg : args)
cmd_line += " " + quote(arg);
SystemCmd cmd(cmd_line);
SystemCmd::Args cmd_args = { dir.fullname(script) };
cmd_args << args;
SystemCmd cmd(cmd_args);
}
}
catch (const Exception& e)
Expand Down Expand Up @@ -185,7 +184,7 @@ namespace snapper

if (subvolume == "/" && filesystem->fstype() == "btrfs" && access(GRUB_SCRIPT, X_OK) == 0)
{
SystemCmd cmd(string(GRUB_SCRIPT) + " " + option);
SystemCmd cmd({ GRUB_SCRIPT, option });
}
#endif
}
Expand All @@ -201,7 +200,7 @@ namespace snapper
// Fate#319108
if (access(ROLLBACK_SCRIPT, X_OK) == 0)
{
SystemCmd cmd(string(ROLLBACK_SCRIPT) + " " + old_root + " " + new_root);
SystemCmd cmd({ ROLLBACK_SCRIPT, old_root, new_root });
}
#endif
}
Expand Down
4 changes: 2 additions & 2 deletions snapper/Lvm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ namespace snapper

LvmCapabilities::LvmCapabilities()
{
SystemCmd cmd(string(LVMBIN " version"));
SystemCmd cmd({ LVMBIN, "version" });

if (cmd.retcode() != 0 || cmd.get_stdout().empty())
{
Expand All @@ -510,7 +510,7 @@ namespace snapper
lvm_version version(maj, min, rev);

if (version >= lvm_version(2, 2, 99))
ignoreactivationskip = " -K";
ignoreactivationskip = "--ignoreactivationskip";
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion snapper/Lvm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace snapper

LvmCapabilities();

// empty or " -K" if lvm supports ignore activation skip flag
// empty or "--ignoreactivationskip" if lvm supports ignore activation skip flag
string ignoreactivationskip;

};
Expand Down
24 changes: 14 additions & 10 deletions snapper/LvmCache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@ namespace snapper
{
boost::upgrade_to_unique_lock<boost::shared_mutex> unique_lock(upg_lock);

SystemCmd cmd(LVCHANGEBIN + caps->get_ignoreactivationskip() + " -ay " + quote(full_name()));
SystemCmd::Args cmd_args = { LVCHANGEBIN };
if (!caps->get_ignoreactivationskip().empty())
cmd_args << caps->get_ignoreactivationskip();
cmd_args << "--activate" << "y" << full_name();

SystemCmd cmd(cmd_args);
if (cmd.retcode() != 0)
{
y2err("lvm cache: " << full_name() << " activation failed!");
Expand Down Expand Up @@ -120,7 +125,7 @@ namespace snapper
{
boost::upgrade_to_unique_lock<boost::shared_mutex> unique_lock(upg_lock);

SystemCmd cmd(LVCHANGEBIN " -an " + quote(full_name()));
SystemCmd cmd({ LVCHANGEBIN, "--activate", "n", full_name() });
if (cmd.retcode() != 0)
{
y2err("lvm cache: " << full_name() << " deactivation failed!");
Expand All @@ -139,7 +144,7 @@ namespace snapper
{
boost::unique_lock<boost::shared_mutex> unique_lock(lv_mutex);

SystemCmd cmd(LVSBIN " --noheadings -o lv_attr,segtype " + quote(full_name()));
SystemCmd cmd({ LVSBIN, "--noheadings", "--options", "lv_attr,segtype", full_name() });
if (cmd.retcode() != 0 || cmd.get_stdout().empty())
{
y2err("lvm cache: failed to get info about " << full_name());
Expand Down Expand Up @@ -181,8 +186,7 @@ namespace snapper
{
boost::upgrade_to_unique_lock<boost::shared_mutex> unique_lock(upg_lock);

SystemCmd cmd(LVCHANGEBIN " --permission " + string(read_only ? "r" : "rw") + " " +
quote(full_name()));
SystemCmd cmd({ LVCHANGEBIN, "--permission", read_only ? "r" : "rw", full_name() });
if (cmd.retcode() != 0)
{
y2err("lvm cache: " << full_name() << " setting permission failed!");
Expand Down Expand Up @@ -335,8 +339,8 @@ namespace snapper

boost::upgrade_to_unique_lock<boost::shared_mutex> unique_lock(upg_lock);

SystemCmd cmd(LVCREATEBIN " --permission " + string(read_only ? "r" : "rw") + " --snapshot "
"--name " + quote(lv_snapshot_name) + " " + quote(full_name(lv_origin_name)));
SystemCmd cmd({ LVCREATEBIN, "--permission", read_only ? "r" : "rw", "--snapshot",
"--name", lv_snapshot_name, full_name(lv_origin_name) });

if (cmd.retcode() != 0)
throw LvmCacheException();
Expand All @@ -359,7 +363,7 @@ namespace snapper
}
else
{
SystemCmd cmd(LVSBIN " --noheadings -o lv_attr,segtype " + quote(full_name(lv_name)));
SystemCmd cmd({ LVSBIN, "--noheadings", "--options", "lv_attr,segtype", full_name(lv_name) });
if (cmd.retcode() != 0 || cmd.get_stdout().empty())
{
y2err("lvm cache: failed to get info about " << full_name(lv_name));
Expand Down Expand Up @@ -395,7 +399,7 @@ namespace snapper
// wait for all invidual lv cache operations under shared vg lock to finish
boost::upgrade_to_unique_lock<boost::shared_mutex> unique_lock(upg_lock);

SystemCmd cmd(LVREMOVEBIN " --force " + quote(full_name(lv_name)));
SystemCmd cmd({ LVREMOVEBIN, "--force", full_name(lv_name) });
if (cmd.retcode() != 0)
throw LvmCacheException();

Expand Down Expand Up @@ -548,7 +552,7 @@ namespace snapper
void
LvmCache::add_vg(const string& vg_name, const string& include_lv_name)
{
SystemCmd cmd(LVSBIN " --noheadings -o lv_name,lv_attr,segtype " + quote(vg_name));
SystemCmd cmd({ LVSBIN, "--noheadings", "--options", "lv_name,lv_attr,segtype", vg_name });
if (cmd.retcode() != 0)
{
y2err("lvm cache: failed to get info about VG " << vg_name);
Expand Down
4 changes: 2 additions & 2 deletions snapper/Snapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ namespace snapper

sysconfig.save();

SystemCmd cmd(RMBIN " " + quote(CONFIGS_DIR "/" + config_name));
SystemCmd cmd({ RMBIN, "--", CONFIGS_DIR "/" + config_name });

SN_RETHROW(e);
}
Expand Down Expand Up @@ -512,7 +512,7 @@ namespace snapper
SN_THROW(DeleteConfigFailedException("deleting snapshot failed"));
}

SystemCmd cmd1(RMBIN " " + quote(CONFIGS_DIR "/" + config_name));
SystemCmd cmd1({ RMBIN, "--", CONFIGS_DIR "/" + config_name });
if (cmd1.retcode() != 0)
{
SN_THROW(DeleteConfigFailedException("deleting config-file failed"));
Expand Down
Loading