Re: What to use instead of 'cu'

[Matthew Dillon <dillon@xxxxxxxxxxxxxxxxxxxx>]

:-On [20040828 18:32], Matthew Dillon (dillon@xxxxxxxxxxxxxxxxxxxx) wrote:
:>    I don't think we should hardlink cu to tip.  The options set is not
:>    compatible, it will only add confusion.
:
:What if it checks at its progname and changes its working model accordingly?
:
:-- 
:Jeroen Ruigrok van der Werven <asmodai(at)wxs.nl> / asmodai / kita no mono

    Well, our current tip will do that with minor fixes.  It looks like a
    #define for INCLUDE_CU_INTERFACE in tip/tipconf.h has to be set to 1
    and a goto label has to be uncommented in tip.c.

    The OpenBSD code looks substantially similar to our current code.

    I guess it would be ok to make the (minor) required adjustments to
    our existing code, and then hardlink it.  It would probably be overkill
    to import the OpenBSD code.

					-Matt
					Matthew Dillon 
					<dillon@xxxxxxxxxxxxx>


Index: tip/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/tip/tip/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- tip/Makefile	17 Jun 2003 04:29:32 -0000	1.2
+++ tip/Makefile	28 Aug 2004 17:03:07 -0000
@@ -18,7 +18,8 @@
 PROG=	tip
 DPADD=	${LIBACU} ${LIBUTIL}
 LDADD=	${LIBACU} -lutil
-LINKS=	${BINDIR}/tip
+LINKS=  ${BINDIR}/tip ${BINDIR}/cu
+MLINKS= tip.1 cu.1
 MAN=	tip.1 modems.5
 SRCS=	acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c \
 	remote.c tip.c tipout.c value.c vars.c
@@ -27,7 +28,7 @@
 BINOWN=		uucp
 BINGRP=		dialer
 #BINMODE?=	4510
-INSTALLFLAGS=	-fschg
+#INSTALLFLAGS=	-fschg
 
 # XXX: there is some concern that `tip' in its current state shouldn't run
 #      SUID.  If it believed it should, the mode above may still no be proper.
Index: tip/tip.c
===================================================================
RCS file: /cvs/src/usr.bin/tip/tip/tip.c,v
retrieving revision 1.4
diff -u -r1.4 tip.c
--- tip/tip.c	19 Aug 2004 23:26:12 -0000	1.4
+++ tip/tip.c	28 Aug 2004 16:57:35 -0000
@@ -212,7 +212,7 @@
 	}
 	if (!HW)
 		ttysetup(i);
-/* cucommon:*/
+cucommon:
 	/*
 	 * From here down the code is shared with
 	 * the "cu" version of tip.
Index: tip/tipconf.h
===================================================================
RCS file: /cvs/src/usr.bin/tip/tip/tipconf.h,v
retrieving revision 1.1
diff -u -r1.1 tipconf.h
--- tip/tipconf.h	17 Jun 2003 02:56:30 -0000	1.1
+++ tip/tipconf.h	28 Aug 2004 16:57:12 -0000
@@ -117,7 +117,7 @@
 	Include cu interface so that, when tip is linked to cu and then
 	invoked as cu, it behaves like cu.
 */
-#define INCLUDE_CU_INTERFACE 0
+#define INCLUDE_CU_INTERFACE 1
 
 #endif