summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-10-03 20:43:13 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-10-03 20:43:13 +0000
commitb565e6f0e6d21a82e4a01ad1d9a49f1eb3a61ab3 (patch)
treec2feb43c80c530e329140416b4effc45420f8c6f
parentcbf38e0d3db439168a6470cae5f39e7561a46f5a (diff)
errno trashing considered harmfull
-rw-r--r--usr.bin/ssh/scp.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index ef3b77afa23..de1d3ebf74b 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -42,11 +42,11 @@ and ssh has the necessary privileges.)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: scp.c,v 1.8 1999/10/02 19:18:22 deraadt Exp $
+ * $Id: scp.c,v 1.9 1999/10/03 20:43:12 deraadt Exp $
*/
#include "includes.h"
-RCSID("$Id: scp.c,v 1.8 1999/10/02 19:18:22 deraadt Exp $");
+RCSID("$Id: scp.c,v 1.9 1999/10/03 20:43:12 deraadt Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -961,7 +961,7 @@ run_err(const char *fmt, ...)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: scp.c,v 1.8 1999/10/02 19:18:22 deraadt Exp $
+ * $Id: scp.c,v 1.9 1999/10/03 20:43:12 deraadt Exp $
*/
char *
@@ -1066,7 +1066,10 @@ alarmtimer(int wait)
void
updateprogressmeter(void)
{
+ int save_errno = errno;
+
progressmeter(0);
+ errno = save_errno;
}
void