From 6c121802d6f146b2d1ae2247eb2642ca5468dccd Mon Sep 17 00:00:00 2001 From: djm Date: Sat, 8 Jan 2022 07:34:57 +0000 Subject: [PATCH] more idiomatic error messages; spotted by jsg & deraadt ok jsg & markus --- usr.bin/ssh/sftp-client.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/ssh/sftp-client.c b/usr.bin/ssh/sftp-client.c index 189effa4635..acea6babaf8 100644 --- a/usr.bin/ssh/sftp-client.c +++ b/usr.bin/ssh/sftp-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.c,v 1.158 2022/01/01 01:55:30 jsg Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.159 2022/01/08 07:34:57 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller * @@ -992,7 +992,7 @@ do_realpath_expand(struct sftp_conn *conn, const char *path, int expand) if ((r = sshbuf_get_u32(msg, &status)) != 0) fatal_fr(r, "parse status"); - error("Couldn't canonicalize: %s", fx2txt(status)); + error("canonicalize %s: %s", path, fx2txt(status)); sshbuf_free(msg); return NULL; } else if (type != SSH2_FXP_NAME) @@ -1381,7 +1381,7 @@ send_open(struct sftp_conn *conn, const char *path, const char *tag, debug3("Sent %s message SSH2_FXP_OPEN I:%u P:%s M:0x%04x", tag, id, path, openmode); if ((handle = get_handle(conn, id, &handle_len, - "%s open(\"%s\")", tag, path)) == NULL) + "%s open \"%s\"", tag, path)) == NULL) return -1; /* success */ *handlep = handle; -- 2.20.1