- djm@cvs.openbsd.org 2008/12/09 03:02:37

     [sftp.1 sftp.c]
     correct sftp(1) and corresponding usage syntax;
     bz#1518 patch from imorgan AT nas.nasa.gov; ok deraadt@ improved diff jmc@

diff --git a/ChangeLog b/ChangeLog
index 2340c49e4308580e7b04539ac8229be98825c77e..331d813c4bc29df7cf4ead880d0c9e1f9ef58965 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
      failure; avoids double-free in ~C -L handler when given an invalid
      forwarding specification; bz#1539 report from adejong AT debian.org
      via Colin Watson; ok markus@ dtucker@
+   - djm@cvs.openbsd.org 2008/12/09 03:02:37
+     [sftp.1 sftp.c]
+     correct sftp(1) and corresponding usage syntax;
+     bz#1518 patch from imorgan AT nas.nasa.gov; ok deraadt@ improved diff jmc@
 
 20081208
  - (djm) [configure.ac] bz#1538: better test for ProPolice/SSP: actually

diff --git a/sftp.1 b/sftp.1
index 05ef1a0aa5449c093e750d06e6e89c06afcd0431..bbead7a9810b63cb5cf91e1a8c69bc14c73937c7 100644 (file)
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.67 2008/07/15 02:23:14 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.68 2008/12/09 03:02:37 djm Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -43,13 +43,12 @@
 .Ar host
 .Ek
 .Nm sftp
-.Oo Oo Ar user Ns @ Oc Ns
-.Ar host Ns Oo : Ns Ar file Oo
-.Ar file Oc Oc Oc
+.Oo Ar user Ns @ Oc Ns
+.Ar host Ns Op : Ns Ar
 .Nm sftp
-.Oo Oo Ar user Ns @ Oc Ns
+.Oo Ar user Ns @ Oc Ns
 .Ar host Ns Oo : Ns Ar dir Ns
-.Oo Ar / Oc Oc Oc
+.Oo Ar / Oc Oc
 .Nm sftp
 .Fl b Ar batchfile
 .Oo Ar user Ns @ Oc Ns Ar host

diff --git a/sftp.c b/sftp.c
index 4e3c833f7b810a579e945f1251e0fc36c5527b99..4d37f85699ac0b29b538a7916af77679cc0001d5 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.104 2008/12/09 02:39:59 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.105 2008/12/09 03:04:39 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1670,8 +1670,8 @@ usage(void)
            "usage: %s [-1Cv] [-B buffer_size] [-b batchfile] [-F ssh_config]\n"
            "            [-o ssh_option] [-P sftp_server_path] [-R num_requests]\n"
            "            [-S program] [-s subsystem | sftp_server] host\n"
-           "       %s [[user@]host[:file [file]]]\n"
-           "       %s [[user@]host[:dir[/]]]\n"
+           "       %s [user@]host[:file ...]\n"
+           "       %s [user@]host[:dir[/]]\n"
            "       %s -b batchfile [user@]host\n", __progname, __progname, __progname, __progname);
        exit(1);
 }