Permalink
Browse files

OpenBSD 3.5

  • Loading branch information...
1 parent b04daae commit e5d3946da323848c479c3307d8abd32db6e394f4 itojun committed May 27, 2004
Showing with 6,636 additions and 775 deletions.
  1. +6 −3 openbsd/bin/ls/ls.1
  2. +10 −6 openbsd/bin/ls/print.c
  3. +25 −9 openbsd/include/Makefile
  4. +3 −3 openbsd/include/arpa/inet.h
  5. +22 −9 openbsd/include/arpa/nameser.h
  6. +3 −1 openbsd/include/arpa/tftp.h
  7. +11 −11 openbsd/include/bm.h
  8. +33 −21 openbsd/include/ctype.h
  9. +35 −33 openbsd/include/db.h
  10. +4 −4 openbsd/include/fts.h
  11. +2 −2 openbsd/include/ifaddrs.h
  12. +8 −3 openbsd/include/kvm.h
  13. +8 −8 openbsd/include/link.h
  14. +2 −2 openbsd/include/link_aout.h
  15. +4 −4 openbsd/include/login_cap.h
  16. +14 −7 openbsd/include/md4.h
  17. +14 −7 openbsd/include/md5.h
  18. +14 −14 openbsd/include/mpool.h
  19. +3 −1 openbsd/include/poll.h
  20. +20 −18 openbsd/include/protocols/talkd.h
  21. +67 −59 openbsd/include/resolv.h
  22. +18 −11 openbsd/include/rmd160.h
  23. +6 −5 openbsd/include/rpc/auth.h
  24. +7 −7 openbsd/include/rpc/auth_unix.h
  25. +36 −36 openbsd/include/rpc/clnt.h
  26. +12 −10 openbsd/include/rpc/pmap_clnt.h
  27. +12 −12 openbsd/include/rpc/pmap_prot.h
  28. +4 −4 openbsd/include/rpc/pmap_rmt.h
  29. +3 −3 openbsd/include/rpc/rpc_msg.h
  30. +18 −17 openbsd/include/rpc/svc.h
  31. +35 −30 openbsd/include/rpc/xdr.h
  32. +82 −82 openbsd/include/rpcsvc/yp_prot.h
  33. +4 −4 openbsd/include/rpcsvc/ypclnt.h
  34. +17 −10 openbsd/include/sha1.h
  35. +3 −1 openbsd/include/stdlib.h
  36. +4 −1 openbsd/include/unistd.h
  37. +122 −7 openbsd/sbin/ifconfig/ifconfig.8
  38. +388 −41 openbsd/sbin/ifconfig/ifconfig.c
  39. +4,909 −0 openbsd/sbin/route/parse.y
  40. +45 −15 openbsd/sbin/route/route.c
  41. +5 −3 openbsd/sbin/sysctl/pathconf.c
  42. +51 −16 openbsd/sbin/sysctl/sysctl.8
  43. +91 −51 openbsd/sbin/sysctl/sysctl.c
  44. +3 −2 openbsd/usr.bin/fstat/fstat.1
  45. +16 −18 openbsd/usr.bin/fstat/fstat.c
  46. +3 −3 openbsd/usr.bin/netstat/atalk.c
  47. +5 −5 openbsd/usr.bin/netstat/if.c
  48. +122 −8 openbsd/usr.bin/netstat/inet.c
  49. +4 −3 openbsd/usr.bin/netstat/inet6.c
  50. +3 −3 openbsd/usr.bin/netstat/ipx.c
  51. +4 −4 openbsd/usr.bin/netstat/iso.c
  52. +18 −6 openbsd/usr.bin/netstat/main.c
  53. +37 −15 openbsd/usr.bin/netstat/netstat.1
  54. +3 −1 openbsd/usr.bin/netstat/netstat.h
  55. +46 −11 openbsd/usr.bin/netstat/route.c
  56. +6 −7 openbsd/usr.bin/netstat/unix.c
  57. +50 −14 openbsd/usr.bin/systat/iostat.c
  58. +3 −5 openbsd/usr.bin/systat/main.c
  59. +15 −18 openbsd/usr.bin/systat/pigs.c
  60. +15 −5 openbsd/usr.bin/systat/systat.1
  61. +11 −5 openbsd/usr.bin/systat/vmstat.c
  62. +77 −40 openbsd/usr.bin/vmstat/dkstats.c
  63. +5 −3 openbsd/usr.bin/vmstat/dkstats.h
  64. +4 −3 openbsd/usr.bin/vmstat/vmstat.8
  65. +6 −5 openbsd/usr.bin/vmstat/vmstat.c
