tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Fix error message on close(2) and add printf format 

attributes. From Christos Zoulas, OK markus@

OpenBSD-Commit-ID: 41523c999a9e3561fcc7082fd38ea2e0629ee07e
This commit is contained in:
millert@openbsd.org 2020-05-29 21:22:02 +00:00 committed by Damien Miller
parent 712ac1efb6
commit 5ad3c3a33e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.210 2020/05/06 20:57:38 djm Exp $ */ /* $OpenBSD: scp.c,v 1.211 2020/05/29 21:22:02 millert Exp $ */
/* /*
* scp - secure remote copy. This is basically patched BSD rcp which * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@ -373,8 +373,11 @@ typedef struct {
BUF *allocbuf(BUF *, int, int); BUF *allocbuf(BUF *, int, int);
void lostconn(int); void lostconn(int);
int okname(char *); int okname(char *);
void run_err(const char *,...); void run_err(const char *,...)
int note_err(const char *,...); __attribute__((__format__ (printf, 1, 2)))
__attribute__((__nonnull__ (1)));
int note_err(const char *,...)
__attribute__((__format__ (printf, 1, 2)));
void verifydir(char *); void verifydir(char *);
struct passwd *pwd; struct passwd *pwd;
@ -1520,7 +1523,7 @@ bad: run_err("%s: %s", np, strerror(errno));
} }
} }
if (close(ofd) == -1) if (close(ofd) == -1)
note_err(np, "%s: close: %s", np, strerror(errno)); note_err("%s: close: %s", np, strerror(errno));
(void) response(); (void) response();
if (showprogress) if (showprogress)
stop_progress_meter(); stop_progress_meter();