[src/netbsd-2]: src/gnu/libexec/uucp Pull up following revision(s) (requested...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/853615da03cd
branches:  netbsd-2
changeset: 564296:853615da03cd
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Oct 26 23:57:38 2005 +0000

description:
Pull up following revision(s) (requested by is in ticket #5825):
        gnu/libexec/uucp/libunix/pipe.c: revision 1.3
        gnu/libexec/uucp/doc/uucp.texi: revision 1.6
Allow for \H -> "address ..." substitution in PIPE ports. Useful
e.g. for generic UUCP over SSH or SSL... Idea and part of the patch
by Joerg Durchain, has apparently been integrated in Debian for a
while.

diffstat:

 gnu/libexec/uucp/doc/uucp.texi  |  10 ++++++----
 gnu/libexec/uucp/libunix/pipe.c |   9 ++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diffs (67 lines):

diff -r e8b6ab8fe966 -r 853615da03cd gnu/libexec/uucp/doc/uucp.texi
--- a/gnu/libexec/uucp/doc/uucp.texi    Wed Oct 26 23:20:25 2005 +0000
+++ b/gnu/libexec/uucp/doc/uucp.texi    Wed Oct 26 23:57:38 2005 +0000
@@ -4241,7 +4241,8 @@
 @findex address
 
 Give a phone number to call (when using a modem port) or a remote host
-to contact (when using a TCP or TLI port).  The commands @code{phone}
+to contact (when using a TCP or TLI port) or insert as parameter to a 
+command string (when using a PIPE port). The commands @code{phone}
 and @code{address} are equivalent; the duplication is intended to
 provide a mnemonic choice depending on the type of port in use.
 
@@ -5246,7 +5247,8 @@
 only be reached through some unusual means.  A sample use might be
 @samp{command /bin/rlogin -E -8 -l @var{login} @var{system}}.  The
 command is run with the full privileges of UUCP; it is responsible for
-maintaining security.
+maintaining security. The string @kbd{\H} is replaced with the remote
+host name given by the @code{address} command.
 
 @end table
 
@@ -5649,8 +5651,8 @@
 Approved: news-answers-request@@MIT.Edu
 
 Archive-name: uucp-internals
-Version: $Revision: 1.5 $
-Last-modified: $Date: 2003/01/06 20:30:43 $
+Version: $Revision: 1.5.4.1 $
+Last-modified: $Date: 2005/10/26 23:57:38 $
 @end format
 @end ifset
 
diff -r e8b6ab8fe966 -r 853615da03cd gnu/libexec/uucp/libunix/pipe.c
--- a/gnu/libexec/uucp/libunix/pipe.c   Wed Oct 26 23:20:25 2005 +0000
+++ b/gnu/libexec/uucp/libunix/pipe.c   Wed Oct 26 23:57:38 2005 +0000
@@ -27,7 +27,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char pipe_rcsid[] = "$Id: pipe.c,v 1.2 1995/08/24 05:20:05 jtc Exp $";
+const char pipe_rcsid[] = "$Id: pipe.c,v 1.2.20.1 2005/10/26 23:57:38 riz Exp $";
 #endif
 
 #include "uudefs.h"
@@ -199,6 +199,7 @@
   struct ssysdep_conn *q;
   int aidescs[3];
   const char **pzprog;
+  const char **p;
 
   q = (struct ssysdep_conn *) qconn->psysdep;
 
@@ -212,6 +213,12 @@
       return FALSE;
     }
 
+  /* Look for a string \H and substitute the address given for this system */
+  for (p=pzprog; *p; p++)
+    if (!strcmp(*p, "\\H"))
+      *p = zphone;
+ 
+
   aidescs[0] = SPAWN_WRITE_PIPE;
   aidescs[1] = SPAWN_READ_PIPE;
   aidescs[2] = SPAWN_NULL;