View
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ls.1,v 1.39 2003/09/02 18:09:43 jmc Exp $
+.\" $OpenBSD: ls.1,v 1.40 2003/12/08 11:33:01 jmc Exp $
.\" $NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -93,8 +93,11 @@ and a vertical bar
.Pq Sq \&|
after each that is a FIFO.
.It Fl L
-If argument is a symbolic link, list the file or directory the link references
-rather than the link itself.
+If argument is a symbolic link, evaluate the file information and file type
+to be those of the file referenced by the link, and not the link itself;
+however,
+.Nm
+writes the name of the link itself and not the file referenced by the link.
.It Fl R
Recursively list subdirectories encountered.
.It Fl S
View
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.20 2003/08/06 19:09:09 tedu Exp $ */
+/* $OpenBSD: print.c,v 1.22 2003/09/26 00:48:44 deraadt Exp $ */
/* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */
/*
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.5 (Berkeley) 7/28/94";
#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.20 2003/08/06 19:09:09 tedu Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.22 2003/09/26 00:48:44 deraadt Exp $";
#endif
#endif /* not lint */
@@ -168,7 +168,7 @@ printcol(DISPLAY *dp)
int base, chcnt, col, colwidth, num;
int numcols, numrows, row;
- if ( (colwidth = compute_columns(dp, &numcols)) == 0)
+ if ((colwidth = compute_columns(dp, &numcols)) == 0)
return;
/*
* Have to do random access in the linked list -- build a table
@@ -177,11 +177,15 @@ printcol(DISPLAY *dp)
if (dp->entries > lastentries) {
FTSENT **a;
- if ((a =
- realloc(array, dp->entries * sizeof(FTSENT *))) == NULL) {
+ if ((a = realloc(array, dp->entries * sizeof(FTSENT *))) ==
+ NULL) {
+ free(array);
+ array = NULL;
+ dp->entries = 0;
+ lastentries = -1;
warn(NULL);
printscol(dp);
- return;
+ return;
}
lastentries = dp->entries;
array = a;
View
@@ -1,13 +1,16 @@
-# $OpenBSD: Makefile,v 1.121 2003/07/21 21:13:18 millert Exp $
+# $OpenBSD: Makefile,v 1.125 2004/03/08 23:31:51 drahn Exp $
# $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
# @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91
# The ``rm -rf''s used below are safe because rm doesn't follow symbolic
# links.
-# Missing: mp.h
+.include <bsd.own.mk>
+USE_GCC3?=No
+
+# Missing: mp.h
FILES= a.out.h ar.h assert.h bitstring.h blf.h bm.h bsd_auth.h cast.h \
cpio.h ctype.h curses.h db.h dbm.h des.h dirent.h disktab.h \
dlfcn.h elf_abi.h err.h fnmatch.h fstab.h fts.h ftw.h getopt.h \
@@ -26,8 +29,8 @@ FILES+= link.h link_aout.h link_elf.h
FILES+= ieeefp.h
.endif
-MFILES= float.h frame.h stdarg.h varargs.h
-LFILES= errno.h fcntl.h syslog.h termios.h
+MFILES= float.h frame.h
+LFILES= errno.h fcntl.h syslog.h termios.h stdarg.h varargs.h
DIRS= arpa protocols rpc rpcsvc
LDIRS= crypto ddb dev isofs miscfs net netatalk netccitt netinet altq \
@@ -47,18 +50,31 @@ RDIRS= ../lib/libpthread ../lib/libcompat ../lib/libcurses \
PRDIRS=
# Directories with an includes target that use Makefile.bsd-wrapper
-WDIRS= ../usr.sbin/httpd ../gnu/egcs/libio ../gnu/egcs/libstdc++ \
- ../gnu/egcs/libf2c ../gnu/egcs/libobjc ../gnu/egcs/gcc \
- ../gnu/usr.bin/binutils
+WDIRS= ../usr.sbin/httpd
+.if ${MACHINE_ARCH} != "arm"
+WDIRS+= ../gnu/usr.bin/binutils
+.endif
# Places using Makefile.bsd-wrapper that needs a prerequisite target met
# before includes
-PWDIRS= ../usr.sbin/httpd ../gnu/egcs/libf2c ../gnu/usr.bin/binutils
+PWDIRS= ../usr.sbin/httpd
+.if ${MACHINE_ARCH} != "arm"
+PWDIRS+= ../gnu/usr.bin/binutils
+.endif
+
+.if ${USE_GCC3:L} == "yes"
+WDIRS+= ../gnu/lib/libstdc++ ../gnu/usr.bin/gcc ../gnu/lib/libobjc \
+ ../gnu/lib/libf2c
+PWDIRS+= ../gnu/lib/libstdc++ ../gnu/lib/libf2c
+.else
+WDIRS+= ../gnu/egcs/libio ../gnu/egcs/libstdc++ \
+ ../gnu/egcs/libf2c ../gnu/egcs/libobjc ../gnu/egcs/gcc
+PWDIRS+= ../gnu/egcs/libf2c
+.endif
NOOBJ= noobj
# Change SYS_INCLUDE in bsd.own.mk to "symlinks" if you don't want copies
-.include <bsd.own.mk>
SYS_INCLUDE?= copies
.if ${KERBEROS5:L} == "yes"
RDIRS+= ../lib/libkrb5 ../lib/libgssapi ../lib/libkadm5srv
@@ -1,4 +1,4 @@
-/* $OpenBSD: inet.h,v 1.9 2003/08/01 17:38:33 avsm Exp $ */
+/* $OpenBSD: inet.h,v 1.10 2004/01/22 21:48:02 espie Exp $ */
/*
* ++Copyright++ 1983, 1993
@@ -86,8 +86,8 @@ char *inet_ntoa(struct in_addr);
int inet_pton(int, const char *, void *);
const char *inet_ntop(int, const void *, char *, size_t)
__attribute__ ((__bounded__(__string__,3,4)));
-u_int inet_nsap_addr(const char *, u_char *, int);
-char *inet_nsap_ntoa(int, const u_char *, char *);
+unsigned int inet_nsap_addr(const char *, unsigned char *, int);
+char *inet_nsap_ntoa(int, const unsigned char *, char *);
__END_DECLS
#endif /* !_INET_H_ */
@@ -1,4 +1,4 @@
-/* $OpenBSD: nameser.h,v 1.8 2003/06/02 19:34:12 millert Exp $ */
+/* $OpenBSD: nameser.h,v 1.10 2004/01/22 21:48:02 espie Exp $ */
/*
* ++Copyright++ 1983, 1989, 1993
@@ -179,13 +179,26 @@
#define T_SRV 33 /* Server selection */
#define T_ATMA 34 /* ATM Address */
#define T_NAPTR 35 /* Naming Authority PoinTeR */
+#define T_KX 36 /* Key Exchanger */
+#define T_CERT 37 /* CERT */
+#define T_A6 38 /* A6 */
+#define T_DNAME 39 /* DNAME */
+#define T_SINK 40 /* SINK */
#define T_OPT 41 /* OPT pseudo-RR, RFC2671 */
+#define T_APL 42 /* APL */
+#define T_DS 43 /* Delegation Signer */
+#define T_SSHFP 44 /* SSH Key Fingerprint */
+#define T_RRSIG 46 /* RRSIG */
+#define T_NSEC 47 /* NSEC */
+#define T_DNSKEY 48 /* DNSKEY */
/* non standard */
#define T_UINFO 100 /* user (finger) information */
#define T_UID 101 /* user ID */
#define T_GID 102 /* group ID */
#define T_UNSPEC 103 /* Unspecified format (binary data) */
/* Query type values which do not appear in resource records */
+#define T_TKEY 249 /* Transaction Key */
+#define T_TSIG 250 /* Transaction Signature */
#define T_IXFR 251 /* incremental zone transfer */
#define T_AXFR 252 /* transfer zone of authority */
#define T_MAILB 253 /* transfer mailbox records */
@@ -348,8 +361,8 @@ typedef struct {
*/
#define INDIR_MASK 0xc0
-extern u_int16_t _getshort(const u_char *);
-extern u_int32_t _getlong(const u_char *);
+extern u_int16_t _getshort(const unsigned char *);
+extern u_int32_t _getlong(const unsigned char *);
/*
* Inline versions of get/put short/long. Pointer is advanced.
@@ -358,15 +371,15 @@ extern u_int32_t _getlong(const u_char *);
* portable or it can be elegant but rarely both.
*/
#define GETSHORT(s, cp) { \
- register u_char *t_cp = (u_char *)(cp); \
+ unsigned char *t_cp = (unsigned char *)(cp); \
(s) = ((u_int16_t)t_cp[0] << 8) \
| ((u_int16_t)t_cp[1]) \
; \
(cp) += INT16SZ; \
}
#define GETLONG(l, cp) { \
- register u_char *t_cp = (u_char *)(cp); \
+ unsigned char *t_cp = (unsigned char *)(cp); \
(l) = ((u_int32_t)t_cp[0] << 24) \
| ((u_int32_t)t_cp[1] << 16) \
| ((u_int32_t)t_cp[2] << 8) \
@@ -376,16 +389,16 @@ extern u_int32_t _getlong(const u_char *);
}
#define PUTSHORT(s, cp) { \
- register u_int16_t t_s = (u_int16_t)(s); \
- register u_char *t_cp = (u_char *)(cp); \
+ u_int16_t t_s = (u_int16_t)(s); \
+ unsigned char *t_cp = (unsigned char *)(cp); \
*t_cp++ = t_s >> 8; \
*t_cp = t_s; \
(cp) += INT16SZ; \
}
#define PUTLONG(l, cp) { \
- register u_int32_t t_l = (u_int32_t)(l); \
- register u_char *t_cp = (u_char *)(cp); \
+ u_int32_t t_l = (u_int32_t)(l); \
+ unsigned char *t_cp = (unsigned char *)(cp); \
*t_cp++ = t_l >> 24; \
*t_cp++ = t_l >> 16; \
*t_cp++ = t_l >> 8; \
@@ -1,4 +1,4 @@
-/* $OpenBSD: tftp.h,v 1.4 2003/06/02 19:34:12 millert Exp $ */
+/* $OpenBSD: tftp.h,v 1.5 2004/01/27 02:25:30 deraadt Exp $ */
/* $NetBSD: tftp.h,v 1.3 1994/10/26 00:56:48 cgd Exp $ */
/*
@@ -48,6 +48,7 @@
#define DATA 03 /* data packet */
#define ACK 04 /* acknowledgement */
#define ERROR 05 /* error code */
+#define OACK 06 /* option acknowledgement */
struct tftphdr {
u_int16_t th_opcode; /* packet type */
@@ -75,5 +76,6 @@ struct tftphdr {
#define EBADID 5 /* unknown transfer ID */
#define EEXISTS 6 /* file already exists */
#define ENOUSER 7 /* no such user */
+#define EOPTNEG 8 /* option negotiation failed */
#endif /* !_TFTP_H_ */
View
@@ -1,4 +1,4 @@
-/* $OpenBSD: bm.h,v 1.7 2003/08/01 17:38:33 avsm Exp $ */
+/* $OpenBSD: bm.h,v 1.8 2004/01/22 21:48:02 espie Exp $ */
/* $NetBSD: bm.h,v 1.3 1994/10/26 00:55:46 cgd Exp $ */
/*-
@@ -39,21 +39,21 @@
#define _BM_H_
typedef struct {
- u_char *pat; /* pattern */
- size_t patlen; /* pattern length */
- size_t *delta; /* skip delta */
- int rarec; /* rare character */
- size_t rareoff; /* rare offset */
- size_t md2; /* mini delta */
+ unsigned char *pat; /* pattern */
+ size_t patlen; /* pattern length */
+ size_t *delta; /* skip delta */
+ int rarec; /* rare character */
+ size_t rareoff; /* rare offset */
+ size_t md2; /* mini delta */
} bm_pat;
#include <sys/cdefs.h>
__BEGIN_DECLS
-bm_pat *bm_comp(u_char const *, size_t, u_char const *);
-u_char *bm_exec(bm_pat *, u_char *, size_t)
- __attribute__ ((__bounded__(__string__,2,3)));
-void bm_free(bm_pat *);
+bm_pat *bm_comp(unsigned char const *, size_t, unsigned char const *);
+unsigned char *bm_exec(bm_pat *, unsigned char *, size_t)
+ __attribute__ ((__bounded__(__string__,2,3)));
+void bm_free(bm_pat *);
__END_DECLS
#endif /* !_BM_H_ */
Oops, something went wrong.

0 comments on commit e5d3946

Please sign in to comment.