Virgin import of LBL traceroute v1.4a12

2 files changed, 6 insertions, 95 deletions

diff --git a/contrib/traceroute/lbl/os-solaris2.h b/contrib/traceroute/lbl/os-solaris2.h
index fb13516..2b35594 100644
--- a/contrib/traceroute/lbl/os-solaris2.h
+++ b/contrib/traceroute/lbl/os-solaris2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1993, 1994, 1995, 1996
+ * Copyright (c) 1993, 1994, 1995, 1996, 1997, 2000
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,23 +18,13 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: os-solaris2.h,v 1.16 96/07/05 22:11:23 leres Locked $ (LBL)
+ * @(#) $Id: os-solaris2.h,v 1.18 1997/10/01 01:10:22 leres Exp leres $ (LBL)
  */
 
-/* Signal routines are this type */
-#define SIGRET void
-/* Signal routines use "return SIGRETVAL;" */
-#define SIGRETVAL
-/* The wait() status variable is this type */
-#define WAITSTATUS int
-
-#define major(x)	((int)(((unsigned)(x)>>8)&0377))
-#define minor(x)	((int)((x)&0377))
-
 /* Prototypes missing in SunOS 5 */
 int	daemon(int, int);
-int	dn_expand(u_char *, u_char *, u_char *, u_char *, int);
-int	dn_skipname(u_char *, u_char *);
+int	dn_expand(const u_char *, const u_char *, const u_char *, char *, int);
+int	dn_skipname(const u_char *, const u_char *);
 int	flock(int, int);
 int	getdtablesize(void);
 int	gethostname(char *, int);
@@ -47,7 +37,7 @@ struct	utmp;
 void	login(struct utmp *);
 #endif
 int	logout(const char *);
-int	res_query(char *, int, int, u_char *, int);
+int	res_query(const char *, int, int, u_char *, int);
 int	setenv(const char *, const char *, int);
 #if defined(_STDIO_H) && defined(HAVE_SETLINEBUF)
 int	setlinebuf(FILE *);
@@ -58,60 +48,3 @@ char    *strerror(int);
 int	snprintf(char *, size_t, const char *, ...);
 int	strcasecmp(const char *, const char *);
 void	unsetenv(const char *);
-#ifdef __STDC__
-struct	timeval;
-#endif
-int	utimes(const char *, struct timeval *);
-
-/* Solaris signal compat */
-#ifndef sigmask
-#define sigmask(m)	(1 << ((m)-1))
-#endif
-#ifndef signal
-#define signal(s, f)	sigset(s, f)
-#endif
-
-/* Solaris random compat */
-#ifndef srandom
-#define srandom(seed) srand48((long)seed)
-#endif
-#ifndef random
-#define random() lrand48()
-#endif
-
-#ifdef notdef
-#ifndef CBREAK
-#define CBREAK	O_CBREAK
-#define CRMOD	O_CRMOD
-#define RAW	O_RAW
-#define TBDELAY	O_TBDELAY
-#endif
-#endif
-
-#ifndef TIOCPKT_DATA
-#define		TIOCPKT_DATA		0x00	/* data packet */
-#define		TIOCPKT_FLUSHREAD	0x01	/* flush packet */
-#define		TIOCPKT_FLUSHWRITE	0x02	/* flush packet */
-#define		TIOCPKT_STOP		0x04	/* stop output */
-#define		TIOCPKT_START		0x08	/* start output */
-#define		TIOCPKT_NOSTOP		0x10	/* no more ^S, ^Q */
-#define		TIOCPKT_DOSTOP		0x20	/* now do ^S ^Q */
-#define		TIOCPKT_IOCTL		0x40	/* state change of pty driver */
-#endif
-
-#ifndef STDERR_FILENO
-#define STDERR_FILENO 2
-#define STDOUT_FILENO 1
-#define STDIN_FILENO 0
-#endif
-
-#ifndef FD_SET
-#define FD_SET(n, p)	((p)->fds_bits[0] |= (1<<(n)))
-#define FD_CLR(n, p)	((p)->fds_bits[0] &= ~(1<<(n)))
-#define FD_ISSET(n, p)	((p)->fds_bits[0] & (1<<(n)))
-#define FD_ZERO(p)	((p)->fds_bits[0] = 0)
-#endif
-
-#ifndef S_ISTXT
-#define S_ISTXT S_ISVTX
-#endif
diff --git a/contrib/traceroute/lbl/os-sunos4.h b/contrib/traceroute/lbl/os-sunos4.h
index 7733d941..667fdb8 100644
--- a/contrib/traceroute/lbl/os-sunos4.h
+++ b/contrib/traceroute/lbl/os-sunos4.h
@@ -18,13 +18,9 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: os-sunos4.h,v 1.31 96/06/24 02:39:07 leres Exp $ (LBL)
+ * @(#) $Header: os-sunos4.h,v 1.32 96/11/29 15:18:18 leres Exp $ (LBL)
  */
 
-#define SIGRET void
-#define SIGRETVAL
-#define WAITSTATUS int
-
 /* Prototypes missing in SunOS 4 */
 #ifdef FILE
 int	_filbuf(FILE *);
@@ -201,14 +197,6 @@ int	wait(int *);
 pid_t	wait3(int *, int, struct rusage *);
 #endif
 
-extern	int opterr, optind, optopt;
-extern	char *optarg;
-
-/* Map protocol types */
-#define ETHERPUP_IPTYPE ETHERTYPE_IP
-#define ETHERPUP_REVARPTYPE ETHERTYPE_REVARP
-#define ETHERPUP_ARPTYPE ETHERTYPE_ARP
-
 /* Ugly signal hacking */
 #ifdef SIG_ERR
 #undef SIG_ERR
@@ -225,13 +213,3 @@ extern	char *optarg;
 #undef SIG_HOLD
 #define SIG_HOLD	(void (*)(int))3
 #endif
-
-#ifndef S_ISTXT
-#define S_ISTXT S_ISVTX
-#endif
-
-#ifndef S_IRWXU
-#define S_IRWXU 0000700			/* RWX mask for owner */
-#define S_IRWXG 0000070			/* RWX mask for group */
-#define S_IRWXO 0000007			/* RWX mask for other */
-#endif