tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 15:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: more idiomatic error messages; spotted by jsg & deraadt

Browse Source 
ok jsg & markus

OpenBSD-Commit-ID: 43618c692f3951747b4151c477c7df22afe2bcc8
This commit is contained in:
djm@openbsd.org 2022-01-08 07:34:57 +00:00 committed by Damien Miller
parent 9acddcd591
commit e14940bbec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sftp-client.c
View File

@ -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 <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -1012,7 +1012,7 @@ do_realpath_expand(struct sftp_conn *conn, const char *path, int expand)
if ((r = sshbuf_get_u32(msg, &status)) != 0) if ((r = sshbuf_get_u32(msg, &status)) != 0)
fatal_fr(r, "parse status"); fatal_fr(r, "parse status");
error("Couldn't canonicalize: %s", fx2txt(status)); error("canonicalize %s: %s", path, fx2txt(status));
sshbuf_free(msg); sshbuf_free(msg);
return NULL; return NULL;
} else if (type != SSH2_FXP_NAME) } else if (type != SSH2_FXP_NAME)
@ -1401,7 +1401,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", debug3("Sent %s message SSH2_FXP_OPEN I:%u P:%s M:0x%04x",
tag, id, path, openmode); tag, id, path, openmode);
if ((handle = get_handle(conn, id, &handle_len, if ((handle = get_handle(conn, id, &handle_len,
"%s open(\"%s\")", tag, path)) == NULL) "%s open \"%s\"", tag, path)) == NULL)
return -1; return -1;
/* success */ /* success */
*handlep = handle; *handlep = handle;