[seahorse/gnome-3-30] Ssh: Operation: Use Shell.quote to escape args
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/gnome-3-30] Ssh: Operation: Use Shell.quote to escape args
- Date: Tue, 25 Sep 2018 05:41:06 +0000 (UTC)
commit 908130d14900b64ccde4eefdf0321a9ce7d098dc
Author: Anukul Sangwan <anukulsangwan icloud com>
Date: Mon Sep 17 17:38:31 2018 +0530
Ssh: Operation: Use Shell.quote to escape args
ssh/operation.vala | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
---
diff --git a/ssh/operation.vala b/ssh/operation.vala
index c4f744b3..5608e3cb 100644
--- a/ssh/operation.vala
+++ b/ssh/operation.vala
@@ -127,17 +127,6 @@ public abstract class Operation : GLib.Object {
});
}
- /**
- * Escapes a command-line argument so it can be safely passed on.
- *
- * @param arg The argument that should be escaped.
- * @return The escaped argument.
- */
- protected string escape_shell_arg (string arg) {
- string escaped = arg.replace("'", "\'");
- return "\'%s\'".printf(escaped);
- }
-
private bool on_io_ssh_read(IOChannel source, IOCondition condition, StringBuilder data) {
try {
IOStatus status = IOStatus.NORMAL;
@@ -285,7 +274,7 @@ public class GenerateOperation : Operation {
string algo = type.to_string().down();
string bits_str = (bits != 0)? "-b '%u'".printf(bits) : "";
- string comment = escape_shell_arg(email);
+ string comment = GLib.Shell.quote(email);
string cmd = "%s %s -t '%s' -C %s -f '%s'".printf(Config.SSH_KEYGEN_PATH, bits_str, algo, comment,
filename);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]