projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more fixes from rick adams
[unix-history]
/
usr
/
src
/
usr.bin
/
uucp
/
includes
/
uucp.h
diff --git
a/usr/src/usr.bin/uucp/includes/uucp.h
b/usr/src/usr.bin/uucp/includes/uucp.h
index
e6ff396
..
f5b2211
100644
(file)
--- a/
usr/src/usr.bin/uucp/includes/uucp.h
+++ b/
usr/src/usr.bin/uucp/includes/uucp.h
@@
-1,4
+1,4
@@
-/* uucp.h 5.
8 85/06/24
*/
+/* uucp.h 5.
10 86/01/06
*/
#include <stdio.h>
#include <stdio.h>
@@
-57,33
+57,35
@@
* Define the various kinds of connections to include.
* The complete list is in the condevs array in condevs.c
*/
* Define the various kinds of connections to include.
* The complete list is in the condevs array in condevs.c
*/
-#define DN11 /* standard dialer */
-/*#define DATAKIT /* ATT's datakit */
-/*#define PNET /* Purdue network */
+#define BSDTCP /* 4.2bsd or 2.9bsd TCP/IP */
+/* #define DATAKIT /* ATT's datakit */
#define DF02 /* Dec's DF02/DF03 */
#define DF112 /* Dec's DF112 */
#define DF02 /* Dec's DF02/DF03 */
#define DF112 /* Dec's DF112 */
+#define DN11 /* "standard" DEC dialer */
#define HAYES /* Hayes' Smartmodem */
#define HAYES /* Hayes' Smartmodem */
-#define VENTEL /* Ventel Dialer */
+/* #define MICOM /* Micom Mux port */
+#define NOVATION /* Novation modem */
+#define PAD /* X.25 PAD */
#define PENRIL /* PENRIL Dialer */
#define PENRIL /* PENRIL Dialer */
-#define VADIC /* Racal-Vadic 345x */
+/* #define PNET /* Purdue network */
+#define RVMACS /* Racal-Vadic MACS 820 dialer, 831 adaptor */
+/* #define SYTEK /* Sytek Local Area Net */
+/* #define UNETTCP /* 3Com's UNET */
#define VA212 /* Racal-Vadic 212 */
#define VA811S /* Racal-Vadic 811S dialer, 831 adaptor */
#define VA820 /* Racal-Vadic 820 dialer, 831 adaptor */
#define VA212 /* Racal-Vadic 212 */
#define VA811S /* Racal-Vadic 811S dialer, 831 adaptor */
#define VA820 /* Racal-Vadic 820 dialer, 831 adaptor */
-#define RVMACS /* Racal-Vadic MACS 820 dialer, 831 adaptor */
+#define VADIC /* Racal-Vadic 345x */
+#define VENTEL /* Ventel Dialer */
#define VMACS /* Racal-Vadic MACS 811 dialer, 831 adaptor */
#define VMACS /* Racal-Vadic MACS 811 dialer, 831 adaptor */
-/*#define UNETTCP /* 3Com's UNET */
-#define BSDTCP /* 4.2bsd or 2.9bsd TCP/IP */
-#define PAD /* X.25 PAD */
-/*#define MICOM /* micom mux port */
-#define NOVATION /* Novation modem */
#if defined(UNETTCP) || defined(BSDTCP)
#define TCPIP
#endif
#if defined(UNETTCP) || defined(BSDTCP)
#define TCPIP
#endif
-#if defined(VENTEL) || defined(NOVATION) || defined(DF112) || defined(PENRIL)
/*
/*
- * We need a timer to write slowly to ventels.
+ * We need a timer to write slowly to certain modems.
+ * and for generating breaks.
+ *
* define INTERVALTIMER to use 4.[23] bsd interval timer.
* define FASTTIMER if you have the nap() system call.
* define FTIME if you have the ftime() system call.
* define INTERVALTIMER to use 4.[23] bsd interval timer.
* define FASTTIMER if you have the nap() system call.
* define FTIME if you have the ftime() system call.
@@
-91,7
+93,9
@@
* Look at uucpdelay() in condevs.c for details.
*/
#define INTERVALTIMER
* Look at uucpdelay() in condevs.c for details.
*/
#define INTERVALTIMER
-#endif VENTEL || NOVATION || DF112 || PENRIL
+/*#define FASTTIMER /**/
+/*#define FTIME /**/
+/*#define BUSYLOOP /**/
/*
* If your site is using "ndir.h" to retrofit the Berkeley
/*
* If your site is using "ndir.h" to retrofit the Berkeley
@@
-169,7
+173,7
@@
/*
* Traditionally LCK (lock) files have been kept in /usr/spool/uucp.
* If you want that define LOCKDIR to be ".".
/*
* Traditionally LCK (lock) files have been kept in /usr/spool/uucp.
* If you want that define LOCKDIR to be ".".
- * If you want the locks kept in a subdirectory, define LOCKDIR as "LCK
.
".
+ * If you want the locks kept in a subdirectory, define LOCKDIR as "LCK".
* Good news about LCK. subdirectory: the directory can be mode 777 so
* unprivileged programs can share the uucp locking system,
* and the subdirectory keeps down clutter in the main directory.
* Good news about LCK. subdirectory: the directory can be mode 777 so
* unprivileged programs can share the uucp locking system,
* and the subdirectory keeps down clutter in the main directory.
@@
-177,10
+181,10
@@
* know where the LCK files are kept, and you have to change your /etc/rc
* if your rc cleans out the lock files (as it should).
*/
* know where the LCK files are kept, and you have to change your /etc/rc
* if your rc cleans out the lock files (as it should).
*/
-/*#define LOCKDIR "LCK
."
/**/
+/*#define LOCKDIR "LCK
"
/**/
#define LOCKDIR "." /**/
#define LOCKDIR "." /**/
-/*
+/*
* If you want uucp and uux to copy the data files by default,
* don't define DONTCOPY (This is the way older 4bsd uucps worked)
* If you want uucp and uux to use the original files instead of
* If you want uucp and uux to copy the data files by default,
* don't define DONTCOPY (This is the way older 4bsd uucps worked)
* If you want uucp and uux to use the original files instead of
@@
-215,11
+219,11
@@
#define ALIASFILE "/usr/lib/uucp/L.aliases"
#define SPOOL "/usr/spool/uucp"
#define ALIASFILE "/usr/lib/uucp/L.aliases"
#define SPOOL "/usr/spool/uucp"
-#define SQLOCK "
LCK.
SQ"
+#define SQLOCK "SQ"
#define SYSLOG "/usr/spool/uucp/SYSLOG"
#define PUBDIR "/usr/spool/uucppublic"
#define SYSLOG "/usr/spool/uucp/SYSLOG"
#define PUBDIR "/usr/spool/uucppublic"
-#define SEQLOCK "
LCK.
SEQL"
+#define SEQLOCK "SEQL"
#define CMDPRE 'C'
#define DATAPRE 'D'
#define XQTPRE 'X'
#define CMDPRE 'C'
#define DATAPRE 'D'
#define XQTPRE 'X'
@@
-242,6
+246,9
@@
#define ASSERT(e, s1, s2, i1) if (!(e)) {assert(s1, s2, i1);cleanup(FAIL);}else
#define ASSERT(e, s1, s2, i1) if (!(e)) {assert(s1, s2, i1);cleanup(FAIL);}else
+#define delock(dev) rmlock(dev)
+#define mlock(dev) ulockf(dev, SLCKTIME)
+
#define SAME 0
#define ANYREAD 0004
#define ANYWRITE 02
#define SAME 0
#define ANYREAD 0004
#define ANYWRITE 02
@@
-330,7
+337,7
@@
struct Devices {
#define X_NONOTI 'N'
#define X_RETURNTO 'R'
#define X_NONZERO 'Z'
#define X_NONOTI 'N'
#define X_RETURNTO 'R'
#define X_NONZERO 'Z'
-#define X_LOCK "
LCK.
XQT"
+#define X_LOCK "XQT"
#define X_LOCKTIME 3600L
#define WKDSIZE 100 /* size of work dir name */
#define X_LOCKTIME 3600L
#define WKDSIZE 100 /* size of work dir name */
@@
-368,7
+375,6
@@
extern int IsTcpIp;
extern char Progname[];
extern int (*CU_end)();
extern struct condev condevs[];
extern char Progname[];
extern int (*CU_end)();
extern struct condev condevs[];
-extern int nologinflag;
extern char NOLOGIN[];
extern char DLocal[], DLocalX[], *subfile(), *subdir();
extern char NOLOGIN[];
extern char DLocal[], DLocalX[], *subfile(), *subdir();