CVS commit: src/usr.bin/fstat
Module Name:src
Committed By: lukem
Date: Sun Apr 12 06:36:12 UTC 2009
Modified Files:
src/usr.bin/fstat: fstat.c fstat.h isofs.c misc.c ntfs.c ptyfs.c
tmpfs.c
Log Message:
Fix sign-compare issues.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/usr.bin/fstat/fstat.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/fstat/fstat.h
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/fstat/isofs.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/fstat/misc.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/fstat/ntfs.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/fstat/ptyfs.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/fstat/tmpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/fstat/fstat.c
diff -u src/usr.bin/fstat/fstat.c:1.87 src/usr.bin/fstat/fstat.c:1.88
--- src/usr.bin/fstat/fstat.c:1.87 Mon Dec 29 00:59:08 2008
+++ src/usr.bin/fstat/fstat.c Sun Apr 12 06:36:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fstat.c,v 1.87 2008/12/29 00:59:08 christos Exp $ */
+/* $NetBSD: fstat.c,v 1.88 2009/04/12 06:36:12 lukem Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)fstat.c 8.3 (Berkeley) 5/2/95;
#else
-__RCSID($NetBSD: fstat.c,v 1.87 2008/12/29 00:59:08 christos Exp $);
+__RCSID($NetBSD: fstat.c,v 1.88 2009/04/12 06:36:12 lukem Exp $);
#endif
#endif /* not lint */
@@ -519,7 +519,7 @@
(void)snprintf(mode, sizeof mode, %o, fst.mode);
else
strmode(fst.mode, mode);
- (void)printf( %7lu %*s, (unsigned long)fst.fileid, nflg ? 5 : 10, mode);
+ (void)printf( %7PRIu64 %*s, fst.fileid, nflg ? 5 : 10, mode);
switch (vn.v_type) {
case VBLK:
case VCHR: {
@@ -580,7 +580,7 @@
}
fsp-fsid = inode.i_dev 0x;
- fsp-fileid = (long)inode.i_number;
+ fsp-fileid = inode.i_number;
fsp-mode = (mode_t)inode.i_mode;
fsp-size = inode.i_size;
@@ -599,7 +599,7 @@
return 0;
}
fsp-fsid = inode.i_dev 0x;
- fsp-fileid = (long)inode.i_number;
+ fsp-fileid = inode.i_number;
if (!KVM_READ(inode.i_e2fs_mode, mode, sizeof mode)) {
dprintf(can't read inode %p's mode at %p for pid %d, VTOI(vp),
Index: src/usr.bin/fstat/fstat.h
diff -u src/usr.bin/fstat/fstat.h:1.8 src/usr.bin/fstat/fstat.h:1.9
--- src/usr.bin/fstat/fstat.h:1.8 Tue Jul 22 22:58:04 2008
+++ src/usr.bin/fstat/fstat.h Sun Apr 12 06:36:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fstat.h,v 1.8 2008/07/22 22:58:04 christos Exp $ */
+/* $NetBSD: fstat.h,v 1.9 2009/04/12 06:36:12 lukem Exp $ */
/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,7 +30,7 @@
struct filestat {
long fsid;
- long fileid;
+ ino_t fileid;
mode_t mode;
off_t size;
dev_t rdev;
@@ -40,7 +40,8 @@
* a kvm_read that returns true if everything is read
*/
#define KVM_READ(kaddr, paddr, len) \
- (kvm_read(kd, (u_long)(kaddr), (void *)(paddr), (len)) == (len))
+ ((size_t)kvm_read(kd, (u_long)(kaddr), (void *)(paddr), (len)) \
+ == (size_t)(len))
#define KVM_NLIST(nl) \
kvm_nlist(kd, (nl))
#define KVM_GETERR() \
Index: src/usr.bin/fstat/isofs.c
diff -u src/usr.bin/fstat/isofs.c:1.6 src/usr.bin/fstat/isofs.c:1.7
--- src/usr.bin/fstat/isofs.c:1.6 Thu May 11 11:56:38 2006
+++ src/usr.bin/fstat/isofs.c Sun Apr 12 06:36:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isofs.c,v 1.6 2006/05/11 11:56:38 yamt Exp $ */
+/* $NetBSD: isofs.c,v 1.7 2009/04/12 06:36:12 lukem Exp $ */
/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: isofs.c,v 1.6 2006/05/11 11:56:38 yamt Exp $);
+__RCSID($NetBSD: isofs.c,v 1.7 2009/04/12 06:36:12 lukem Exp $);
#include sys/param.h
#include sys/time.h
@@ -54,7 +54,7 @@
return 0;
}
fsp-fsid = inode.i_dev 0x;
- fsp-fileid = (long)inode.i_number;
+ fsp-fileid = inode.i_number;
fsp-mode = inode.inode.iso_mode;
fsp-size = inode.i_size;
fsp-rdev = inode.i_dev;
Index: src/usr.bin/fstat/misc.c
diff -u src/usr.bin/fstat/misc.c:1.3 src/usr.bin/fstat/misc.c:1.4
--- src/usr.bin/fstat/misc.c:1.3 Thu Feb 26 17:30:51 2009
+++ src/usr.bin/fstat/misc.c Sun Apr 12 06:36:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.3 2009/02/26 17:30:51 christos Exp $ */
+/* $NetBSD: misc.c,v 1.4 2009/04/12 06:36:12 lukem Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: misc.c,v 1.3 2009/02/26 17:30:51 christos Exp $);
+__RCSID($NetBSD: misc.c,v 1.4 2009/04/12 06:36:12 lukem Exp $);
#include stdbool.h
#include sys/param.h
@@ -149,7 +149,7 @@
warnx(Could not find %d symbols, n);
}
for (i = 0; i NL_MAX; i++)
- if ((intptr_t)f-f_ops == nl[i].n_value)
+ if ((uintptr_t)f-f_ops == nl[i].n_value)
break;
switch (i) {
case NL_BPF:
Index: src/usr.bin/fstat/ntfs.c
diff -u src/usr.bin/fstat/ntfs.c:1.11 src/usr.bin/fstat/ntfs.c:1.12
---
CVS commit: src/usr.bin/ftp
char *port;
if (argc == 0)
goto usage;
@@ -808,7 +808,8 @@
void
updateremotecwd(void)
{
- int overbose, ocode, i;
+ int overbose, ocode;
+ size_t i;
char *cp;
overbose = verbose;
@@ -877,8 +878,8 @@
void
list_vertical(StringList *sl)
{
- int i, j;
- int columns, lines;
+ size_t i, j;
+ size_t columns, lines;
char *p;
size_t w, width;
@@ -1067,7 +1068,7 @@
void
ftpvis(char *dst, size_t dstlen, const char *src, size_t srclen)
{
- int di, si;
+ size_t di, si;
for (di = si = 0;
src[si] != '\0' di dstlen si srclen;
@@ -1097,7 +1098,8 @@
formatbuf(char *buf, size_t len, const char *src)
{
const char *p, *p2, *q;
- int i, op, updirs, pdirs;
+ size_t i;
+ int op, updirs, pdirs;
#define ADDBUF(x) do { \
if (i = len - 1) \
Index: src/usr.bin/ftp/version.h
diff -u src/usr.bin/ftp/version.h:1.77 src/usr.bin/ftp/version.h:1.78
--- src/usr.bin/ftp/version.h:1.77 Wed Aug 13 04:59:13 2008
+++ src/usr.bin/ftp/version.h Sun Apr 12 10:18:52 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: version.h,v 1.77 2008/08/13 04:59:13 lukem Exp $ */
+/* $NetBSD: version.h,v 1.78 2009/04/12 10:18:52 lukem Exp $ */
/*-
- * Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -34,5 +34,5 @@
#endif
#ifndef FTP_VERSION
-#define FTP_VERSION 20080813
+#define FTP_VERSION 20090412
#endif
CVS commit: src/usr.bin/getent
Module Name:src
Committed By: lukem
Date: Sun Apr 12 10:27:08 UTC 2009
Modified Files:
src/usr.bin/getent: getent.c
Log Message:
fix sign-compare issue
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/getent/getent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/getent/getent.c
diff -u src/usr.bin/getent/getent.c:1.15 src/usr.bin/getent/getent.c:1.16
--- src/usr.bin/getent/getent.c:1.15 Tue Feb 24 06:10:52 2009
+++ src/usr.bin/getent/getent.c Sun Apr 12 10:27:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: getent.c,v 1.15 2009/02/24 06:10:52 yamt Exp $ */
+/* $NetBSD: getent.c,v 1.16 2009/04/12 10:27:08 lukem Exp $ */
/*-
* Copyright (c) 2004-2006 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: getent.c,v 1.15 2009/02/24 06:10:52 yamt Exp $);
+__RCSID($NetBSD: getent.c,v 1.16 2009/04/12 10:27:08 lukem Exp $);
#endif /* not lint */
#include sys/socket.h
@@ -594,7 +594,8 @@
static const char sfx[] = =#:;
const char *db_array[] = { db, NULL };
char *b, *cap;
- int i, j, rv, c;
+ int i, rv, c;
+ size_t j;
int expand = 1, recurse = 0, pretty = 0;
assert(argc 1);
CVS commit: src/usr.bin/id
Module Name:src
Committed By: lukem
Date: Sun Apr 12 10:51:38 UTC 2009
Modified Files:
src/usr.bin/id: id.c
Log Message:
fix sign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/id/id.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/id/id.c
diff -u src/usr.bin/id/id.c:1.30 src/usr.bin/id/id.c:1.31
--- src/usr.bin/id/id.c:1.30 Mon Jul 21 14:19:23 2008
+++ src/usr.bin/id/id.c Sun Apr 12 10:51:38 2009
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)id.c 8.3 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: id.c,v 1.30 2008/07/21 14:19:23 lukem Exp $);
+__RCSID($NetBSD: id.c,v 1.31 2009/04/12 10:51:38 lukem Exp $);
#endif
#endif /* not lint */
@@ -291,7 +291,8 @@
group(struct passwd *pw, int nflag)
{
struct group *gr;
- int cnt, id, lastid, ngroups;
+ int cnt, ngroups;
+ gid_t id, lastid;
const char *fmt;
gid_t *glist = groups;
CVS commit: src/usr.bin/gencat
Module Name:src
Committed By: lukem
Date: Sun Apr 12 10:25:35 UTC 2009
Modified Files:
src/usr.bin/gencat: gencat.c
Log Message:
fix sign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/gencat/gencat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/gencat/gencat.c
diff -u src/usr.bin/gencat/gencat.c:1.27 src/usr.bin/gencat/gencat.c:1.28
--- src/usr.bin/gencat/gencat.c:1.27 Wed Feb 18 20:04:43 2009
+++ src/usr.bin/gencat/gencat.c Sun Apr 12 10:25:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gencat.c,v 1.27 2009/02/18 20:04:43 christos Exp $ */
+/* $NetBSD: gencat.c,v 1.28 2009/04/12 10:25:35 lukem Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(lint)
-__RCSID($NetBSD: gencat.c,v 1.27 2009/02/18 20:04:43 christos Exp $);
+__RCSID($NetBSD: gencat.c,v 1.28 2009/04/12 10:25:35 lukem Exp $);
#endif
/***
@@ -345,7 +345,7 @@
getmsg(int fd, char *cptr, char quote)
{
static char *msg = NULL;
- static long msglen = 0;
+ static size_t msglen = 0;
size_tclen, i;
char *tptr;
@@ -541,13 +541,14 @@
struct _nls_set_hdr *set_hdr;
struct _nls_msg_hdr *msg_hdr;
char *strings;
- int m, n, s;
+ ssize_t n;
+ int m, s;
int msgno, setno;
/* XXX init sethead? */
n = read(fd, cat_hdr, sizeof(cat_hdr));
- if (n sizeof(cat_hdr)) {
+ if (n (ssize_t)sizeof(cat_hdr)) {
if (n == 0)
return; /* empty file */
else if (n == -1)
@@ -566,7 +567,7 @@
if ((cat_hdr.__mem 0) ||
(cat_hdr.__msg_hdr_offset 0) ||
(cat_hdr.__msg_txt_offset 0) ||
- (cat_hdr.__mem (cat_hdr.__nsets * sizeof(struct _nls_set_hdr))) ||
+ (cat_hdr.__mem (int32_t)(cat_hdr.__nsets * sizeof(struct _nls_set_hdr))) ||
(cat_hdr.__mem cat_hdr.__msg_hdr_offset) ||
(cat_hdr.__mem cat_hdr.__msg_txt_offset))
errx(1, %s: catalog header, CORRUPT);
@@ -710,7 +711,7 @@
nmsgs = 0;
for (msg = set-msghead.lh_first; msg != NULL;
msg = msg-entries.le_next) {
- int msg_len = strlen(msg-str) + 1;
+ int32_t msg_len = strlen(msg-str) + 1;
msg_hdr-__msgno = htonl(msg-msgId);
msg_hdr-__msglen = htonl(msg_len);
CVS commit: src/usr.bin/gzip
Module Name:src
Committed By: lukem
Date: Sun Apr 12 10:31:14 UTC 2009
Modified Files:
src/usr.bin/gzip: gzip.c zuncompress.c
Log Message:
fix sign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/usr.bin/gzip/gzip.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/gzip/zuncompress.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.93 src/usr.bin/gzip/gzip.c:1.94
--- src/usr.bin/gzip/gzip.c:1.93 Sun Aug 3 09:25:05 2008
+++ src/usr.bin/gzip/gzip.c Sun Apr 12 10:31:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.93 2008/08/03 09:25:05 skrll Exp $ */
+/* $NetBSD: gzip.c,v 1.94 2009/04/12 10:31:14 lukem Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@@ -30,7 +30,7 @@
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\
Matthew R. Green. All rights reserved.);
-__RCSID($NetBSD: gzip.c,v 1.93 2008/08/03 09:25:05 skrll Exp $);
+__RCSID($NetBSD: gzip.c,v 1.94 2009/04/12 10:31:14 lukem Exp $);
#endif /* not lint */
/*
@@ -1263,7 +1263,7 @@
enum filetype method;
int fd, ofd, zfd = -1;
#ifndef SMALL
- int rv;
+ ssize_t rv;
time_t timestamp = 0;
unsigned char name[PATH_MAX + 1];
#endif
@@ -1311,7 +1311,7 @@
unsigned char ts[4]; /* timestamp */
rv = pread(fd, ts, sizeof ts, GZIP_TIMESTAMP);
- if (rv = 0 rv sizeof ts)
+ if (rv = 0 rv (ssize_t)(sizeof ts))
goto unexpected_EOF;
if (rv == -1) {
if (!fflag)
Index: src/usr.bin/gzip/zuncompress.c
diff -u src/usr.bin/gzip/zuncompress.c:1.6 src/usr.bin/gzip/zuncompress.c:1.7
--- src/usr.bin/gzip/zuncompress.c:1.6 Tue Nov 22 09:05:30 2005
+++ src/usr.bin/gzip/zuncompress.c Sun Apr 12 10:31:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: zuncompress.c,v 1.6 2005/11/22 09:05:30 mrg Exp $ */
+/* $NetBSD: zuncompress.c,v 1.7 2009/04/12 10:31:14 lukem Exp $ */
/*-
* Copyright (c) 1985, 1986, 1992, 1993
@@ -146,7 +146,7 @@
compressed_pre = NULL;
while ((bin = fread(buf, 1, sizeof(buf), in)) != 0) {
- if (tflag == 0 fwrite(buf, 1, bin, out) != bin) {
+ if (tflag == 0 (off_t)fwrite(buf, 1, bin, out) != bin) {
free(buf);
return -1;
}
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: tsutsui
Date: Sun Apr 12 11:10:29 UTC 2009
Modified Files:
src/sys/dev/sbus: if_le_ledma.c
Log Message:
Don't immediately switch UTP/AUI ports on lost carrior.
It may take a while for modern switches to set 10baseT media.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/sbus/if_le_ledma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sbus/if_le_ledma.c
diff -u src/sys/dev/sbus/if_le_ledma.c:1.30 src/sys/dev/sbus/if_le_ledma.c:1.31
--- src/sys/dev/sbus/if_le_ledma.c:1.30 Mon Apr 28 20:23:57 2008
+++ src/sys/dev/sbus/if_le_ledma.c Sun Apr 12 11:10:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_ledma.c,v 1.30 2008/04/28 20:23:57 martin Exp $ */
+/* $NetBSD: if_le_ledma.c,v 1.31 2009/04/12 11:10:28 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_le_ledma.c,v 1.30 2008/04/28 20:23:57 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_le_ledma.c,v 1.31 2009/04/12 11:10:28 tsutsui Exp $);
#include opt_inet.h
#include bpfilter.h
@@ -83,6 +83,8 @@
bus_space_handle_t sc_reg; /* LANCE registers */
struct lsi64854_softc *sc_dma; /* pointer to my dma */
u_int sc_laddr; /* LANCE DMA address */
+ u_int sc_lostcount;
+#define LE_LOSTTHRESH 5 /* lost carrior count to switch media */
};
#define MEMSIZE (16*1024) /* LANCE memory size */
@@ -277,6 +279,12 @@
{
struct le_softc *lesc = (struct le_softc *)sc;
+ /* it may take a while for modern switches to set 10baseT media */
+ if (lesc-sc_lostcount++ LE_LOSTTHRESH)
+ return;
+
+ lesc-sc_lostcount = 0;
+
/*
* Check if the user has requested a certain cable type, and
* if so, honor that request.
@@ -379,7 +387,7 @@
lesc-sc_laddr = lesc-sc_dmamap-dm_segs[0].ds_addr;
sc-sc_addr = lesc-sc_laddr 0xff;
sc-sc_conf3 = LE_C3_BSWP | LE_C3_ACON | LE_C3_BCON;
-
+ lesc-sc_lostcount = 0;
/* Assume SBus is grandparent */
lesc-sc_sd.sd_reset = (void *)lance_reset;
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sun Apr 12 11:13:55 UTC 2009 Modified Files: src/doc: 3RDPARTY Log Message: openldap-2.4.16 out. To generate a diff of this commit: cvs rdiff -u -r1.681 -r1.682 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.681 src/doc/3RDPARTY:1.682 --- src/doc/3RDPARTY:1.681 Wed Apr 8 17:27:28 2009 +++ src/doc/3RDPARTY Sun Apr 12 11:13:55 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.681 2009/04/08 17:27:28 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.682 2009/04/12 11:13:55 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -647,7 +647,7 @@ Package: OpenLDAP Version: 2.4.11 -Current Vers: 2.4.11 +Current Vers: 2.4.16 Maintainer: OpenLDAP Foundation Archive Site: http://www.openldap.org/ Home Page: http://www.openldap.org/
CVS commit: src/usr.bin/jot
Module Name:src
Committed By: lukem
Date: Sun Apr 12 11:19:18 UTC 2009
Modified Files:
src/usr.bin/jot: jot.c
Log Message:
fix sign-compare issue
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/jot/jot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/jot/jot.c
diff -u src/usr.bin/jot/jot.c:1.24 src/usr.bin/jot/jot.c:1.25
--- src/usr.bin/jot/jot.c:1.24 Mon Jul 21 14:19:23 2008
+++ src/usr.bin/jot/jot.c Sun Apr 12 11:19:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: jot.c,v 1.24 2008/07/21 14:19:23 lukem Exp $ */
+/* $NetBSD: jot.c,v 1.25 2009/04/12 11:19:18 lukem Exp $ */
/*-
* Copyright (c) 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)jot.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: jot.c,v 1.24 2008/07/21 14:19:23 lukem Exp $);
+__RCSID($NetBSD: jot.c,v 1.25 2009/04/12 11:19:18 lukem Exp $);
#endif /* not lint */
/*
@@ -347,7 +347,7 @@
sz = sizeof(format) - strlen(format) - 1;
if (!*p) {
if (chardata || prec == 0) {
- if (snprintf(p, sz, %%%s, chardata ? c : ld) = sz)
+ if ((size_t)snprintf(p, sz, %%%s, chardata ? c : ld) = sz)
errx(EXIT_FAILURE, -w word too long);
dox = 1;
} else {
CVS commit: src/usr.bin/kdump
Module Name:src
Committed By: lukem
Date: Sun Apr 12 11:23:12 UTC 2009
Modified Files:
src/usr.bin/kdump: kdump.c
Log Message:
fix sign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/kdump/kdump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.102 src/usr.bin/kdump/kdump.c:1.103
--- src/usr.bin/kdump/kdump.c:1.102 Sun Jan 11 03:05:41 2009
+++ src/usr.bin/kdump/kdump.c Sun Apr 12 11:23:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.102 2009/01/11 03:05:41 christos Exp $ */
+/* $NetBSD: kdump.c,v 1.103 2009/04/12 11:23:12 lukem Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)kdump.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: kdump.c,v 1.102 2009/01/11 03:05:41 christos Exp $);
+__RCSID($NetBSD: kdump.c,v 1.103 2009/04/12 11:23:12 lukem Exp $);
#endif
#endif /* not lint */
@@ -542,21 +542,21 @@
if (strcmp(emul-name, linux) == 0 ||
strcmp(emul-name, linux32) == 0) {
if ((long)*ap = 0 *ap
-sizeof(linux_ptrace_ops) /
-sizeof(linux_ptrace_ops[0]))
+(register_t)(sizeof(linux_ptrace_ops) /
+sizeof(linux_ptrace_ops[0])))
(void)printf(%s,
linux_ptrace_ops[*ap]);
else
output_long((long)*ap, 1);
} else {
if ((long)*ap = 0 *ap
-sizeof(ptrace_ops) / sizeof(ptrace_ops[0]))
+(register_t)(sizeof(ptrace_ops) / sizeof(ptrace_ops[0])))
(void)printf(%s, ptrace_ops[*ap]);
#ifdef PT_MACHDEP_STRINGS
else if (*ap = PT_FIRSTMACH
*ap - PT_FIRSTMACH
- sizeof(ptrace_machdep_ops) /
- sizeof(ptrace_machdep_ops[0]))
+(register_t)(sizeof(ptrace_machdep_ops) /
+ sizeof(ptrace_machdep_ops[0])))
(void)printf(%s, ptrace_machdep_ops[*ap - PT_FIRSTMACH]);
#endif
else
@@ -602,7 +602,7 @@
switch (error) {
case 0:
rprint(ktr-ktr_retval);
- if (len offsetof(struct ktr_sysret, ktr_retval_1)
+ if (len (int)offsetof(struct ktr_sysret, ktr_retval_1)
ktr-ktr_retval_1 != 0) {
(void)printf(, );
rprint(ktr-ktr_retval_1);
@@ -1035,7 +1035,7 @@
static void
ktrmib(int *namep, int len)
{
- int i;
+ size_t i;
for (i = 0; i (len / sizeof(*namep)); i++)
printf(%s%d, (i == 0) ? : ., namep[i]);
CVS commit: src/usr.bin/ktruss
Module Name:src Committed By: lukem Date: Sun Apr 12 11:24:18 UTC 2009 Modified Files: src/usr.bin/ktruss: dump.c Log Message: fix sign-compare issues To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.bin/ktruss/dump.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ktruss/dump.c diff -u src/usr.bin/ktruss/dump.c:1.32 src/usr.bin/ktruss/dump.c:1.33 --- src/usr.bin/ktruss/dump.c:1.32 Sun Jan 11 03:05:23 2009 +++ src/usr.bin/ktruss/dump.c Sun Apr 12 11:24:18 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: dump.c,v 1.32 2009/01/11 03:05:23 christos Exp $ */ +/* $NetBSD: dump.c,v 1.33 2009/04/12 11:24:18 lukem Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = @(#)kdump.c 8.4 (Berkeley) 4/28/95; #endif -__RCSID($NetBSD: dump.c,v 1.32 2009/01/11 03:05:23 christos Exp $); +__RCSID($NetBSD: dump.c,v 1.33 2009/04/12 11:24:18 lukem Exp $); #endif /* not lint */ #include sys/param.h @@ -573,7 +573,7 @@ case SYS_ptrace : if ((long)*ap = 0 - *ap sizeof(ptrace_ops) / sizeof(ptrace_ops[0])) + *ap (register_t)(sizeof(ptrace_ops) / sizeof(ptrace_ops[0]))) wprintf((%s, ptrace_ops[*ap]); else wprintf((%ld, (long)*ap); @@ -637,7 +637,7 @@ break; default: wprintf( = %ld, (long)ret); - if (kth-ktr_len offsetof(struct ktr_sysret, + if (kth-ktr_len (int)offsetof(struct ktr_sysret, ktr_retval_1) ktr-ktr_retval_1 != 0) wprintf(, %ld, (long)ktr-ktr_retval_1); break;
CVS commit: src/usr.bin/lam
Module Name:src
Committed By: lukem
Date: Sun Apr 12 13:01:55 UTC 2009
Modified Files:
src/usr.bin/lam: lam.c
Log Message:
fix -Wcast-qual issues
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/lam/lam.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/lam/lam.c
diff -u src/usr.bin/lam/lam.c:1.6 src/usr.bin/lam/lam.c:1.7
--- src/usr.bin/lam/lam.c:1.6 Mon Jul 21 14:19:23 2008
+++ src/usr.bin/lam/lam.c Sun Apr 12 13:01:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lam.c,v 1.6 2008/07/21 14:19:23 lukem Exp $ */
+/* $NetBSD: lam.c,v 1.7 2009/04/12 13:01:55 lukem Exp $ */
/*-
* Copyright (c) 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)lam.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: lam.c,v 1.6 2008/07/21 14:19:23 lukem Exp $);
+__RCSID($NetBSD: lam.c,v 1.7 2009/04/12 13:01:55 lukem Exp $);
#endif /* not lint */
/*
@@ -61,8 +61,8 @@
short eof; /* eof flag */
short pad; /* pad flag for missing columns */
char eol; /* end of line character */
- char *sepstring; /* string to print before each line */
- char *format; /* printf(3) style string spec. */
+ const char *sepstring; /* string to print before each line */
+ const char *format; /* printf(3) style string spec. */
} input[MAXOFILES];
int morefiles; /* set by getargs(), changed by gatherline() */
@@ -70,7 +70,7 @@
char line[BIGBUFSIZ];
char *linep;
-void error __P((char *, char *));
+void error __P((const char *, const char *));
char *gatherline __P((struct openfile *));
void getargs __P((char *[]));
int main __P((int, char **));
@@ -223,8 +223,7 @@
}
void
-error(msg, s)
- char *msg, *s;
+error(const char *msg, const char *s)
{
warnx(msg, s);
fprintf(stderr,
CVS commit: src/usr.bin/last
Module Name:src
Committed By: lukem
Date: Sun Apr 12 13:07:21 UTC 2009
Modified Files:
src/usr.bin/last: last.c want.c
Log Message:
Fix WARNS=4 issues (-Wshadow -Wcast-qual -Wsign-compare)
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/last/last.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/last/want.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/last/last.c
diff -u src/usr.bin/last/last.c:1.32 src/usr.bin/last/last.c:1.33
--- src/usr.bin/last/last.c:1.32 Mon Jul 21 14:19:23 2008
+++ src/usr.bin/last/last.c Sun Apr 12 13:07:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: last.c,v 1.32 2008/07/21 14:19:23 lukem Exp $ */
+/* $NetBSD: last.c,v 1.33 2009/04/12 13:07:21 lukem Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)last.c 8.2 (Berkeley) 4/2/94;
#endif
-__RCSID($NetBSD: last.c,v 1.32 2008/07/21 14:19:23 lukem Exp $);
+__RCSID($NetBSD: last.c,v 1.33 2009/04/12 13:07:21 lukem Exp $);
#endif /* not lint */
#include sys/param.h
@@ -92,11 +92,11 @@
#define MAXUTMP 1024
typedef struct arg {
- char *name; /* argument */
+ const char *name; /* argument */
#define HOST_TYPE -2
#define TTY_TYPE -3
#define USER_TYPE -4
- int type; /* type of arg */
+ int type; /* type of arg */
struct arg *next; /* linked list pointer */
} ARG;
static ARG *arglist; /* head of linked list */
@@ -115,10 +115,10 @@
int main(int, char *[]);
-static void addarg(int, char *);
+static void addarg(int, const char *);
static TTY *addtty(const char *);
static void hostconv(char *);
-static char *ttyconv(char *);
+static const char *ttyconv(char *);
#ifdef SUPPORT_UTMPX
static void wtmpx(const char *, int, int, int, int);
#endif
@@ -148,7 +148,7 @@
{
int ch;
char *p;
- char *file = NULL;
+ const char *file = NULL;
int namesize = UT_NAMESIZE;
int linesize = UT_LINESIZE;
int hostsize = UT_HOSTSIZE;
@@ -271,7 +271,7 @@
* add an entry to a linked list of arguments
*/
static void
-addarg(int type, char *arg)
+addarg(int type, const char *arg)
{
ARG *cur;
@@ -288,7 +288,7 @@
* add an entry to a linked list of ttys
*/
static TTY *
-addtty(const char *ttyname)
+addtty(const char *tty)
{
TTY *cur;
@@ -296,7 +296,7 @@
err(EXIT_FAILURE, malloc failure);
cur-next = ttylist;
cur-logout = currentout;
- memmove(cur-tty, ttyname, sizeof(cur-tty));
+ memmove(cur-tty, tty, sizeof(cur-tty));
return (ttylist = cur);
}
@@ -330,7 +330,7 @@
* ttyconv --
* convert tty to correct name.
*/
-static char *
+static const char *
ttyconv(char *arg)
{
char *mval;
Index: src/usr.bin/last/want.c
diff -u src/usr.bin/last/want.c:1.12 src/usr.bin/last/want.c:1.13
--- src/usr.bin/last/want.c:1.12 Mon Dec 29 01:25:04 2008
+++ src/usr.bin/last/want.c Sun Apr 12 13:07:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: want.c,v 1.12 2008/12/29 01:25:04 christos Exp $ */
+/* $NetBSD: want.c,v 1.13 2009/04/12 13:07:21 lukem Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -42,11 +42,11 @@
return numeric ? : host;
#else
if (numeric) {
- static char buf[512];
- buf[0] = '\0';
- (void)sockaddr_snprintf(buf, sizeof(buf), %a,
+ static char hbuf[512];
+ hbuf[0] = '\0';
+ (void)sockaddr_snprintf(hbuf, sizeof(hbuf), %a,
(struct sockaddr *)ut-ut_ss);
- return buf;
+ return hbuf;
} else
return host;
#endif
@@ -71,14 +71,15 @@
struct stat stb; /* stat of file for sz */
off_t offset;
int wfd;
- char *ct, *crmsg;
+ char *ct;
+ const char *crmsg;
size_t len = sizeof(*buf) * MAXUTMP;
char namebuf[sizeof(bp-ut_name) + 1], *namep;
char linebuf[sizeof(bp-ut_line) + 1], *linep;
char hostbuf[sizeof(bp-ut_host) + 1], *hostp;
- int checkname = namesz sizeof(bp-ut_name);
- int checkline = linesz sizeof(bp-ut_line);
- int checkhost = hostsz sizeof(bp-ut_host);
+ int checkname = namesz (int)sizeof(bp-ut_name);
+ int checkline = linesz (int)sizeof(bp-ut_line);
+ int checkhost = hostsz (int)sizeof(bp-ut_host);
if ((buf = malloc(len)) == NULL)
err(EXIT_FAILURE, Cannot allocate utmp buffer);
@@ -141,7 +142,7 @@
ssize_t ret, i;
size_t size;
- size = MIN(len, offset);
+ size = MIN((off_t)len, offset);
offset -= size; /* Always a multiple of sizeof(*buf) */
ret = pread(wfd, buf, size, offset);
if (ret 0) {
CVS commit: src/usr.bin/lastcomm
Module Name:src
Committed By: lukem
Date: Sun Apr 12 13:08:31 UTC 2009
Modified Files:
src/usr.bin/lastcomm: Makefile lastcomm.c
Log Message:
fix sign-compare issue
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/lastcomm/Makefile
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/lastcomm/lastcomm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/lastcomm/Makefile
diff -u src/usr.bin/lastcomm/Makefile:1.6 src/usr.bin/lastcomm/Makefile:1.7
--- src/usr.bin/lastcomm/Makefile:1.6 Mon Mar 28 23:33:22 2005
+++ src/usr.bin/lastcomm/Makefile Sun Apr 12 13:08:31 2009
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2005/03/28 23:33:22 christos Exp $
+# $NetBSD: Makefile,v 1.7 2009/04/12 13:08:31 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-WARNS=3
PROG= lastcomm
DPADD= ${LIBMATH}
LDADD= -lm
Index: src/usr.bin/lastcomm/lastcomm.c
diff -u src/usr.bin/lastcomm/lastcomm.c:1.20 src/usr.bin/lastcomm/lastcomm.c:1.21
--- src/usr.bin/lastcomm/lastcomm.c:1.20 Mon Jul 21 14:19:23 2008
+++ src/usr.bin/lastcomm/lastcomm.c Sun Apr 12 13:08:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lastcomm.c,v 1.20 2008/07/21 14:19:23 lukem Exp $ */
+/* $NetBSD: lastcomm.c,v 1.21 2009/04/12 13:08:31 lukem Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)lastcomm.c 8.2 (Berkeley) 4/29/95;
#endif
-__RCSID($NetBSD: lastcomm.c,v 1.20 2008/07/21 14:19:23 lukem Exp $);
+__RCSID($NetBSD: lastcomm.c,v 1.21 2009/04/12 13:08:31 lukem Exp $);
#endif /* not lint */
#include sys/param.h
@@ -107,7 +107,7 @@
size = sb.st_size - sb.st_size % sizeof(struct acct);
/* Check if any records to display. */
- if (size sizeof(struct acct))
+ if (size (off_t)sizeof(struct acct))
exit(0);
/*
CVS commit: src/share/man/man4/man4.hp300
Module Name:src Committed By: joerg Date: Sun Apr 12 15:03:00 UTC 2009 Modified Files: src/share/man/man4/man4.hp300: rd.4 Log Message: Fix markup. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/man4.hp300/rd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.hp300/rd.4 diff -u src/share/man/man4/man4.hp300/rd.4:1.10 src/share/man/man4/man4.hp300/rd.4:1.11 --- src/share/man/man4/man4.hp300/rd.4:1.10 Thu Aug 7 10:31:06 2003 +++ src/share/man/man4/man4.hp300/rd.4 Sun Apr 12 15:03:00 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: rd.4,v 1.10 2003/08/07 10:31:06 agc Exp $ +.\ $NetBSD: rd.4,v 1.11 2009/04/12 15:03:00 joerg Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -94,160 +94,175 @@ .Xr physio 4 ) . The location and size (in sectors) of the partitions for these drives: -.Bl -column header diskx undefined length -.Tn 7945/7946 No partitions : -.Sy disk start length cyls - rd?a 112 15904 1-142 - rd?b 16016 20160 143-322 - rd?c 0 108416 0-967 - rd?d 16016 40320 143-502 - rd?e undefined - rd?f undefined - rd?g 36176 72240 323-967 - rd?h 56336 52080 503-967 -.Pp -.Tn 9134D No partitions : -.Sy disk start length cyls - rd?a 96 15936 1-166 - rd?b 16032 13056 167-302 - rd?c 0 29088 0-302 - rd?d undefined - rd?e undefined - rd?f undefined - rd?g undefined - rd?h undefined -.Pp -.Tn 9122S No partitions : -.Sy disk start length cyls - rd?a undefined - rd?b undefined - rd?c 0 1232 0-76 - rd?d undefined - rd?e undefined - rd?f undefined - rd?g undefined - rd?h undefined -.Pp -.Tn 7912P No partitions : -.Sy disk start length cyls - rd?a 0 15904 0-70 - rd?b 16128 22400 72-171 - rd?c 0 128128 0-571 - rd?d 16128 42560 72-261 - rd?e undefined - rd?f undefined - rd?g 38528 89600 172-571 - rd?h 58688 69440 262-571 -.Pp -.Tn 7914CT/P No partitions : -.Sy disk start length cyls - rd?a 224 15904 1-71 - rd?b 16128 40320 72-251 - rd?c 0 258048 0-1151 - rd?d 16128 64960 72-361 - rd?e 81088 98560 362-801 - rd?f 179648 78400 802-1151 - rd?g 56448 201600 252-1151 - rd?h 81088 176960 362-1151 -.Pp -.Tn 7958A No partitions : -.Sy disk start length cyls - rd?a 252 16128 1-64 - rd?b 16380 32256 65-192 - rd?c 0 255276 0-1012 - rd?d 16380 48384 65-256 - rd?e 64764 100800 257-656 - rd?f 165564 89712 657-1012 - rd?g 48636 206640 193-1012 - rd?h 64764 190512 257-1012 -.Pp -.Tn 7957A No partitions : -.Sy disk start length cyls - rd?a 154 16016 1-104 - rd?b 16170 24640 105-264 - rd?c 0 159544 0-1035 - rd?d 16170 42350 105-379 - rd?e 58520 54824 380-735 - rd?f 113344 46200 736-1035 - rd?g 40810 118734 265-1035 - rd?h 58520 101024 380-1035 -.Pp -.Tn 7933H No partitions : -.Sy disk start length cyls - rd?a 598 16146 1-27 - rd?b 16744 66976 28-139 - rd?c 0 789958 0-1320 - rd?d 83720 16146 140-166 - rd?e 99866 165646 167-443 - rd?f 265512 165646 444-720 - rd?g 83720 706238 140-1320 - rd?h 431158 358800 721-1320 -.Pp -.Tn 9134L No partitions : -.Sy disk start length cyls - rd?a 80 15920 1-199 - rd?b 16000 2 200-449 - rd?c 0 77840 0-972 - rd?d 16000 32000 200-599 - rd?e undefined - rd?f undefined - rd?g 36000 41840 450-972 - rd?h 48000 29840 600-972 -.Pp -.Tn 7936H No partitions : -.Sy disk start length cyls - rd?a 861 16359 1-19 - rd?b 17220 67158 20-97 - rd?c 0 600978 0-697 - rd?d 84378 16359 98-116 - rd?e 100737 120540 117-256 - rd?f 220416 120540 256-395 - rd?g 84378 516600 98-697 - rd?h 341817 259161 397-697 -.Pp -.Tn 7937H No partitions : -.Sy disk start length cyls - rd?a 1599 15990 1-10 - rd?b 17589 67158 11-52 - rd?c 0 1116102 0-697 - rd?d 84747 15990 53-62 - rd?e 100737 246246 63-216 - rd?f 346983 246246 217-370 - rd?g 84747 1031355 53-697 - rd?h 593229 522873 371-697 -.Pp -.Tn 7957B/7961B No partitions : -.Sy disk start length cyls - rd?a 126 16002 1-127 - rd?b 16128 32760 128-387 - rd?c 0 159894 0-1268 - rd?d 16128 49140 128-517 - rd?e 65268 50400 518-917 - rd?f 115668 44226 918-1268 - rd?g 4 111006 388-1268 - rd?h 65268 94626 518-1268 -.Pp -.Tn 7958B/7962B No partitions : -.Sy disk start length cyls - rd?a 378 16254 1-43 - rd?b 16632 32886 44-130 - rd?c 0 297108 0-785 - rd?d 16632 49140 44-173 - rd?e 65772 121716 174-495 - rd?f 187488 109620 496-785 - rd?g 49518 247590 131-785 - rd?h 65772 231336 174-785 -.Pp -.Tn 7959B/7963B No partitions : -.Sy disk start length cyls - rd?a 378 16254 1-43 - rd?b 16632 49140 44-173 - rd?c 0 594216 0-1571 - rd?d 16632 65772 44-217 - rd?e 82404 303912 218-1021 - rd?f 386316 207900 1022-1571 - rd?g 65772 528444 174-1571 - rd?h 82404 511812 218-1571 +.Bl -hang +.It Tn 7945/7946 No partitions : +.Bl -column diskx undefined length xxx- -compact +.It Sy disk start length cyls +.It rd?a 112 15904 1-142 +.It rd?b 16016 20160 143-322 +.It rd?c 0 108416 0-967 +.It rd?d 16016 40320 143-502 +.It rd?e undefined Ta Ta +.It rd?f undefined Ta Ta +.It rd?g 36176 72240
CVS commit: src/external/bsd/bind/dist
Module Name:src Committed By: christos Date: Sun Apr 12 15:05:59 UTC 2009 Modified Files: src/external/bsd/bind/dist: binclude4netbsd bind2netbsd Log Message: reflect new reality. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/dist/binclude4netbsd \ src/external/bsd/bind/dist/bind2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bind/dist/binclude4netbsd diff -u src/external/bsd/bind/dist/binclude4netbsd:1.1 src/external/bsd/bind/dist/binclude4netbsd:1.2 --- src/external/bsd/bind/dist/binclude4netbsd:1.1 Sat Apr 11 23:46:06 2009 +++ src/external/bsd/bind/dist/binclude4netbsd Sun Apr 12 11:05:59 2009 @@ -4,10 +4,11 @@ # after you've imported and built the latest bind code. After you run this, # cvs import the resulting directory # -# $ cd /usr/src/external/bind/dist +# $ cd /usr/src/external/bsd/bind/dist # $ configure # $ make # $ ./binclude4netbsd . /tmp/include +# Fix manually the config.h file to disable things controlled by the Makefiles # $ cd /tmp/include # $ cvs -d cvs.netbsd.org:/cvsroot import src/usr.sbin/bind/include \ # ISC bind-X-Y-Z Index: src/external/bsd/bind/dist/bind2netbsd diff -u src/external/bsd/bind/dist/bind2netbsd:1.1 src/external/bsd/bind/dist/bind2netbsd:1.2 --- src/external/bsd/bind/dist/bind2netbsd:1.1 Sat Apr 11 23:46:06 2009 +++ src/external/bsd/bind/dist/bind2netbsd Sun Apr 12 11:05:59 2009 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: bind2netbsd,v 1.1 2009/04/12 03:46:06 christos Exp $ +# $NetBSD: bind2netbsd,v 1.2 2009/04/12 15:05:59 christos Exp $ # # Copyright (c) 2000 The NetBSD Foundation, Inc. # All rights reserved. @@ -42,11 +42,8 @@ # $ run make # - use the binclude4netbsd to create and import the new headers in # /usr/src/usr.sbin/bind/include -# - use the include4netbsd to create and import the new headers in -# /usr/src/include # - check makefiles to see if any extra sources have been added. # - update distrib/sets if necessary. -# - to update the libc resolver code use libc4netbsd if [ $# -ne 2 ]; then echo bind2netbsd src dest; exit 1; fi
CVS commit: src/external/bsd/bind/dist
Module Name:src Committed By: christos Date: Sun Apr 12 15:23:22 UTC 2009 Modified Files: src/external/bsd/bind/dist: bind2netbsd Log Message: more description fixes. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/bind2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bind/dist/bind2netbsd diff -u src/external/bsd/bind/dist/bind2netbsd:1.2 src/external/bsd/bind/dist/bind2netbsd:1.3 --- src/external/bsd/bind/dist/bind2netbsd:1.2 Sun Apr 12 11:05:59 2009 +++ src/external/bsd/bind/dist/bind2netbsd Sun Apr 12 11:23:22 2009 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: bind2netbsd,v 1.2 2009/04/12 15:05:59 christos Exp $ +# $NetBSD: bind2netbsd,v 1.3 2009/04/12 15:23:22 christos Exp $ # # Copyright (c) 2000 The NetBSD Foundation, Inc. # All rights reserved. @@ -26,18 +26,18 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -# bind2netbsd: convert an bind bind tree into a -# netbsd bind source tree, under src/dist, +# bind2netbsd: convert a bind tree into a +# netbsd bind source tree, under src/external/bsd/bind/dist, # based on bind2netbsd by Bernd Ernesti and changes by Simon Burge # # Rough instructions for importing new bind release: # # $ cd /some/where/temporary # $ tar xpfz /new/bind/release/tar/file -# $ sh /usr/src/external/bsd/dist/bind/bind2netbsd bind-9.x.y `pwd` +# $ sh /usr/src/external/bsd/bind/dist/bind2netbsd bind-9.x.y `pwd` # $ cd src/external/bsd/bind/dist # $ cvs import -m Import bind 9.x.y src/external/bsd/bind/dist ISC bind-9-x-y -# $ cd ../../../../../bind-9.0.3beta3 +# $ cd ../../../../../bind-9.x.y # $ run ./configure # $ run make # - use the binclude4netbsd to create and import the new headers in
CVS commit: src/usr.bin/mkstr
Module Name:src
Committed By: lukem
Date: Sun Apr 12 14:28:30 UTC 2009
Modified Files:
src/usr.bin/mkstr: mkstr.c
Log Message:
fix -Wcast-qual issue
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/mkstr/mkstr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mkstr/mkstr.c
diff -u src/usr.bin/mkstr/mkstr.c:1.12 src/usr.bin/mkstr/mkstr.c:1.13
--- src/usr.bin/mkstr/mkstr.c:1.12 Mon Jul 21 14:19:24 2008
+++ src/usr.bin/mkstr/mkstr.c Sun Apr 12 14:28:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mkstr.c,v 1.12 2008/07/21 14:19:24 lukem Exp $ */
+/* $NetBSD: mkstr.c,v 1.13 2009/04/12 14:28:30 lukem Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)mkstr.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: mkstr.c,v 1.12 2008/07/21 14:19:24 lukem Exp $);
+__RCSID($NetBSD: mkstr.c,v 1.13 2009/04/12 14:28:30 lukem Exp $);
#endif
#endif /* not lint */
@@ -83,7 +83,7 @@
void process __P((void));
int main __P((int, char **));
-int match __P((char *));
+int match __P((const char *));
int octdigit __P((char));
void inithash __P((void));
int hashit __P((char *, char, unsigned));
@@ -151,9 +151,9 @@
int
match(ocp)
- char *ocp;
+ const char *ocp;
{
- char *cp;
+ const char *cp;
int c;
for (cp = ocp + 1; *cp; cp++) {
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: lukem
Date: Sun Apr 12 13:29:29 UTC 2009
Modified Files:
src/libexec/ld.elf_so: headers.c
Log Message:
Fix const issues (cast const pointers to const uint8_t * instead of caddr_t)
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/libexec/ld.elf_so/headers.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/headers.c
diff -u src/libexec/ld.elf_so/headers.c:1.27 src/libexec/ld.elf_so/headers.c:1.28
--- src/libexec/ld.elf_so/headers.c:1.27 Tue Jan 6 04:01:46 2009
+++ src/libexec/ld.elf_so/headers.c Sun Apr 12 13:29:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.27 2009/01/06 04:01:46 mrg Exp $ */
+/* $NetBSD: headers.c,v 1.28 2009/04/12 13:29:29 lukem Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: headers.c,v 1.27 2009/01/06 04:01:46 mrg Exp $);
+__RCSID($NetBSD: headers.c,v 1.28 2009/04/12 13:29:29 lukem Exp $);
#endif /* not lint */
#include err.h
@@ -232,8 +232,8 @@
}
}
- obj-rellim = (const Elf_Rel *)((caddr_t)obj-rel + relsz);
- obj-relalim = (const Elf_Rela *)((caddr_t)obj-rela + relasz);
+ obj-rellim = (const Elf_Rel *)((const uint8_t *)obj-rel + relsz);
+ obj-relalim = (const Elf_Rela *)((const uint8_t *)obj-rela + relasz);
if (plttype == DT_REL) {
obj-pltrel = (const Elf_Rel *)(obj-relocbase + pltrel);
obj-pltrellim = (const Elf_Rel *)(obj-relocbase + pltrel + pltrelsz);
CVS commit: src/usr.bin/midiplay
Module Name:src
Committed By: lukem
Date: Sun Apr 12 14:15:08 UTC 2009
Modified Files:
src/usr.bin/midiplay: midiplay.c
Log Message:
fix sign-compare and cast-qual issues
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/midiplay/midiplay.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/midiplay/midiplay.c
diff -u src/usr.bin/midiplay/midiplay.c:1.26 src/usr.bin/midiplay/midiplay.c:1.27
--- src/usr.bin/midiplay/midiplay.c:1.26 Mon Apr 28 20:24:14 2008
+++ src/usr.bin/midiplay/midiplay.c Sun Apr 12 14:15:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: midiplay.c,v 1.26 2008/04/28 20:24:14 martin Exp $ */
+/* $NetBSD: midiplay.c,v 1.27 2009/04/12 14:15:08 lukem Exp $ */
/*
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: midiplay.c,v 1.26 2008/04/28 20:24:14 martin Exp $);
+__RCSID($NetBSD: midiplay.c,v 1.27 2009/04/12 14:15:08 lukem Exp $);
#endif
@@ -72,7 +72,7 @@
#define META_SMPTE 0x54
#define META_TIMESIGN 0x58
-char *metanames[] = {
+const char *metanames[] = {
, Text, Copyright, Track, Instrument,
Lyric, Marker, Cue,
};
@@ -88,8 +88,8 @@
void send_sysex(u_char *, u_int);
u_long getvar(struct track *);
u_long getlen(struct track *);
-void playfile(FILE *, char *);
-void playdata(u_char *, u_int, char *);
+void playfile(FILE *, const char *);
+void playdata(u_char *, u_int, const char *);
int main(int argc, char **argv);
void Heapify(struct track *, int, int);
@@ -350,7 +350,7 @@
}
void
-playfile(FILE *f, char *name)
+playfile(FILE *f, const char *name)
{
u_char *buf, *nbuf;
u_int tot, n, size, nread;
@@ -385,7 +385,7 @@
}
void
-playdata(u_char *buf, u_int tot, char *name)
+playdata(u_char *buf, u_int tot, const char *name)
{
int format, ntrks, divfmt, ticks, t;
u_int len, mlen, status, chan;
@@ -406,7 +406,7 @@
u_char *eod;
/* Detected a RMID file, let's just check if it's
* a MIDI file */
- if (GET32_LE(buf + MARK_LEN) != tot - 8) {
+ if ((u_int)GET32_LE(buf + MARK_LEN) != tot - 8) {
warnx(Not a RMID file, bad header);
return;
}
CVS commit: src/lib/libc/citrus
Module Name:src Committed By: lukem Date: Sun Apr 12 14:20:19 UTC 2009 Modified Files: src/lib/libc/citrus: citrus_pivot_factory.c Log Message: fix -Wcast-qual issue To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/citrus/citrus_pivot_factory.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/citrus/citrus_pivot_factory.c diff -u src/lib/libc/citrus/citrus_pivot_factory.c:1.6 src/lib/libc/citrus/citrus_pivot_factory.c:1.7 --- src/lib/libc/citrus/citrus_pivot_factory.c:1.6 Sat Feb 9 14:56:20 2008 +++ src/lib/libc/citrus/citrus_pivot_factory.c Sun Apr 12 14:20:19 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: citrus_pivot_factory.c,v 1.6 2008/02/09 14:56:20 junyoung Exp $ */ +/* $NetBSD: citrus_pivot_factory.c,v 1.7 2009/04/12 14:20:19 lukem Exp $ */ /*- * Copyright (c)2003 Citrus Project, @@ -32,7 +32,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: citrus_pivot_factory.c,v 1.6 2008/02/09 14:56:20 junyoung Exp $); +__RCSID($NetBSD: citrus_pivot_factory.c,v 1.7 2009/04/12 14:20:19 lukem Exp $); #endif /* LIBC_SCCS and not lint */ #include assert.h @@ -114,6 +114,7 @@ struct src_entry *se; const char *p; char key1[LINE_MAX], key2[LINE_MAX], data[LINE_MAX]; + char *ep; uint32_t val; se = NULL; /* XXX gcc */ @@ -145,9 +146,8 @@ line = _bcs_skip_ws_len(p, len); _bcs_trunc_rws_len(line, len); snprintf(data, sizeof(data), %.*s, (int)len, line); - /* LINTED: discard const */ - val = strtoul(data, (char **)p, 0); - if (*p != '\0') + val = strtoul(data, ep, 0); + if (*ep != '\0') return EFTYPE; /* insert to DB */
CVS commit: src/dist/nvi
Module Name:src
Committed By: tnozaki
Date: Sun Apr 12 14:47:51 UTC 2009
Modified Files:
src/dist/nvi/common: multibyte.h
src/dist/nvi/regex: engine.c
Log Message:
fix PR/41136: \word search doesn't work in vi
don't reuse RCHAR_T(=wchar_t)'s bits, CSI wchar_t is opaque object.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/dist/nvi/common/multibyte.h
cvs rdiff -u -r1.5 -r1.6 src/dist/nvi/regex/engine.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/common/multibyte.h
diff -u src/dist/nvi/common/multibyte.h:1.2 src/dist/nvi/common/multibyte.h:1.3
--- src/dist/nvi/common/multibyte.h:1.2 Fri Jan 2 00:32:11 2009
+++ src/dist/nvi/common/multibyte.h Sun Apr 12 14:47:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: multibyte.h,v 1.2 2009/01/02 00:32:11 tnozaki Exp $ */
+/* $NetBSD: multibyte.h,v 1.3 2009/04/12 14:47:51 tnozaki Exp $ */
#ifndef MULTIBYTE_H
#define MULTIBYTE_H
@@ -10,10 +10,8 @@
typedef wchar_t RCHAR_T;
typedef wchar_t CHAR_T;
#if defined(__NetBSD__)
-#define RCHAR_T_MAX 0x
#define MAX_CHAR_T 0x
#else
-#define RCHAR_T_MAX WCHAR_MAX
#define MAX_CHAR_T WCHAR_MAX
#endif
typedef u_int UCHAR_T;
@@ -31,7 +29,6 @@
#else
typedef char RCHAR_T;
-#define RCHAR_T_MAX CHAR_MAX
typedef u_char CHAR_T;
#define MAX_CHAR_T 0xff
typedef u_char UCHAR_T;
Index: src/dist/nvi/regex/engine.c
diff -u src/dist/nvi/regex/engine.c:1.5 src/dist/nvi/regex/engine.c:1.6
--- src/dist/nvi/regex/engine.c:1.5 Sun Feb 22 11:34:53 2009
+++ src/dist/nvi/regex/engine.c Sun Apr 12 14:47:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: engine.c,v 1.5 2009/02/22 11:34:53 tnozaki Exp $ */
+/* $NetBSD: engine.c,v 1.6 2009/04/12 14:47:51 tnozaki Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
@@ -97,16 +97,13 @@
static RCHAR_T *backref __P((struct match *m, RCHAR_T *start, RCHAR_T *stop, sopno startst, sopno stopst, sopno lev));
static RCHAR_T *fast __P((struct match *m, RCHAR_T *start, RCHAR_T *stop, sopno startst, sopno stopst));
static RCHAR_T *slow __P((struct match *m, RCHAR_T *start, RCHAR_T *stop, sopno startst, sopno stopst));
-static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft));
-#define BOL (OUT+1)
+static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, int flag, RCHAR_T ch, states aft));
+#define BOL (1)
#define EOL (BOL+1)
#define BOLEOL (BOL+2)
#define NOTHING (BOL+3)
#define BOW (BOL+4)
#define EOW (BOL+5)
-#define CODEMAX (BOL+5) /* highest code used */
-#define NONCHAR(c) ((UCHAR_T)(c) (UCHAR_T)RCHAR_T_MAX)
-#define NNONCHAR (CODEMAX-CHAR_MAX)
#ifdef REDEBUG
static void print __P((struct match *m, char *caption, states st, int ch, FILE *d));
#endif
@@ -716,15 +713,15 @@
register states fresh = m-fresh;
register states tmp = m-tmp;
register RCHAR_T *p = start;
- register int c = (start == m-beginp) ? OUT : *(start-1);
- register int lastc; /* previous c */
- register int flagch;
+ register RCHAR_T c = (start == m-beginp) ? OUT : *(start-1);
+ register RCHAR_T lastc; /* previous c */
+ register int flag;
register int i;
register RCHAR_T *coldp; /* last p after which no match was underway */
CLEAR(st);
SET1(st, startst);
- st = step(m-g, startst, stopst, st, NOTHING, st);
+ st = step(m-g, startst, stopst, st, NOTHING, OUT, st);
ASSIGN(fresh, st);
SP(start, st, *p);
coldp = NULL;
@@ -736,35 +733,35 @@
coldp = p;
/* is there an EOL and/or BOL between lastc and c? */
- flagch = '\0';
+ flag = 0;
i = 0;
if ( (lastc == '\n' m-g-cflagsREG_NEWLINE) ||
(lastc == OUT !(m-eflagsREG_NOTBOL)) ) {
- flagch = BOL;
+ flag = BOL;
i = m-g-nbol;
}
if ( (c == '\n' m-g-cflagsREG_NEWLINE) ||
(c == OUT !(m-eflagsREG_NOTEOL)) ) {
- flagch = (flagch == BOL) ? BOLEOL : EOL;
+ flag = (flag == BOL) ? BOLEOL : EOL;
i += m-g-neol;
}
if (i != 0) {
for (; i 0; i--)
-st = step(m-g, startst, stopst, st, flagch, st);
+st = step(m-g, startst, stopst, st, flag, OUT, st);
SP(boleol, st, c);
}
/* how about a word boundary? */
- if ( (flagch == BOL || (lastc != OUT !ISWORD(lastc)))
+ if ( (flag == BOL || (lastc != OUT !ISWORD(lastc)))
(c != OUT ISWORD(c)) ) {
- flagch = BOW;
+ flag = BOW;
}
if ( (lastc != OUT ISWORD(lastc))
-(flagch == EOL || (c != OUT !ISWORD(c))) ) {
- flagch = EOW;
+(flag == EOL || (c != OUT !ISWORD(c))) ) {
+ flag = EOW;
}
- if (flagch == BOW || flagch == EOW) {
- st = step(m-g, startst, stopst, st, flagch, st);
+ if (flag == BOW || flag == EOW) {
+ st = step(m-g, startst, stopst, st, flag, OUT, st);
SP(boweow, st, c);
}
@@ -776,9 +773,9 @@
ASSIGN(tmp, st);
ASSIGN(st, fresh);
assert(c != OUT);
- st = step(m-g, startst, stopst, tmp, c, st);
+ st = step(m-g, startst, stopst, tmp, 0, c, st);
SP(aft,
CVS commit: src/bin/test
Module Name:src Committed By: joerg Date: Sun Apr 12 13:52:20 UTC 2009 Modified Files: src/bin/test: test.1 Log Message: Fix markup. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/bin/test/test.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/test/test.1 diff -u src/bin/test/test.1:1.23 src/bin/test/test.1:1.24 --- src/bin/test/test.1:1.23 Tue May 15 22:00:51 2007 +++ src/bin/test/test.1 Sun Apr 12 13:52:20 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: test.1,v 1.23 2007/05/15 22:00:51 uwe Exp $ +.\ $NetBSD: test.1,v 1.24 2009/04/12 13:52:20 joerg Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -43,7 +43,7 @@ .Nm test .Ar expression .Nm \[ -.Ar expression Cm ] +.Ar expression Cm \] .Sh DESCRIPTION The .Nm test
CVS commit: src/external/bsd/libbind/dist
Module Name:src Committed By: christos Date: Sun Apr 12 15:34:00 UTC 2009 Update of /cvsroot/src/external/bsd/libbind/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17888 Log Message: from ftp:///ftp.isc.org/isc/libbind import 6.0rc1. Status: Vendor Tag: ISC Release Tags: libbind-6-0rc1 N src/external/bsd/libbind/dist/COPYRIGHT N src/external/bsd/libbind/dist/CHANGES N src/external/bsd/libbind/dist/Makefile.in N src/external/bsd/libbind/dist/README N src/external/bsd/libbind/dist/aclocal.m4 N src/external/bsd/libbind/dist/api N src/external/bsd/libbind/dist/config.threads.in N src/external/bsd/libbind/dist/config.guess N src/external/bsd/libbind/dist/config.h.in N src/external/bsd/libbind/dist/config.sub N src/external/bsd/libbind/dist/configure N src/external/bsd/libbind/dist/configure.in N src/external/bsd/libbind/dist/install-sh N src/external/bsd/libbind/dist/libtool.m4 N src/external/bsd/libbind/dist/ltmain.sh N src/external/bsd/libbind/dist/mkinstalldirs N src/external/bsd/libbind/dist/port_after.h.in N src/external/bsd/libbind/dist/port_before.h.in N src/external/bsd/libbind/dist/version N src/external/bsd/libbind/dist/bsd/gettimeofday.c N src/external/bsd/libbind/dist/bsd/strcasecmp.c N src/external/bsd/libbind/dist/bsd/writev.c N src/external/bsd/libbind/dist/bsd/strerror.c N src/external/bsd/libbind/dist/bsd/strtoul.c N src/external/bsd/libbind/dist/bsd/daemon.c N src/external/bsd/libbind/dist/bsd/strdup.c N src/external/bsd/libbind/dist/bsd/ftruncate.c N src/external/bsd/libbind/dist/bsd/strpbrk.c N src/external/bsd/libbind/dist/bsd/mktemp.c N src/external/bsd/libbind/dist/bsd/putenv.c N src/external/bsd/libbind/dist/bsd/setenv.c N src/external/bsd/libbind/dist/bsd/readv.c N src/external/bsd/libbind/dist/bsd/utimes.c N src/external/bsd/libbind/dist/bsd/Makefile.in N src/external/bsd/libbind/dist/bsd/strsep.c N src/external/bsd/libbind/dist/bsd/setitimer.c N src/external/bsd/libbind/dist/doc/getipnodebyname.3 N src/external/bsd/libbind/dist/doc/resolver.man5 N src/external/bsd/libbind/dist/doc/getnetent.3 N src/external/bsd/libbind/dist/doc/inet_cidr.cat3 N src/external/bsd/libbind/dist/doc/resolver.3 N src/external/bsd/libbind/dist/doc/gethostbyname.man3 N src/external/bsd/libbind/dist/doc/resolver.cat5 N src/external/bsd/libbind/dist/doc/resolver.5 N src/external/bsd/libbind/dist/doc/irs.conf.cat5 N src/external/bsd/libbind/dist/doc/getaddrinfo.cat3 N src/external/bsd/libbind/dist/doc/hesiod.man3 N src/external/bsd/libbind/dist/doc/getaddrinfo.man3 N src/external/bsd/libbind/dist/doc/hostname.man7 N src/external/bsd/libbind/dist/doc/hesiod.3 N src/external/bsd/libbind/dist/doc/irs.conf.5 N src/external/bsd/libbind/dist/doc/tsig.3 N src/external/bsd/libbind/dist/doc/getnetent.man3 N src/external/bsd/libbind/dist/doc/resolver.cat3 N src/external/bsd/libbind/dist/doc/inet_cidr.man3 N src/external/bsd/libbind/dist/doc/hostname.7 N src/external/bsd/libbind/dist/doc/irs.conf.man5 N src/external/bsd/libbind/dist/doc/getnameinfo.3 N src/external/bsd/libbind/dist/doc/tsig.cat3 N src/external/bsd/libbind/dist/doc/gethostbyname.3 N src/external/bsd/libbind/dist/doc/getipnodebyname.cat3 N src/external/bsd/libbind/dist/doc/Makefile.in N src/external/bsd/libbind/dist/doc/getipnodebyname.man3 N src/external/bsd/libbind/dist/doc/gethostbyname.cat3 N src/external/bsd/libbind/dist/doc/getnameinfo.cat3 N src/external/bsd/libbind/dist/doc/inet_cidr.3 N src/external/bsd/libbind/dist/doc/hostname.cat7 N src/external/bsd/libbind/dist/doc/tsig.man3 N src/external/bsd/libbind/dist/doc/getnetent.cat3 N src/external/bsd/libbind/dist/doc/hesiod.cat3 N src/external/bsd/libbind/dist/doc/getnameinfo.man3 N src/external/bsd/libbind/dist/doc/resolver.man3 N src/external/bsd/libbind/dist/doc/getaddrinfo.3 N src/external/bsd/libbind/dist/dst/dst_api.c N src/external/bsd/libbind/dist/dst/dst_internal.h N src/external/bsd/libbind/dist/dst/md5_locl.h N src/external/bsd/libbind/dist/dst/support.c N src/external/bsd/libbind/dist/dst/md5.h N src/external/bsd/libbind/dist/dst/md5_dgst.c N src/external/bsd/libbind/dist/dst/hmac_link.c N src/external/bsd/libbind/dist/dst/Makefile.in N src/external/bsd/libbind/dist/include/irp.h N src/external/bsd/libbind/dist/include/resolv_mt.h N src/external/bsd/libbind/dist/include/irs.h N src/external/bsd/libbind/dist/include/netdb.h N src/external/bsd/libbind/dist/include/res_update.h N src/external/bsd/libbind/dist/include/hesiod.h N src/external/bsd/libbind/dist/include/Makefile.in N src/external/bsd/libbind/dist/include/netgroup.h N src/external/bsd/libbind/dist/include/fd_setsize.h N src/external/bsd/libbind/dist/include/resolv.h N src/external/bsd/libbind/dist/include/isc/platform.h.in N src/external/bsd/libbind/dist/include/isc/eventlib.h N src/external/bsd/libbind/dist/include/isc/list.h N src/external/bsd/libbind/dist/include/isc/heap.h N src/external/bsd/libbind/dist/include/isc/dst.h N src/external/bsd/libbind/dist/include/isc/assertions.h N
CVS commit: src/external/bsd/libbind/dist
Module Name:src Committed By: christos Date: Sun Apr 12 15:39:53 UTC 2009 Added Files: src/external/bsd/libbind/dist: libbind2netbsd Log Message: add libbind2netbsd script based on bind2netbsd To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/bsd/libbind/dist/libbind2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/bsd/libbind/dist/libbind2netbsd diff -u /dev/null src/external/bsd/libbind/dist/libbind2netbsd:1.1 --- /dev/null Sun Apr 12 11:39:53 2009 +++ src/external/bsd/libbind/dist/libbind2netbsd Sun Apr 12 11:39:53 2009 @@ -0,0 +1,132 @@ +#! /bin/sh +# +# $NetBSD: libbind2netbsd,v 1.1 2009/04/12 15:39:53 christos Exp $ +# +# Copyright (c) 2000 The NetBSD Foundation, Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +#notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +#notice, this list of conditions and the following disclaimer in the +#documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +# libbind2netbsd: convert abind tree into a +# netbsd libbind source tree, under src/external/bsd, +# based on bind2netbsd by Bernd Ernesti and changes by Simon Burge +# +# Rough instructions for importing new bind release: +# +# $ cd /some/where/temporary +# $ tar xpfz /new/bind/release/tar/file +# $ sh /usr/src/external/bsd/libbind/dist/libbind2netbsd libbind-6.x.y `pwd` +# $ cd src/external/bsd/libbind/dist +# $ cvs import -m Import libbind 6.x.y src/external/bsd/libbind/dist ISC libbind-6-x-y +# $ cd ../../../../../libbind-6.x.y +# $ run ./configure +# $ run make +# - use the binclude4netbsd to create and import the new headers in +# /usr/src/usr.sbin/bind/include +# - check makefiles to see if any extra sources have been added. +# - update distrib/sets if necessary. + +if [ $# -ne 2 ]; then echo bind2netbsd src dest; exit 1; fi + +r=$1 +d=$2/src/external/bsd/libbind/dist + +case $d in + /*) + ;; + *) + d=`/bin/pwd`/$d + ;; +esac + +case $r in + /*) + ;; + *) + r=`/bin/pwd`/$r + ;; +esac + +echo preparing directory $d +rm -rf $d +mkdir -p $d + +### Copy the files and directories +echo copying $r to $d +cd $r +pax -rw * $d + +### Remove the $'s around RCS tags +find $d -type f -print | xargs egrep -l '\$(Id|Created|Header|Revision)' | while read f; do + sed -e 's/\$\(Id.*\) \$/\1/' \ + -e 's/\$\(Created.*\) \$/\1/' \ + -e 's/\$\(Header.*\) \$/\1/' \ + -e 's/\$\(Revision.*\) \$/\1/' \ + $f /tmp/bind1f$$ mv /tmp/bind1f$$ $f \ + echo removed \$RCS tag from $f +done + +### Add our NetBSD RCS Id +find $d -type f -name '*.[chly]' -print | while read c; do + sed 1q $c | grep -q '\$NetBSD' || ( +echo /* \$NetBSD\$ */ /tmp/bind3n$$ +echo /tmp/bind3n$$ +cat $c /tmp/bind3n$$ +mv /tmp/bind3n$$ $c echo added NetBSD RCS tag to $c + ) +done + +find $d -type f -name '*.[0-9]' -print | while read m; do + sed 1q $m | grep -q '\$NetBSD' || ( +echo .\\\ \$NetBSD\$ /tmp/bind2m$$ +echo .\\\ /tmp/bind2m$$ +cat $m /tmp/bind2m$$ +mv /tmp/bind2m$$ $m echo added NetBSD RCS tag to $m + ) +done + +find $d -type f -name '*.texi' -print | while read t; do +sed 2 s/^/@c \$NetBSD\$\\ +/ $t /tmp/bind4t$$ + mv /tmp/bind4t$$ $t echo added NetBSD RCS tag to $t +done + +echo done + +### Clean up any CVS directories that might be around. +echo cleaning up CVS residue. +( + cd $d + find . -type d -name CVS -print | xargs rm -r +) +echo done + +### Fixing file and directory permissions. +echo Fixing file/directory permissions. +( + cd $d + find . -type f -print | xargs chmod u+rw,go+r + find . -type d -print | xargs chmod u+rwx,go+rx +) +echo done + +exit 0
CVS commit: [netbsd-5] src/tools/gettext
Module Name:src
Committed By: snj
Date: Sun Apr 12 16:03:49 UTC 2009
Modified Files:
src/tools/gettext [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by apb in ticket #442):
tools/gettext/Makefile: revision 1.5
Explicitly disable C# support. Mono is known to have issues at time, so
don't try to look for it.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.38.1 src/tools/gettext/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gettext/Makefile
diff -u src/tools/gettext/Makefile:1.4 src/tools/gettext/Makefile:1.4.38.1
--- src/tools/gettext/Makefile:1.4 Wed Nov 12 19:47:54 2003
+++ src/tools/gettext/Makefile Sun Apr 12 16:03:49 2009
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2003/11/12 19:47:54 dbj Exp $
+# $NetBSD: Makefile,v 1.4.38.1 2009/04/12 16:03:49 snj Exp $
.include bsd.own.mk
MODULE= gettext
CONFIGURE_ARGS= --program-transform-name=s,^,${_TOOL_PREFIX}, \
- --with-included-gettext
+ --with-included-gettext --disable-csharp
MAKE_ARGS= MAKEINFO=${TOOL_MAKEINFO:Q}
.include ${.CURDIR}/../Makefile.gnuhost
CVS commit: src/include
Module Name:src Committed By: christos Date: Sun Apr 12 16:06:27 UTC 2009 Update of /cvsroot/src/include In directory ivanova.netbsd.org:/tmp/cvs-serv14299 Log Message: import libbind include files. Status: Vendor Tag: ISC Release Tags: libbind-6-0rc1 C src/include/netdb.h C src/include/res_update.h C src/include/resolv.h C src/include/arpa/inet.h C src/include/arpa/nameser.h C src/include/arpa/nameser_compat.h 6 conflicts created by this import. Use the following command to help the merge: cvs checkout -jISC:yesterday -jISC src/include
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: lukem
Date: Sun Apr 12 16:08:37 UTC 2009
Modified Files:
src/usr.bin/netstat: atalk.c bpf.c fast_ipsec.c if.c inet.c inet6.c
ipsec.c iso.c main.c mbuf.c mroute.c netstat.h route.c show.c
unix.c
Log Message:
Fix many WARNS=4 issues (-Wshadow -Wcast-qual -Wsign-compare).
Fix probable bug with numeric printing of anon ports when using sysctl.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/netstat/atalk.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/netstat/bpf.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/netstat/fast_ipsec.c
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/netstat/if.c
cvs rdiff -u -r1.89 -r1.90 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.51 -r1.52 src/usr.bin/netstat/inet6.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/netstat/ipsec.c
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/netstat/iso.c
cvs rdiff -u -r1.70 -r1.71 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/netstat/mbuf.c \
src/usr.bin/netstat/unix.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/netstat/mroute.c
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/netstat/netstat.h
cvs rdiff -u -r1.72 -r1.73 src/usr.bin/netstat/route.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/netstat/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/netstat/atalk.c
diff -u src/usr.bin/netstat/atalk.c:1.13 src/usr.bin/netstat/atalk.c:1.14
--- src/usr.bin/netstat/atalk.c:1.13 Thu Apr 24 04:09:50 2008
+++ src/usr.bin/netstat/atalk.c Sun Apr 12 16:08:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: atalk.c,v 1.13 2008/04/24 04:09:50 thorpej Exp $ */
+/* $NetBSD: atalk.c,v 1.14 2009/04/12 16:08:37 lukem Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from @(#)atalk.c 1.1 (Whistle) 6/6/96;
#else
-__RCSID($NetBSD: atalk.c,v 1.13 2008/04/24 04:09:50 thorpej Exp $);
+__RCSID($NetBSD: atalk.c,v 1.14 2009/04/12 16:08:37 lukem Exp $);
#endif
#endif /* not lint */
@@ -74,8 +74,8 @@
* -a (all) flag is specified.
*/
-static char *
-at_pr_net(struct sockaddr_at *sat, int numeric)
+static const char *
+at_pr_net(const struct sockaddr_at *sat, int numeric)
{
static char mybuf[50];
@@ -91,8 +91,8 @@
return (mybuf);
}
-static char *
-at_pr_host(struct sockaddr_at *sat, int numeric)
+static const char *
+at_pr_host(const struct sockaddr_at *sat, int numeric)
{
static char mybuf[50];
@@ -109,8 +109,8 @@
return (mybuf);
}
-static char *
-at_pr_port(struct sockaddr_at *sat)
+static const char *
+at_pr_port(const struct sockaddr_at *sat)
{
static char mybuf[50];
@@ -126,8 +126,8 @@
}
}
-static char *
-at_pr_range(struct sockaddr_at *sat)
+static const char *
+at_pr_range(const struct sockaddr_at *sat)
{
static char mybuf[50];
@@ -150,10 +150,10 @@
* 4 for port
* 8 for numeric only
*/
-char *
+const char *
atalk_print(const struct sockaddr *sa, int what)
{
- struct sockaddr_at *sat = (struct sockaddr_at *) sa;
+ const struct sockaddr_at *sat = (const struct sockaddr_at *) sa;
static char mybuf[50];
int numeric = (what 0x08);
@@ -185,23 +185,23 @@
return (mybuf);
}
-char *
+const char *
atalk_print2(const struct sockaddr *sa, const struct sockaddr *mask, int what)
{
int n, l;
static char buf[100];
- struct sockaddr_at *sat1, *sat2;
+ const struct sockaddr_at *sat1, *sat2;
struct sockaddr_at thesockaddr;
struct sockaddr *sa2;
- sat1 = (struct sockaddr_at *) sa;
- sat2 = (struct sockaddr_at *) mask;
+ sat1 = (const struct sockaddr_at *) sa;
+ sat2 = (const struct sockaddr_at *) mask;
sa2 = (struct sockaddr *) thesockaddr;
thesockaddr.sat_addr.s_net = sat1-sat_addr.s_net
sat2-sat_addr.s_net;
n = snprintf(buf, sizeof(buf), %s, atalk_print(sa2, 1 | (what 8)));
- if (n = sizeof(buf))
+ if (n = (int)sizeof(buf))
n = sizeof(buf) - 1;
else if (n == -1)
n = 0; /* What else can be done ? */
@@ -210,7 +210,7 @@
~sat2-sat_addr.s_net;
l = snprintf(buf + n, sizeof(buf) - n,
-%s, atalk_print(sa2, 1 | (what 8)));
- if (l = sizeof(buf) - n)
+ if (l = (int)(sizeof(buf) - n))
l = sizeof(buf) - n - 1;
if (l 0)
n += l;
@@ -218,7 +218,7 @@
if (what 2) {
l = snprintf(buf + n, sizeof(buf) - n, .%s,
atalk_print(sa, what (~1)));
- if (l = sizeof(buf) - n)
+ if (l = (int)(sizeof(buf) - n))
l = sizeof(buf) - n - 1;
if (l 0)
n += l;
@@ -227,7 +227,7 @@
}
void
-atalkprotopr(u_long off, char *name)
+atalkprotopr(u_long off, const char *name)
{
struct ddpcbcb;
struct ddpcb *prev, *next;
@@ -286,7 +286,7 @@
* Dump DDP statistics structure.
*/
void
-ddp_stats(u_long off, char *name)
+ddp_stats(u_long off, const char *name)
{
uint64_t ddpstat[DDP_NSTATS];
Index: src/usr.bin/netstat/bpf.c
diff -u src/usr.bin/netstat/bpf.c:1.8 src/usr.bin/netstat/bpf.c:1.9
--- src/usr.bin/netstat/bpf.c:1.8 Mon Apr 28 20:24:14
CVS commit: src/share/man/man4/man4.hp300
Module Name:src Committed By: wiz Date: Sun Apr 12 16:43:05 UTC 2009 Modified Files: src/share/man/man4/man4.hp300: rd.4 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/man4.hp300/rd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.hp300/rd.4 diff -u src/share/man/man4/man4.hp300/rd.4:1.11 src/share/man/man4/man4.hp300/rd.4:1.12 --- src/share/man/man4/man4.hp300/rd.4:1.11 Sun Apr 12 15:03:00 2009 +++ src/share/man/man4/man4.hp300/rd.4 Sun Apr 12 16:43:05 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: rd.4,v 1.11 2009/04/12 15:03:00 joerg Exp $ +.\ $NetBSD: rd.4,v 1.12 2009/04/12 16:43:05 wiz Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -76,14 +76,13 @@ .Sq Li rd and .Sq Li rrd -for the block and character files respectively. The second -component of the name, a drive unit number in the range of zero to -seven, is represented by a +for the block and character files respectively. +The second component of the name, a drive unit number in the range +of zero to seven, is represented by a .Sq Li \? -in the disk layouts below. The last component of the name is the -file system partition -and is designated -by a letter from +in the disk layouts below. +The last component of the name is the file system partition and is +designated by a letter from .Sq Li a to .Sq Li h
CVS commit: src/games/mille
Module Name:src Committed By: joerg Date: Sun Apr 12 16:57:02 UTC 2009 Modified Files: src/games/mille: mille.6 Log Message: Convert to mdoc markup. With input from wiz. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/games/mille/mille.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/mille/mille.6 diff -u src/games/mille/mille.6:1.10 src/games/mille/mille.6:1.11 --- src/games/mille/mille.6:1.10 Thu Sep 15 02:09:41 2005 +++ src/games/mille/mille.6 Sun Apr 12 16:57:02 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: mille.6,v 1.10 2005/09/15 02:09:41 wiz Exp $ +.\ $NetBSD: mille.6,v 1.11 2009/04/12 16:57:02 joerg Exp $ .\ .\ Copyright (c) 1983, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,58 +29,82 @@ .\ .\ @(#)mille.6 8.3 (Berkeley) 6/1/94 .\ -.TH MILLE 6 June 1, 1994 -.UC 4 -.SH NAME -mille \- play Mille Bornes -.SH SYNOPSIS -.B mille -[ file ] -.SH DESCRIPTION -.I Mille +.Dd June 1, 1994 +.Dt MILLE 6 +.Os +.Sh NAME +.Nm mille +.Nd play Mille Bornes +.Sh SYNOPSIS +.Nm mille +.Op Ar file +.Sh DESCRIPTION +.Nm Mille plays a two-handed game reminiscent of the Parker Brother's game of Mille Bornes with you. The rules are described below. If a file name is given on the command line, the game saved in that file is started. -.PP +.Pp When a game is started up, the bottom of the score window will contain a list of commands. They are: -.IP P +.Bl -tag -width .Ic P +.It Ic P Pick a card from the deck. -This card is placed in the `P' slot in your hand. -.IP D +This card is placed in the +.Sq P +slot in your hand. +.It Ic D Discard a card from your hand. To indicate which card, type the number of the card in the hand -(or \*(lqP\*(rq for the just-picked card) followed -by a \*[Lt]RETURN\*[Gt] or \*[Lt]SPACE\*[Gt]. -The \*[Lt]RETURN or \*[Lt]SPACE\*[Gt] is required to allow recovery from typos +(or +.Sq P +for the just-picked card) followed +by a +.Aq RETURN +or +.Aq SPACE . +The +.Aq RETURN +or +.Aq SPACE +is required to allow recovery from typos which can be very expensive, like discarding safeties. -.IP U +.It Ic U Use a card. The card is again indicated by its number, -followed by a \*[Lt]RETURN\*[Gt] or \*[Lt]SPACE\*[Gt]. -.IP O +followed by a +.Aq RETURN +or +.Aq SPACE . +.It Ic O Toggle ordering the hand. By default off, if turned on it will sort the cards in your hand appropriately. This is not recommended for the impatient on slow terminals. -.IP Q +.It Ic Q Quit the game. This will ask for confirmation, just to be sure. -Hitting \*[Lt]DELETE\*[Gt] (or \*[Lt]RUBOUT\*[Gt]) is equivalent. -.IP S +Hitting +.Aq DELETE +(or +.Aq RUBOUT ) +is equivalent. +.It Ic S Save the game in a file. If the game was started from a file, you will be given an opportunity to save it on the same file. If you don't wish to, or you did not start from a file, you will be asked for the file name. -If you type a \*[Lt]RETURN\*[Gt] without a name, -the save will be terminated and the game resumed. -.IP R +If you type a +.Aq RETURN +without a name, the save will be terminated and the game resumed. +.It Ic R Redraw the screen from scratch. -The command ^L (control `L') will also work. -.IP W +The command ^L (control +.Sq L ) +will also work. +.It Ic W Toggle window type. This switches the score window between the startup window (with all the command names) and the end-of-game window. @@ -88,124 +112,117 @@ saves time by eliminating the switch at the end of the game to show the final score. Recommended for hackers and other miscreants. -.PP +.El +.Pp If you make a mistake, an error message will be printed on the last line of the score window, and a bell will beep. -.PP +.Pp At the end of each hand or game, you will be asked if you wish to play another. If not, it will ask you if you want to save the game. If you do, and the save is unsuccessful, play will be resumed as if you had said you wanted to play another hand/game. This allows you to use the -.RB \*(lq S \*(rq +.Dq Ic S command to reattempt the save. -.SH AUTHORS -Ken Arnold -.br +.Sh AUTHORS +.An Ken Arnold +.Pp (The game itself is a product of Parker Brothers, Inc.) -.SH SEE ALSO -curses(3X), -.I Screen Updating and Cursor Movement Optimization: -.IR A Library Package , -Ken Arnold -.SH CARDS -.PP +.Sh SEE ALSO +.Xr curses 3 , +.Rs +.%T Screen Updating and Cursor Movement Optimization: A Library Package +.%A Ken Arnold +.Re +.Sh CARDS Here is some useful information. The number in parentheses after the card name is the number of that card in the deck: -.sp -.nf -.ne 10 -.ta \w'Speed Limit (3)'u+3n \w'Speed Limit (3)'u+\w'End of Limit (6)'u+6n -Hazard Repair Safety -.sp -Out of Gas (2) Gasoline (6) Extra Tank (1) -Flat Tire (2) Spare Tire (6) Puncture Proof (1) -Accident (2) Repairs (6) Driving Ace (1) -Stop (4) Go (14) Right of Way (1) -Speed Limit (3) End of Limit
CVS commit: src/games/fortune/fortune
Module Name:src Committed By: joerg Date: Sun Apr 12 16:58:57 UTC 2009 Modified Files: src/games/fortune/fortune: fortune.6 Log Message: Don't nest displays. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/games/fortune/fortune/fortune.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/fortune/fortune.6 diff -u src/games/fortune/fortune/fortune.6:1.11 src/games/fortune/fortune/fortune.6:1.12 --- src/games/fortune/fortune/fortune.6:1.11 Thu Sep 9 22:01:08 2004 +++ src/games/fortune/fortune/fortune.6 Sun Apr 12 16:58:57 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: fortune.6,v 1.11 2004/09/09 22:01:08 wiz Exp $ +.\ $NetBSD: fortune.6,v 1.12 2009/04/12 16:58:57 joerg Exp $ .\ .\ Copyright (c) 1985, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -94,10 +94,10 @@ we believe in healthy, hearty laughter -- at the expense of the whole human race, if needs be. Needs be. +.Ed .Bd -filled -offset indent-two -compact --H. Allen Smith, Rude Jokes .Ed -.Ed .It Fl s Short apothegms only. .It Fl w
CVS commit: src/external/bsd/libbind/dist
Module Name:src
Committed By: christos
Date: Sun Apr 12 17:08:03 UTC 2009
Added Files:
src/external/bsd/libbind/dist: include4netbsd libc4netbsd
Log Message:
more fixes for the import scripts
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/libbind/dist/include4netbsd \
src/external/bsd/libbind/dist/libc4netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/libbind/dist/include4netbsd
diff -u /dev/null src/external/bsd/libbind/dist/include4netbsd:1.1
--- /dev/null Sun Apr 12 13:08:03 2009
+++ src/external/bsd/libbind/dist/include4netbsd Sun Apr 12 13:08:03 2009
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# Use this script to update the bind include files used in the nameserver,
+# after you've imported and built the latest libbind code. After you run this,
+# cvs import the resulting directory
+#
+# $ cd /usr/src/external/bsd/libbind/dist
+# $ ./include4netbsd . /tmp/include
+# $ cd /tmp/include
+# $ cvs -d cvs.netbsd.org:/cvsroot import src/include ISC libbind-X-Y-Z
+#
+
+PROG=$(basename $0)
+if [ \( -z $1 \) -o \( -z $2 \) ]
+then
+ echo Usage: $PROG libbind-src include-dest 12
+ exit 1
+fi
+
+LIBBIND=$1
+INCLUDE=$2
+
+mkdir -p $INCLUDE
+
+copy()
+{
+ sed -e 's/ __P((/(/g' \
+ -e 's/));/);/g' \
+ -e 's/u_int\([136]\)/uint\1/g' \
+ -e '/\\file/d' \
+ $1 $2
+}
+
+for i in netdb.h res_update.h resolv.h
+do
+ copy $LIBBIND/include/$i $INCLUDE/$i
+done
+
+mkdir -p $INCLUDE/arpa
+
+for i in inet.h nameser.h nameser_compat.h
+do
+ copy $LIBBIND/include/arpa/$i $INCLUDE/arpa/$i
+done
Index: src/external/bsd/libbind/dist/libc4netbsd
diff -u /dev/null src/external/bsd/libbind/dist/libc4netbsd:1.1
--- /dev/null Sun Apr 12 13:08:03 2009
+++ src/external/bsd/libbind/dist/libc4netbsd Sun Apr 12 13:08:03 2009
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Use this script to update the libc resolver code, after you've imported
+# the latest libbind code. After you run this, cvs import the resulting
+# directory
+#
+# $ cd /usr/src/external/bsd/libbind/dist
+# $ ./libc4netbsd . /tmp/libc
+# $ cd /tmp/libc
+# $ cvs -d cvs.netbsd.org:/cvsroot import src/lib/libc ISC libbind-X-Y-Z
+#
+
+PROG=$(basename $0)
+if [ \( -z $1 \) -o \( -z $2 \) ]
+then
+ echo Usage: $PROG bind-src libc-dest 12
+ exit 1
+fi
+LIBBIND=$1
+LIBC=$2
+
+mkdir -p $LIBC/include/isc
+
+for i in assertions.h dst.h eventlib.h heap.h list.h memcluster.h
+do
+ cp $LIBBIND/include/isc/$i $LIBC/include/isc/$i
+done
+cp $LIBBIND/include/resolv_mt.h $LIBC/include
+
+mkdir -p $LIBC/inet
+
+for i in inet_addr.c inet_cidr_ntop.c inet_cidr_pton.c inet_ntop.c \
+inet_pton.c nsap_addr.c
+do
+ cp $LIBBIND/inet/$i $LIBC/inet/$i
+done
+
+mkdir -p $LIBC/isc
+
+for i in assertions.c ev_streams.c ev_timers.c eventlib_p.h
+do
+ cp $LIBBIND/isc/$i $LIBC/isc/$i
+done
+
+mkdir -p $LIBC/nameser
+
+for i in ns_name.c ns_netint.c ns_parse.c ns_print.c ns_samedomain.c ns_ttl.c
+do
+ cp $LIBBIND/nameser/$i $LIBC/nameser/$i
+done
+
+mkdir -p $LIBC/resolv
+
+for i in herror.c res_comp.c res_data.c res_debug.c res_debug.h res_init.c \
+res_mkquery.c res_private.h res_query.c res_send.c
+do
+ cp $LIBBIND/resolv/$i $LIBC/resolv/$i
+done
+
+mkdir -p $LIBC/net
+cp $LIBBIND/isc/base64.c $LIBC/net
CVS commit: src/lib
Module Name:src Committed By: christos Date: Sun Apr 12 17:09:46 UTC 2009 Modified Files: src/lib: Makefile Log Message: unhook bind libraries To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/Makefile diff -u src/lib/Makefile:1.133 src/lib/Makefile:1.134 --- src/lib/Makefile:1.133 Mon Jan 26 01:27:33 2009 +++ src/lib/Makefile Sun Apr 12 13:09:46 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.133 2009/01/26 06:27:33 mrg Exp $ +# $NetBSD: Makefile,v 1.134 2009/04/12 17:09:46 christos Exp $ # from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91 .include bsd.own.mk @@ -87,12 +87,6 @@ SUBDIR+= librefuse # depends on libpuffs SUBDIR+= librumpuser # depends on libpthread -# XXX These bind9/ISC libraries should depend on each other but the -# XXX dependency ordering requires considerable investigation. -# XXX Please preserve the order below so we know the order ISC links -# XXX them in in their Makefiles. -SUBDIR+= libbind9 libdns liblwres libisccfg libisccc libisc # dep. libpthread - # 2nd library dependency barrier SUBDIR+= .WAIT
CVS commit: src/external/lib
Module Name:src Committed By: christos Date: Sun Apr 12 17:10:22 UTC 2009 Modified Files: src/external/lib: Makefile Log Message: hook bind libraries To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lib/Makefile diff -u src/external/lib/Makefile:1.6 src/external/lib/Makefile:1.7 --- src/external/lib/Makefile:1.6 Fri Jan 23 20:15:26 2009 +++ src/external/lib/Makefile Sun Apr 12 13:10:22 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/01/24 01:15:26 agc Exp $ +# $NetBSD: Makefile,v 1.7 2009/04/12 17:10:22 christos Exp $ # # This Makefile exists to provide a single point to build @@ -23,5 +23,6 @@ SUBDIR+= ../bsd/fetch/lib SUBDIR+= ../bsd/libarchive/lib SUBDIR+= ../bsd/am-utils/lib +SUBDIR+= ../bsd/bind/lib .include bsd.subdir.mk
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Sun Apr 12 17:12:44 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.mi Log Message: bump libc and bind libraries. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.463 -r1.464 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.39 src/distrib/sets/lists/base/md.amd64:1.40 --- src/distrib/sets/lists/base/md.amd64:1.39 Fri Apr 10 19:19:26 2009 +++ src/distrib/sets/lists/base/md.amd64 Sun Apr 12 13:12:44 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.39 2009/04/10 23:19:26 christos Exp $ +# $NetBSD: md.amd64,v 1.40 2009/04/12 17:12:44 christos Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./usr/bin/fdformatbase-util-bin @@ -63,7 +63,7 @@ ./usr/lib/i386/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/i386/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/i386/libc.so.12 base-compat-shlib compat,pic -./usr/lib/i386/libc.so.12.165 base-compat-shlib compat,pic +./usr/lib/i386/libc.so.12.166 base-compat-shlib compat,pic ./usr/lib/i386/libcom_err.so.6 base-compat-shlib compat,pic ./usr/lib/i386/libcom_err.so.6.0 base-compat-shlib compat,pic ./usr/lib/i386/libcrypt.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.36 src/distrib/sets/lists/base/md.sparc64:1.37 --- src/distrib/sets/lists/base/md.sparc64:1.36 Fri Apr 10 19:19:26 2009 +++ src/distrib/sets/lists/base/md.sparc64 Sun Apr 12 13:12:44 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.36 2009/04/10 23:19:26 christos Exp $ +# $NetBSD: md.sparc64,v 1.37 2009/04/12 17:12:44 christos Exp $ ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin ./usr/lib/sparc base-compat-lib compat @@ -62,7 +62,7 @@ ./usr/lib/sparc/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/sparc/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/sparc/libc.so.12 base-compat-shlib compat,pic -./usr/lib/sparc/libc.so.12.165 base-compat-shlib compat,pic +./usr/lib/sparc/libc.so.12.166 base-compat-shlib compat,pic ./usr/lib/sparc/libcom_err.so.6 base-compat-shlib compat,pic ./usr/lib/sparc/libcom_err.so.6.0 base-compat-shlib compat,pic ./usr/lib/sparc/libcrypt.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.463 src/distrib/sets/lists/base/shl.mi:1.464 --- src/distrib/sets/lists/base/shl.mi:1.463 Fri Apr 10 19:19:26 2009 +++ src/distrib/sets/lists/base/shl.mi Sun Apr 12 13:12:44 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.463 2009/04/10 23:19:26 christos Exp $ +# $NetBSD: shl.mi,v 1.464 2009/04/12 17:12:44 christos Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -13,7 +13,7 @@ # # Note: libtermcap and libtermlib are hardlinked and share the same version. # -./lib/libc.so.12.165base-sys-shlib dynamicroot +./lib/libc.so.12.166base-sys-shlib dynamicroot ./lib/libcrypt.so.1.0base-sys-shlib dynamicroot ./lib/libcrypto.so.5.0base-crypto-shlib crypto,dynamicroot ./lib/libdevmapper.so.1.0 base-lvm-shlib lvm,dynamicroot @@ -55,18 +55,18 @@ ./usr/lib/libarchive.so.3.0 base-sys-shlib ./usr/lib/libasn1.so.8.0 base-krb5-shlib kerberos ./usr/lib/libbfd.so.10.0 base-sys-shlib bfd -./usr/lib/libbind9.so.2.0 base-bind-shlib +./usr/lib/libbind9.so.3.0 base-bind-shlib ./usr/lib/libbluetooth.so.4.0 base-sys-shlib ./usr/lib/libbsdmalloc.so.0.0 base-sys-shlib ./usr/lib/libbz2.so.1.1base-sys-shlib -./usr/lib/libc.so.12.165 base-sys-shlib +./usr/lib/libc.so.12.166 base-sys-shlib ./usr/lib/libcom_err.so.6.0 base-krb5-shlib kerberos ./usr/lib/libcrypt.so.1.0 base-sys-shlib ./usr/lib/libcrypto.so.5.0 base-crypto-shlib crypto ./usr/lib/libcurses.so.7.0 base-sys-shlib ./usr/lib/libdes.so.8.0base-crypto-shlib crypto ./usr/lib/libdevmapper.so.1.0 base-lvm-shlib lvm -./usr/lib/libdns.so.2.0base-bind-shlib +./usr/lib/libdns.so.3.0base-bind-shlib ./usr/lib/libedit.so.3.0 base-sys-shlib ./usr/lib/libevent.so.3.0 base-sys-shlib ./usr/lib/libfetch.so.2.0 base-sys-shlib @@ -80,9 +80,9 @@ ./usr/lib/libhx509.so.3.0 base-krb5-shlib kerberos ./usr/lib/libintl.so.1.0 base-sys-shlib ./usr/lib/libipsec.so.3.0 base-net-shlib -./usr/lib/libisc.so.2.0base-bind-shlib -./usr/lib/libisccc.so.2.0 base-bind-shlib -./usr/lib/libisccfg.so.2.0 base-bind-shlib +./usr/lib/libisc.so.3.0base-bind-shlib +./usr/lib/libisccc.so.3.0 base-bind-shlib
CVS commit: src/usr.sbin
Module Name:src Committed By: christos Date: Sun Apr 12 17:13:06 UTC 2009 Modified Files: src/usr.sbin: Makefile Log Message: unhook bind To generate a diff of this commit: cvs rdiff -u -r1.239 -r1.240 src/usr.sbin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/Makefile diff -u src/usr.sbin/Makefile:1.239 src/usr.sbin/Makefile:1.240 --- src/usr.sbin/Makefile:1.239 Sat Mar 7 17:08:08 2009 +++ src/usr.sbin/Makefile Sun Apr 12 13:13:06 2009 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.239 2009/03/07 22:08:08 ad Exp $ +# $NetBSD: Makefile,v 1.240 2009/04/12 17:13:06 christos Exp $ # from: @(#)Makefile 5.20 (Berkeley) 6/12/93 .include bsd.own.mk -SUBDIR= ac accton acpitools altq apm apmd arp bad144 bind bootp \ +SUBDIR= ac accton acpitools altq apm apmd arp bad144 bootp \ btattach btconfig btdevctl bthcid btpand catman \ chown chroot chrtbl cnwctl cpuctl crash cron dev_mkdb \ dhcp diskpart dumpfs dumplfs edquota eeprom \
CVS commit: src/external/bsd
Module Name:src
Committed By: christos
Date: Sun Apr 12 17:13:42 UTC 2009
Modified Files:
src/external/bsd: Makefile
Log Message:
hook bind
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.9 src/external/bsd/Makefile:1.10
--- src/external/bsd/Makefile:1.9 Fri Jan 23 20:15:26 2009
+++ src/external/bsd/Makefile Sun Apr 12 13:13:42 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/01/24 01:15:26 agc Exp $
+# $NetBSD: Makefile,v 1.10 2009/04/12 17:13:42 christos Exp $
.include bsd.own.mk
-SUBDIR+= am-utils dhcpcd fetch libarchive pkg_install
+SUBDIR+= am-utils bind dhcpcd fetch libarchive pkg_install top
.if (${MKATF} != no)
SUBDIR+= atf
.endif
@@ -15,6 +15,5 @@
.if (${MKPCC} != no)
SUBDIR+= pcc
.endif
-SUBDIR+= top
.include bsd.subdir.mk
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sun Apr 12 17:24:52 UTC 2009 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi Log Message: fix sets for new bind. To generate a diff of this commit: cvs rdiff -u -r1.801 -r1.802 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1244 -r1.1245 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1130 -r1.1131 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.801 src/distrib/sets/lists/base/mi:1.802 --- src/distrib/sets/lists/base/mi:1.801 Sun Mar 29 10:25:39 2009 +++ src/distrib/sets/lists/base/mi Sun Apr 12 13:24:51 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.801 2009/03/29 14:25:39 christos Exp $ +# $NetBSD: mi,v 1.802 2009/04/12 17:24:51 christos Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -1362,6 +1362,8 @@ ./usr/sbin/dig base-obsolete obsolete ./usr/sbin/diskpartbase-sysutil-bin ./usr/sbin/dnsquerybase-obsolete obsolete +./usr/sbin/dnssec-dsfromkey base-bind-bin +./usr/sbin/dnssec-keyfromlabel base-bind-bin ./usr/sbin/dnssec-keygen base-bind-bin ./usr/sbin/dnssec-makekeyset base-obsolete obsolete ./usr/sbin/dnssec-signkey base-obsolete obsolete Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1244 src/distrib/sets/lists/comp/mi:1.1245 --- src/distrib/sets/lists/comp/mi:1.1244 Fri Apr 10 19:16:30 2009 +++ src/distrib/sets/lists/comp/mi Sun Apr 12 13:24:51 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1244 2009/04/10 23:16:30 christos Exp $ +# $NetBSD: mi,v 1.1245 2009/04/12 17:24:51 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3288,6 +3288,8 @@ ./usr/libdata/debug/usr/sbin/dhcpd.debug comp-dhcpd-debug debug ./usr/libdata/debug/usr/sbin/dhcrelay.debug comp-dhcpd-debug debug ./usr/libdata/debug/usr/sbin/diskpart.debug comp-sysutil-debug debug +./usr/libdata/debug/usr/sbin/dnssec-dsfromkey.debug comp-debugd-bin debug +./usr/libdata/debug/usr/sbin/dnssec-keyfromlabel.debug comp-debugd-bin debug ./usr/libdata/debug/usr/sbin/dnssec-keygen.debug comp-debugd-bin debug ./usr/libdata/debug/usr/sbin/dnssec-signzone.debug comp-debugd-bin debug ./usr/libdata/debug/usr/sbin/dtmfdecode.debug comp-isdn-debug debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1130 src/distrib/sets/lists/man/mi:1.1131 --- src/distrib/sets/lists/man/mi:1.1130 Thu Apr 9 23:50:38 2009 +++ src/distrib/sets/lists/man/mi Sun Apr 12 13:24:51 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1130 2009/04/10 03:50:38 reed Exp $ +# $NetBSD: mi,v 1.1131 2009/04/12 17:24:51 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -309,6 +309,7 @@ ./usr/share/man/cat1/nice.0 man-util-catman .cat ./usr/share/man/cat1/nl.0 man-util-catman .cat ./usr/share/man/cat1/nohup.0 man-util-catman .cat +./usr/share/man/cat1/nsupdate.0 man-netutil-catman .cat ./usr/share/man/cat1/nvi.0 man-obsolete obsolete ./usr/share/man/cat1/nview.0 man-obsolete obsolete ./usr/share/man/cat1/od.0 man-util-catman .cat @@ -2023,6 +2024,8 @@ ./usr/share/man/cat8/dkscan_bsdlabel.0 man-sysutil-catman .cat ./usr/share/man/cat8/dmesg.0 man-sysutil-catman .cat ./usr/share/man/cat8/dmsetup.0 man-lvm-catman lvm,.cat +./usr/share/man/cat8/dnssec-dsfromkey.0 man-bind-catman .cat +./usr/share/man/cat8/dnssec-keyfromlabel.0 man-bind-catman .cat ./usr/share/man/cat8/dnssec-keygen.0 man-bind-catman .cat ./usr/share/man/cat8/dnssec-makekeyset.0 man-obsolete obsolete ./usr/share/man/cat8/dnssec-signkey.0 man-obsolete obsolete @@ -2336,7 +2339,7 @@ ./usr/share/man/cat8/nologin.0 man-sysutil-catman .cat ./usr/share/man/cat8/nqmgr.0 man-obsolete obsolete ./usr/share/man/cat8/nslookup.0 man-netutil-catman .cat -./usr/share/man/cat8/nsupdate.0 man-netutil-catman .cat +./usr/share/man/cat8/nsupdate.0 man-obsolete obsolete ./usr/share/man/cat8/ntalkd.0 man-netutil-catman .cat ./usr/share/man/cat8/ntp-keygen.0 man-ntp-catman crypto,.cat ./usr/share/man/cat8/ntpd.0 man-ntp-catman .cat @@ -2961,6 +2964,7 @@ ./usr/share/man/html1/nice.html man-util-htmlman html ./usr/share/man/html1/nl.html man-util-htmlman html ./usr/share/man/html1/nohup.html man-util-htmlman html +./usr/share/man/html1/nsupdate.html man-netutil-htmlman html ./usr/share/man/html1/nvi.html man-obsolete obsolete ./usr/share/man/html1/nview.html man-obsolete obsolete ./usr/share/man/html1/od.html man-util-htmlman html @@ -4469,6 +4473,8 @@ ./usr/share/man/html8/dkscan_bsdlabel.html man-sysutil-htmlman html ./usr/share/man/html8/dmesg.html man-sysutil-htmlman html
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sun Apr 12 17:28:06 UTC 2009 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention bind and libbind To generate a diff of this commit: cvs rdiff -u -r1.682 -r1.683 src/doc/3RDPARTY cvs rdiff -u -r1.1206 -r1.1207 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.682 src/doc/3RDPARTY:1.683 --- src/doc/3RDPARTY:1.682 Sun Apr 12 07:13:55 2009 +++ src/doc/3RDPARTY Sun Apr 12 13:28:06 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.682 2009/04/12 11:13:55 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.683 2009/04/12 17:28:06 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -90,9 +90,9 @@ Notes: bc includes dc, both of which are in the NetBSD tree. -Package: bind/named -Version: libc/includes: 9.5.0, bind: 9.5.0 -Current Vers: 9.5.1-P1/9.6.0-P1 +Package: bind [named and utils] +Version: 9.6.1-P1 +Current Vers: 9.6.1-P1 Maintainer: Paul Vixie vi...@vix.com Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/sw/bind/ @@ -100,10 +100,23 @@ Responsible: vixie, christos License: BSD-like (2-clause) Notes: -First bind2netbsd script to import into src/dist/bind. -The Makefiles in src/usr.sbin/bind are not handled by the script. +First bind2netbsd script to import into src/external/bsd/bind/dist. +The Makefiles in src/external/bsd/bind are not handled by the script. Build bind to generate the include files. -Then binclude4netbsd script to import into src/usr.sbin/bind/include. +Then binclude4netbsd script to import into src/external/bsd/bind/include. +The libc and include parts of the resolver are now part of libbind. + +Package: libbind [libc resolver and includes] +Version: bind-9.5.0 +Current Vers: libbind-6.0-rc1 +Maintainer: Paul Vixie vi...@vix.com +Archive Site: ftp://ftp.isc.org/isc/libbind/ +Home Page: http://www.isc.org/sw/bind/ +Mailing List: +Responsible: vixie, christos +License: BSD-like (2-clause) +Notes: +First libbind2netbsd script to import into src/external/bsd/libbind/dist. Then include4netbsd script to import into src/include. Then libc4netbsd script to update the resolver in libc. Todo[1]: Update libresolv if needed. @@ -115,6 +128,7 @@ Todo[3]: net/base64.c is imported from bind but should be moved from net to isc/base64.c. Todo[4]: Re-entrant functions of net/* +Todo[5]: Reconcile the doc directory. Package: binutils Version: 2.16.1 Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1206 src/doc/CHANGES:1.1207 --- src/doc/CHANGES:1.1206 Sat Apr 11 11:01:52 2009 +++ src/doc/CHANGES Sun Apr 12 13:28:06 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1206 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1207 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -168,3 +168,5 @@ [ad 20090329] cvs: Import 1.12.13 [christos 20090408] mtree(8): Add -S option to sort entries. [apb 20090408] + bind: Update to 9.6.1-P1 [christos 20090412] + libbind: Update to 6.0-rc1 [christos 20090412]
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Sun Apr 12 17:35:16 UTC 2009 Modified Files: src/etc/mtree: NetBSD.dist Log Message: add the var run lwresd and var run named To generate a diff of this commit: cvs rdiff -u -r1.395 -r1.396 src/etc/mtree/NetBSD.dist Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist diff -u src/etc/mtree/NetBSD.dist:1.395 src/etc/mtree/NetBSD.dist:1.396 --- src/etc/mtree/NetBSD.dist:1.395 Wed Apr 8 09:32:26 2009 +++ src/etc/mtree/NetBSD.dist Sun Apr 12 13:35:16 2009 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist,v 1.395 2009/04/08 13:32:26 pooka Exp $ +# $NetBSD: NetBSD.dist,v 1.396 2009/04/12 17:35:16 christos Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -1463,6 +1463,8 @@ ./var/chroot/named/usr/libexec ./var/chroot/named/var ./var/chroot/named/var/run mode=0775 gname=named +./var/chroot/named/var/run/lwresd mode=0775 gname=named +./var/chroot/named/var/run/named mode=0775 gname=named ./var/chroot/named/var/tmp mode=01775 gname=named ./var/chroot/ntpd ./var/chroot/ntpd/dev @@ -1495,6 +1497,8 @@ ./var/preserve ./var/quotas gname=operator mode=0750 ./var/run +./var/run/lwresd mode=0775 gname=named +./var/run/named mode=0775 gname=named ./var/rwho uname=_rwhod gname=_rwhod ./var/spool ./var/spool/ftp
CVS commit: src
Module Name:src Committed By: joerg Date: Sun Apr 12 17:56:35 UTC 2009 Modified Files: src/distrib/sets/lists/text: mi src/gnu/dist/groff/tmac: tty.tmac src/gnu/usr.bin/groff/tmac: Makefile Added Files: src/gnu/dist/groff/tmac: ascii.tmac Log Message: Install some default transliterations for man pages. If nroff is used with ASCII as output, encode the German umlaut and szet characters with the normal transliteration rules. OK wiz@ To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/text/mi cvs rdiff -u -r0 -r1.1 src/gnu/dist/groff/tmac/ascii.tmac cvs rdiff -u -r1.1.1.2 -r1.2 src/gnu/dist/groff/tmac/tty.tmac cvs rdiff -u -r1.24 -r1.25 src/gnu/usr.bin/groff/tmac/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/text/mi diff -u src/distrib/sets/lists/text/mi:1.31 src/distrib/sets/lists/text/mi:1.32 --- src/distrib/sets/lists/text/mi:1.31 Fri Aug 29 06:08:40 2008 +++ src/distrib/sets/lists/text/mi Sun Apr 12 17:56:35 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.31 2008/08/29 06:08:40 lukem Exp $ +# $NetBSD: mi,v 1.32 2009/04/12 17:56:35 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -602,6 +602,7 @@ ./usr/share/tmac/an-old.tmac text-groff-share share ./usr/share/tmac/an.tmac text-groff-share share ./usr/share/tmac/andoc.tmac text-groff-share share +./usr/share/tmac/ascii.tmac text-groff-share share ./usr/share/tmac/composite.tmac text-groff-share share ./usr/share/tmac/cp1047.tmac text-groff-share share ./usr/share/tmac/devtag.tmac text-groff-share share Index: src/gnu/dist/groff/tmac/tty.tmac diff -u src/gnu/dist/groff/tmac/tty.tmac:1.1.1.2 src/gnu/dist/groff/tmac/tty.tmac:1.2 --- src/gnu/dist/groff/tmac/tty.tmac:1.1.1.2 Mon Feb 6 18:15:17 2006 +++ src/gnu/dist/groff/tmac/tty.tmac Sun Apr 12 17:56:35 2009 @@ -83,7 +83,9 @@ .ie '\*(.T'cp1047' \ . do mso cp1047.tmac .el \ -. if !'\*(.T'ascii' \ +. if '\*(.T'ascii' \ +.do mso ascii.tmac +. el \ .do mso latin1.tmac . .\ If you want the character definitions in tty-char.tmac to be loaded Index: src/gnu/usr.bin/groff/tmac/Makefile diff -u src/gnu/usr.bin/groff/tmac/Makefile:1.24 src/gnu/usr.bin/groff/tmac/Makefile:1.25 --- src/gnu/usr.bin/groff/tmac/Makefile:1.24 Sat Oct 25 22:27:35 2008 +++ src/gnu/usr.bin/groff/tmac/Makefile Sun Apr 12 17:56:35 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2008/10/25 22:27:35 apb Exp $ +# $NetBSD: Makefile,v 1.25 2009/04/12 17:56:35 joerg Exp $ # $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.41 2003/05/01 13:22:21 ru Exp $ @@ -26,7 +26,7 @@ ps.tmac psold.tmac pspic.tmac psatk.tmac \ dvi.tmac \ tty.tmac tty-char.tmac \ - latin1.tmac latin2.tmac latin9.tmac cp1047.tmac \ + latin1.tmac latin2.tmac latin9.tmac cp1047.tmac ascii.tmac \ unicode.tmac \ X.tmac Xps.tmac \ lj4.tmac \ Added files: Index: src/gnu/dist/groff/tmac/ascii.tmac diff -u /dev/null src/gnu/dist/groff/tmac/ascii.tmac:1.1 --- /dev/null Sun Apr 12 17:56:35 2009 +++ src/gnu/dist/groff/tmac/ascii.tmac Sun Apr 12 17:56:35 2009 @@ -0,0 +1,8 @@ +.\ Transliterate non-ASCII characters for use in man pages etc. +.fchar \(:a ae +.fchar \(:o oe +.fchar \(:u ue +.fchar \(:A Ae +.fchar \(:O Oe +.fchar \(:U Ue +.fchar \(ss ss
CVS commit: src/usr.sbin/lpr/lp
Module Name:src Committed By: joerg Date: Sun Apr 12 18:51:33 UTC 2009 Modified Files: src/usr.sbin/lpr/lp: lp.1 Log Message: Remove conditional, groff now knows how to deal with ASCII output. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/lpr/lp/lp.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/lpr/lp/lp.1 diff -u src/usr.sbin/lpr/lp/lp.1:1.8 src/usr.sbin/lpr/lp/lp.1:1.9 --- src/usr.sbin/lpr/lp/lp.1:1.8 Tue Feb 25 10:36:11 2003 +++ src/usr.sbin/lpr/lp/lp.1 Sun Apr 12 18:51:33 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: lp.1,v 1.8 2003/02/25 10:36:11 wiz Exp $ +.\ $NetBSD: lp.1,v 1.9 2009/04/12 18:51:33 joerg Exp $ .\ .\ Copyright (c) 1995 Joerg Wunsch .\ @@ -108,8 +108,7 @@ This implementation of the .Nm command has been written by -.if t J\(:org Wunsch . -.if n Joerg Wunsch . +J\(:org Wunsch. .Sh BUGS The .St -p1003.2
CVS commit: src/gnu/dist/groff/tmac
Module Name:src Committed By: joerg Date: Sun Apr 12 18:52:52 UTC 2009 Modified Files: src/gnu/dist/groff/tmac: Makefile.sub Log Message: Hook up ascii.tmac for the tool build as well. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/gnu/dist/groff/tmac/Makefile.sub Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/groff/tmac/Makefile.sub diff -u src/gnu/dist/groff/tmac/Makefile.sub:1.1.1.3 src/gnu/dist/groff/tmac/Makefile.sub:1.2 --- src/gnu/dist/groff/tmac/Makefile.sub:1.1.1.3 Mon Feb 6 18:15:15 2006 +++ src/gnu/dist/groff/tmac/Makefile.sub Sun Apr 12 18:52:52 2009 @@ -18,7 +18,7 @@ ps.tmac psold.tmac pspic.tmac psatk.tmac \ dvi.tmac \ tty.tmac tty-char.tmac \ - latin1.tmac latin2.tmac latin9.tmac cp1047.tmac \ + latin1.tmac latin2.tmac latin9.tmac cp1047.tmac ascii.tmac \ unicode.tmac \ X.tmac Xps.tmac \ lj4.tmac \
CVS commit: src/usr.sbin/lpr/lp
Module Name:src Committed By: wiz Date: Sun Apr 12 19:39:52 UTC 2009 Modified Files: src/usr.sbin/lpr/lp: lp.1 Log Message: New sentence, new line. Use .An. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/lpr/lp/lp.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/lpr/lp/lp.1 diff -u src/usr.sbin/lpr/lp/lp.1:1.9 src/usr.sbin/lpr/lp/lp.1:1.10 --- src/usr.sbin/lpr/lp/lp.1:1.9 Sun Apr 12 18:51:33 2009 +++ src/usr.sbin/lpr/lp/lp.1 Sun Apr 12 19:39:52 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: lp.1,v 1.9 2009/04/12 18:51:33 joerg Exp $ +.\ $NetBSD: lp.1,v 1.10 2009/04/12 19:39:52 wiz Exp $ .\ .\ Copyright (c) 1995 Joerg Wunsch .\ @@ -57,7 +57,8 @@ .Nm is a front-end to the print spooler as required by the .St -p1003.2 -specification. It effectively invokes +specification. +It effectively invokes .Xr lpr 1 with the proper set of arguments. It generally prints the named files on the destination printer. @@ -68,10 +69,12 @@ Make the .Nm command exit only after further access to any of the input files is no -longer required. The application can then safely delete or modify the -files without affecting the output operation. +longer required. +The application can then safely delete or modify the files without +affecting the output operation. .It Fl d Ar dest -Specify a particular printer. If no +Specify a particular printer. +If no .Fl d is provided on the command line, the contents of the environment variables @@ -87,8 +90,8 @@ .It Fl s Silent operation. .It Fl o -Printer specific options. Not supported, provided only as a compatibility -option for SVR4. +Printer specific options. +Not supported, provided only as a compatibility option for SVR4. .El .Sh ENVIRONMENT As described above, the variables @@ -108,10 +111,10 @@ This implementation of the .Nm command has been written by -J\(:org Wunsch. +.An J\(:org Wunsch . .Sh BUGS The .St -p1003.2 -specification does not provide any means to print non-text files. It -rather requires the files to be printed to be text files limited to -reasonable line lengths and printable characters. +specification does not provide any means to print non-text files. +It rather requires the files to be printed to be text files limited +to reasonable line lengths and printable characters.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Sun Apr 12 19:55:05 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 mi Log Message: err too many places to fix... To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.802 -r1.803 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.40 src/distrib/sets/lists/base/md.amd64:1.41 --- src/distrib/sets/lists/base/md.amd64:1.40 Sun Apr 12 13:12:44 2009 +++ src/distrib/sets/lists/base/md.amd64 Sun Apr 12 15:55:05 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.40 2009/04/12 17:12:44 christos Exp $ +# $NetBSD: md.amd64,v 1.41 2009/04/12 19:55:05 christos Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./usr/bin/fdformatbase-util-bin @@ -54,8 +54,8 @@ ./usr/lib/i386/libasn1.so.8.0 base-compat-shlib compat,pic ./usr/lib/i386/libbfd.so.10 base-compat-shlib compat,pic ./usr/lib/i386/libbfd.so.10.0 base-compat-shlib compat,pic -./usr/lib/i386/libbind9.so.2 base-compat-shlib compat,pic -./usr/lib/i386/libbind9.so.2.0 base-compat-shlib compat,pic +./usr/lib/i386/libbind9.so.3 base-compat-shlib compat,pic +./usr/lib/i386/libbind9.so.3.0 base-compat-shlib compat,pic ./usr/lib/i386/libbluetooth.so.4 base-compat-shlib compat,pic ./usr/lib/i386/libbluetooth.so.4.0 base-compat-shlib compat,pic ./usr/lib/i386/libbsdmalloc.so.0 base-compat-shlib compat,pic @@ -104,12 +104,12 @@ ./usr/lib/i386/libintl.so.1.0 base-compat-shlib compat,pic ./usr/lib/i386/libipsec.so.3 base-compat-shlib compat,pic ./usr/lib/i386/libipsec.so.3.0 base-compat-shlib compat,pic -./usr/lib/i386/libisc.so.2 base-compat-shlib compat,pic -./usr/lib/i386/libisc.so.2.0 base-compat-shlib compat,pic -./usr/lib/i386/libisccc.so.2 base-compat-shlib compat,pic -./usr/lib/i386/libisccc.so.2.0 base-compat-shlib compat,pic -./usr/lib/i386/libisccfg.so.2 base-compat-shlib compat,pic -./usr/lib/i386/libisccfg.so.2.0 base-compat-shlib compat,pic +./usr/lib/i386/libisc.so.3 base-compat-shlib compat,pic +./usr/lib/i386/libisc.so.3.0 base-compat-shlib compat,pic +./usr/lib/i386/libisccc.so.3 base-compat-shlib compat,pic +./usr/lib/i386/libisccc.so.3.0 base-compat-shlib compat,pic +./usr/lib/i386/libisccfg.so.3 base-compat-shlib compat,pic +./usr/lib/i386/libisccfg.so.3.0 base-compat-shlib compat,pic ./usr/lib/i386/libiscsi.so.1 base-compat-shlib compat,pic ./usr/lib/i386/libiscsi.so.1.0 base-compat-shlib compat,pic ./usr/lib/i386/libkadm5clnt.so.11 base-compat-shlib compat,pic @@ -128,8 +128,8 @@ ./usr/lib/i386/libldap.so.3.0 base-compat-shlib compat,pic ./usr/lib/i386/libldap_r.so.3 base-compat-shlib compat,pic ./usr/lib/i386/libldap_r.so.3.0 base-compat-shlib compat,pic -./usr/lib/i386/liblwres.so.2 base-compat-shlib compat,pic -./usr/lib/i386/liblwres.so.2.0 base-compat-shlib compat,pic +./usr/lib/i386/liblwres.so.3 base-compat-shlib compat,pic +./usr/lib/i386/liblwres.so.3.0 base-compat-shlib compat,pic ./usr/lib/i386/libm.so.0 base-compat-shlib compat,pic ./usr/lib/i386/libm.so.0.6 base-compat-shlib compat,pic ./usr/lib/i386/libmagic.so.2 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.37 src/distrib/sets/lists/base/md.sparc64:1.38 --- src/distrib/sets/lists/base/md.sparc64:1.37 Sun Apr 12 13:12:44 2009 +++ src/distrib/sets/lists/base/md.sparc64 Sun Apr 12 15:55:05 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.37 2009/04/12 17:12:44 christos Exp $ +# $NetBSD: md.sparc64,v 1.38 2009/04/12 19:55:05 christos Exp $ ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin ./usr/lib/sparc base-compat-lib compat @@ -53,8 +53,8 @@ ./usr/lib/sparc/libasn1.so.8.0 base-compat-shlib compat,pic ./usr/lib/sparc/libbfd.so.10 base-compat-shlib compat,pic ./usr/lib/sparc/libbfd.so.10.0 base-compat-shlib compat,pic -./usr/lib/sparc/libbind9.so.2 base-compat-shlib compat,pic -./usr/lib/sparc/libbind9.so.2.0 base-compat-shlib compat,pic +./usr/lib/sparc/libbind9.so.3 base-compat-shlib compat,pic +./usr/lib/sparc/libbind9.so.3.0 base-compat-shlib compat,pic ./usr/lib/sparc/libbluetooth.so.4 base-compat-shlib compat,pic ./usr/lib/sparc/libbluetooth.so.4.0 base-compat-shlib compat,pic ./usr/lib/sparc/libbsdmalloc.so.0 base-compat-shlib compat,pic @@ -97,12 +97,12 @@ ./usr/lib/sparc/libintl.so.1.0 base-compat-shlib compat,pic ./usr/lib/sparc/libipsec.so.3 base-compat-shlib compat,pic ./usr/lib/sparc/libipsec.so.3.0 base-compat-shlib compat,pic -./usr/lib/sparc/libisc.so.2 base-compat-shlib compat,pic
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Sun Apr 12 20:54:41 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.elf Log Message: more library brokenness To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.166 -r1.167 src/distrib/sets/lists/base/shl.elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.41 src/distrib/sets/lists/base/md.amd64:1.42 --- src/distrib/sets/lists/base/md.amd64:1.41 Sun Apr 12 15:55:05 2009 +++ src/distrib/sets/lists/base/md.amd64 Sun Apr 12 16:54:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.41 2009/04/12 19:55:05 christos Exp $ +# $NetBSD: md.amd64,v 1.42 2009/04/12 20:54:41 christos Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./usr/bin/fdformatbase-util-bin @@ -78,8 +78,8 @@ ./usr/lib/i386/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/i386/libdes.so.8 base-compat-shlib compat,pic ./usr/lib/i386/libdes.so.8.0 base-compat-shlib compat,pic -./usr/lib/i386/libdns.so.2 base-compat-shlib compat,pic -./usr/lib/i386/libdns.so.2.0 base-compat-shlib compat,pic +./usr/lib/i386/libdns.so.3 base-compat-shlib compat,pic +./usr/lib/i386/libdns.so.3.0 base-compat-shlib compat,pic ./usr/lib/i386/libedit.so.3 base-compat-shlib compat,pic ./usr/lib/i386/libedit.so.3.0 base-compat-shlib compat,pic ./usr/lib/i386/libevent.so.3 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.38 src/distrib/sets/lists/base/md.sparc64:1.39 --- src/distrib/sets/lists/base/md.sparc64:1.38 Sun Apr 12 15:55:05 2009 +++ src/distrib/sets/lists/base/md.sparc64 Sun Apr 12 16:54:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.38 2009/04/12 19:55:05 christos Exp $ +# $NetBSD: md.sparc64,v 1.39 2009/04/12 20:54:41 christos Exp $ ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin ./usr/lib/sparc base-compat-lib compat @@ -73,8 +73,8 @@ ./usr/lib/sparc/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/sparc/libdes.so.8 base-compat-shlib compat,pic ./usr/lib/sparc/libdes.so.8.0 base-compat-shlib compat,pic -./usr/lib/sparc/libdns.so.2 base-compat-shlib compat,pic -./usr/lib/sparc/libdns.so.2.0 base-compat-shlib compat,pic +./usr/lib/sparc/libdns.so.3 base-compat-shlib compat,pic +./usr/lib/sparc/libdns.so.3.0 base-compat-shlib compat,pic ./usr/lib/sparc/libedit.so.3 base-compat-shlib compat,pic ./usr/lib/sparc/libedit.so.3.0 base-compat-shlib compat,pic ./usr/lib/sparc/libevent.so.3 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/shl.elf diff -u src/distrib/sets/lists/base/shl.elf:1.166 src/distrib/sets/lists/base/shl.elf:1.167 --- src/distrib/sets/lists/base/shl.elf:1.166 Sat Feb 28 10:32:29 2009 +++ src/distrib/sets/lists/base/shl.elf Sun Apr 12 16:54:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.166 2009/02/28 15:32:29 pooka Exp $ +# $NetBSD: shl.elf,v 1.167 2009/04/12 20:54:41 christos Exp $ # # Note: Do not mark old major and major.minor shared libraries as # obsolete; just remove the entry, as third-party applications @@ -94,7 +94,7 @@ ./usr/lib/libasn1.so.8base-krb5-shlib kerberos ./usr/lib/libbfd.so.10base-sys-shlib bfd ./usr/lib/libbind9.sobase-bind-shlib -./usr/lib/libbind9.so.2base-bind-shlib +./usr/lib/libbind9.so.3base-bind-shlib ./usr/lib/libbluetooth.so base-sys-shlib ./usr/lib/libbluetooth.so.4 base-sys-shlib ./usr/lib/libbsdmalloc.so base-sys-shlib @@ -117,7 +117,7 @@ ./usr/lib/libdevmapper.so base-lvm-shlib lvm ./usr/lib/libdevmapper.so.1 base-lvm-shlib lvm ./usr/lib/libdns.sobase-bind-shlib -./usr/lib/libdns.so.2base-bind-shlib +./usr/lib/libdns.so.3base-bind-shlib ./usr/lib/libedit.sobase-sys-shlib ./usr/lib/libedit.so.3base-sys-shlib ./usr/lib/libevent.sobase-sys-shlib @@ -145,11 +145,11 @@ ./usr/lib/libipsec.sobase-net-shlib ./usr/lib/libipsec.so.3base-net-shlib ./usr/lib/libisc.sobase-bind-shlib -./usr/lib/libisc.so.2base-bind-shlib +./usr/lib/libisc.so.3base-bind-shlib ./usr/lib/libisccc.sobase-bind-shlib -./usr/lib/libisccc.so.2base-bind-shlib +./usr/lib/libisccc.so.3base-bind-shlib ./usr/lib/libisccfg.sobase-bind-shlib -./usr/lib/libisccfg.so.2 base-bind-shlib +./usr/lib/libisccfg.so.3 base-bind-shlib ./usr/lib/libiscsi.sobase-iscsi-shlib iscsi ./usr/lib/libiscsi.so.1base-iscsi-shlib iscsi ./usr/lib/libkadm.sobase-obsolete obsolete @@ -173,7 +173,7 @@ ./usr/lib/libldap_r.sobase-ldap-shlib ldap ./usr/lib/libldap_r.so.3 base-ldap-shlib ldap ./usr/lib/liblwres.so
CVS commit: src/external/bsd/bind/bin/check/named-checkzone
Module Name:src
Committed By: christos
Date: Sun Apr 12 21:00:48 UTC 2009
Modified Files:
src/external/bsd/bind/bin/check/named-checkzone: Makefile
Log Message:
provide symlinks for the man pages too.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/bind/bin/check/named-checkzone/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/bin/check/named-checkzone/Makefile
diff -u src/external/bsd/bind/bin/check/named-checkzone/Makefile:1.1 src/external/bsd/bind/bin/check/named-checkzone/Makefile:1.2
--- src/external/bsd/bind/bin/check/named-checkzone/Makefile:1.1 Sat Apr 11 23:46:05 2009
+++ src/external/bsd/bind/bin/check/named-checkzone/Makefile Sun Apr 12 17:00:48 2009
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 03:46:05 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/12 21:00:48 christos Exp $
BASE= ${.CURDIR:T}
.include ${.CURDIR}/../Makefile.inc
SYMLINKS= /usr/sbin/named-checkzone /usr/sbin/named-compilezone
+MLINKS= named-checkzone.8 named-compilezone.8
.include bsd.prog.mk
CVS commit: src/external/gpl2/xcvs/lib/libcvs
Module Name:src Committed By: christos Date: Sun Apr 12 22:30:48 UTC 2009 Modified Files: src/external/gpl2/xcvs/lib/libcvs: Makefile Log Message: we don't need memrchr anymore. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/lib/libcvs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/xcvs/lib/libcvs/Makefile diff -u src/external/gpl2/xcvs/lib/libcvs/Makefile:1.4 src/external/gpl2/xcvs/lib/libcvs/Makefile:1.5 --- src/external/gpl2/xcvs/lib/libcvs/Makefile:1.4 Fri Apr 10 07:20:30 2009 +++ src/external/gpl2/xcvs/lib/libcvs/Makefile Sun Apr 12 18:30:48 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2009/04/10 11:20:30 christos Exp $ +# $NetBSD: Makefile,v 1.5 2009/04/12 22:30:48 christos Exp $ LIBISPRIVATE= yes @@ -13,7 +13,7 @@ SRCS= __fpending.c asnprintf.c basename.c canon-host.c canonicalize.c \ chdir-long.c closeout.c cycle-check.c dirname.c dup-safer.c exitfail.c \ fd-safer.c getdate.c getdelim.c getline.c gettime.c md5.c \ - memrchr.c openat.c pagealign_alloc.c printf-args.c printf-parse.c \ + openat.c pagealign_alloc.c printf-args.c printf-parse.c \ quotearg.c regex.c rpmatch.c save-cwd.c sighandle.c strftime.c \ stripslash.c vasnprintf.c xalloc-die.c xgetcwd.c xgethostname.c \ xmalloc.c xreadlink.c yesno.c
CVS commit: src/sys/ipkdb
Module Name:src Committed By: elad Date: Sun Apr 12 22:37:50 UTC 2009 Modified Files: src/sys/ipkdb: ipkdb_ipkdb.c Log Message: Remove KAUTH_ARG() around the request for kauth_authorize_system(). To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/ipkdb/ipkdb_ipkdb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/ipkdb/ipkdb_ipkdb.c diff -u src/sys/ipkdb/ipkdb_ipkdb.c:1.25 src/sys/ipkdb/ipkdb_ipkdb.c:1.26 --- src/sys/ipkdb/ipkdb_ipkdb.c:1.25 Wed Mar 18 10:22:42 2009 +++ src/sys/ipkdb/ipkdb_ipkdb.c Sun Apr 12 22:37:50 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ipkdb_ipkdb.c,v 1.25 2009/03/18 10:22:42 cegger Exp $ */ +/* $NetBSD: ipkdb_ipkdb.c,v 1.26 2009/04/12 22:37:50 elad Exp $ */ /* * Copyright (C) 1993-2000 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ipkdb_ipkdb.c,v 1.25 2009/03/18 10:22:42 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: ipkdb_ipkdb.c,v 1.26 2009/04/12 22:37:50 elad Exp $); #include opt_ipkdb.h @@ -1082,7 +1082,7 @@ #ifndef IPKDBSECURE if (kauth_authorize_system(curlwp-l_cred, KAUTH_SYSTEM_DEBUG, - KAUTH_ARG(KAUTH_REQ_SYSTEM_DEBUG_IPKDB), NULL, NULL, NULL)) + KAUTH_REQ_SYSTEM_DEBUG_IPKDB, NULL, NULL, NULL)) return 0; #endif if (ipkdbcmp(chksum(p, l), p + l, LENCHK))
CVS commit: src/compat/external/lib
Module Name:src Committed By: christos Date: Sun Apr 12 22:42:36 UTC 2009 Modified Files: src/compat/external/lib: Makefile Log Message: build bind libs too To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/compat/external/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/compat/external/lib/Makefile diff -u src/compat/external/lib/Makefile:1.1 src/compat/external/lib/Makefile:1.2 --- src/compat/external/lib/Makefile:1.1 Mon Jan 19 02:19:09 2009 +++ src/compat/external/lib/Makefile Sun Apr 12 18:42:36 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/01/19 07:19:09 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2009/04/12 22:42:36 christos Exp $ # # This Makefile exists to provide a single point to build @@ -12,4 +12,6 @@ SUBDIR+= ../bsd/atf/lib .endif +SUBDIR+= ../bsd/bind/lib + .include bsd.subdir.mk
CVS commit: src/usr.bin/mail
Module Name:src
Committed By: he
Date: Sun Apr 12 22:47:39 UTC 2009
Modified Files:
src/usr.bin/mail: send.c
Log Message:
Work around a problem with gcc -Wuninitialized seen for our sh3 targets.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/mail/send.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mail/send.c
diff -u src/usr.bin/mail/send.c:1.34 src/usr.bin/mail/send.c:1.35
--- src/usr.bin/mail/send.c:1.34 Fri Apr 10 13:08:25 2009
+++ src/usr.bin/mail/send.c Sun Apr 12 22:47:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: send.c,v 1.34 2009/04/10 13:08:25 christos Exp $ */
+/* $NetBSD: send.c,v 1.35 2009/04/12 22:47:39 he Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)send.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: send.c,v 1.34 2009/04/10 13:08:25 christos Exp $);
+__RCSID($NetBSD: send.c,v 1.35 2009/04/12 22:47:39 he Exp $);
#endif
#endif /* not lint */
@@ -655,7 +655,7 @@
ncopy(struct name *np)
{
struct name *rv;
- struct name *lp;
+ struct name *lp = NULL; /* XXX gcc -Wuninitialized sh3 */
struct name *tp;
rv = NULL;
CVS commit: othersrc/bin/fsu_ecp
Module Name:othersrc
Committed By: stacktic
Date: Sun Apr 12 23:02:43 UTC 2009
Modified Files:
othersrc/bin/fsu_ecp: fsu_ecp.c fsu_flist.c fsu_flist.h
Log Message:
Using LIST in fsu_list
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/bin/fsu_ecp/fsu_ecp.c
cvs rdiff -u -r1.2 -r1.3 othersrc/bin/fsu_ecp/fsu_flist.c \
othersrc/bin/fsu_ecp/fsu_flist.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/bin/fsu_ecp/fsu_ecp.c
diff -u othersrc/bin/fsu_ecp/fsu_ecp.c:1.4 othersrc/bin/fsu_ecp/fsu_ecp.c:1.5
--- othersrc/bin/fsu_ecp/fsu_ecp.c:1.4 Fri Apr 3 10:46:35 2009
+++ othersrc/bin/fsu_ecp/fsu_ecp.c Sun Apr 12 23:02:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fsu_ecp.c,v 1.4 2009/04/03 10:46:35 stacktic Exp $ */
+/* $NetBSD: fsu_ecp.c,v 1.5 2009/04/12 23:02:43 stacktic Exp $ */
/*
* Copyright (c) 2008 Arnaud Ysmal. All Rights Reserved.
@@ -74,7 +74,7 @@
char *hl_from;
char **hl_to;
int hl_nlink;
- SLIST_ENTRY(hardlink_s) next;
+ LIST_ENTRY(hardlink_s) next;
};
int
@@ -189,7 +189,7 @@
copy_dir(struct ukfs *fs, const char *from, const char *to, int flags)
{
const char *filename;
- int res, rv;
+ int rv;
struct stat file_stat;
char to_p[PATH_MAX + 1];
size_t tlen, flen;
@@ -210,23 +210,15 @@
filename = strrchr(from, '/');
if (filename == NULL)
filename = from;
- else {
-if (filename[1] == '\0') {
- for (rv = strlen(from) - 2;
- rv = 0 from[rv] != '/';
- --rv)
- continue;
-}
+ else
++filename;
- }
-
- if (to_p[tlen - 1] != '/') {
-if (filename[0] != '/') {
+
+ if (to_p[tlen - 1] == '/')
+--tlen;
+ else if (to_p[tlen - 1] != '/' filename[0] != '/') {
to_p[tlen] = '/';
to_p[tlen + 1] = '\0';
-}
- } else
---tlen;
+ }
flen = strlen(filename);
@@ -240,22 +232,20 @@
return -1;
}
}
-
- res = copy_dir_rec(fs, from, to_p, flags);
-
- return res;
+ return copy_dir_rec(fs, from, to_p, flags);
}
static int
copy_dir_rec(struct ukfs *fs, const char *from_p, char *to_p, int flags)
{
- FSU_FENT *root, *cur, *cur2, *tmp;
+ FSU_FENT *root, *cur, *cur2, *nextelt;
+ fsu_flist *flist;
size_t len;
int flist_options, res, rv, off, hl_supported, curlink;
struct hardlink_s *new;
char hlfrom[PATH_MAX + 1], hlto[PATH_MAX + 1];
- SLIST_HEAD(, hardlink_s) hl_l = SLIST_HEAD_INITIALIZER(hl_l);
+ LIST_HEAD(, hardlink_s) hl_l = LIST_HEAD_INITIALIZER(hl_l);
curlink = res = 0;
hl_supported = 1;
@@ -273,20 +263,22 @@
len = strlen(to_p) - 1;
- root = fsu_flist_build(fs, from_p, flist_options);
-
- if (root == NULL)
+ flist = fsu_flist_build(fs, from_p, flist_options);
+ if (flist == NULL)
return -1;
+ root = LIST_FIRST(flist);
off = root-pathlen;
- for (cur = root-next; cur != NULL; cur = cur-next) {
- if (cur-sb.st_nlink == 1)
+ LIST_FOREACH(cur, flist, next) {
+ if (cur == root || cur-sb.st_nlink == 1)
continue;
+
new = malloc(sizeof(struct hardlink_s));
if (new == NULL) {
warn(malloc);
return -1;
}
+ new-hl_from = cur-path;
new-hl_nlink = cur-sb.st_nlink - 1;
new-hl_to = malloc(new-hl_nlink * sizeof(char *));
if (new-hl_to == NULL) {
@@ -294,31 +286,30 @@
free(new);
return -1;
}
+ memset(new-hl_to, 0, new-hl_nlink * sizeof(char *));
- new-hl_from = cur-path;
-
- for (curlink = 0, cur2 = cur; cur2-next != NULL;) {
- if (cur2-next-sb.st_nlink == 1) {
-cur2 = cur2-next;
+ for (curlink = 0, cur2 = cur; LIST_NEXT(cur2, next) != NULL;) {
+ nextelt = LIST_NEXT(cur2, next);
+ if (nextelt-sb.st_nlink == 1) {
+cur2 = nextelt;
continue;
}
- if (cur-sb.st_ino == cur2-next-sb.st_ino
- cur-sb.st_dev == cur2-next-sb.st_dev) {
-
-new-hl_to[curlink] = cur2-next-path;
+
+ if (cur-sb.st_ino == nextelt-sb.st_ino
+ cur-sb.st_dev == nextelt-sb.st_dev) {
+new-hl_to[curlink] = nextelt-path;
if (new-hl_to[curlink] == NULL)
- warn(%s, cur2-next-path);
+ warn(%s, nextelt-path);
else
curlink++;
-tmp = cur2-next;
-cur2-next = cur2-next-next;
-free(tmp);
+LIST_REMOVE(nextelt, next);
+free(nextelt);
if (curlink + 1 == cur-sb.st_nlink)
break;
} else
-cur2 = cur2-next;
+cur2 = nextelt;
}
- SLIST_INSERT_HEAD(hl_l, new, next);
+ LIST_INSERT_HEAD(hl_l, new, next);
}
if (flags FSU_ECP_GET)
@@ -337,8 +328,9 @@
}
}
- for (cur = root-next; cur != NULL; cur = cur-next) {
-
+ LIST_FOREACH(cur, flist, next) {
+ if (cur == root)
+ continue;
rv = strlcat(to_p, cur-path + off, PATH_MAX+1);
if (rv != (int)(len + cur-pathlen - off + 1)) {
warn(%s%s, to_p, cur-path + off);
@@ -378,13 +370,13 @@
}
to_p[len + 1] = '\0';
}
-
+
memcpy(hlfrom, to_p, len + 1);
memcpy(hlto, to_p, len + 1);
- while (!SLIST_EMPTY(hl_l)) {
- new = SLIST_FIRST(hl_l);
-
CVS commit: src/compat/external/bsd/bind/lib
Module Name:src
Committed By: christos
Date: Sun Apr 12 23:04:48 UTC 2009
Added Files:
src/compat/external/bsd/bind/lib: Makefile
src/compat/external/bsd/bind/lib/libbind9: Makefile
src/compat/external/bsd/bind/lib/libdns: Makefile
src/compat/external/bsd/bind/lib/libisc: Makefile
src/compat/external/bsd/bind/lib/libisccc: Makefile
src/compat/external/bsd/bind/lib/libisccfg: Makefile
src/compat/external/bsd/bind/lib/liblwres: Makefile
Log Message:
add 32 bit build blue.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/libbind9/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/libdns/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/libisc/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/libisccc/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/libisccfg/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/bsd/bind/lib/liblwres/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/compat/external/bsd/bind/lib/Makefile
diff -u /dev/null src/compat/external/bsd/bind/lib/Makefile:1.1
--- /dev/null Sun Apr 12 19:04:48 2009
+++ src/compat/external/bsd/bind/lib/Makefile Sun Apr 12 19:04:47 2009
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+
+# XXX These bind9/ISC libraries should depend on each other but the
+# XXX dependency ordering requires considerable investigation.
+# XXX Please preserve the order below so we know the order ISC links
+# XXX them in in their Makefiles.
+SUBDIR+= libbind9 libdns liblwres libisccfg libisccc libisc
+
+.include bsd.subdir.mk
Index: src/compat/external/bsd/bind/lib/libbind9/Makefile
diff -u /dev/null src/compat/external/bsd/bind/lib/libbind9/Makefile:1.1
--- /dev/null Sun Apr 12 19:04:48 2009
+++ src/compat/external/bsd/bind/lib/libbind9/Makefile Sun Apr 12 19:04:47 2009
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
+ crypto ${.CURDIR}/../../../../../lib/libcrypto
+
+NOCHECKVER= # defined
+
+.include bsd.obj.mk
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/external/bsd/bind/lib/libbind9
+.CURDIR:=${NETBSDSRCDIR}/external/bsd/bind/lib/libbind9
+
+.include ${NETBSDSRCDIR}/compat/Makefile.compat
+.include ${.CURDIR}/Makefile
+
+# Resolve pathnames from real Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
Index: src/compat/external/bsd/bind/lib/libdns/Makefile
diff -u /dev/null src/compat/external/bsd/bind/lib/libdns/Makefile:1.1
--- /dev/null Sun Apr 12 19:04:48 2009
+++ src/compat/external/bsd/bind/lib/libdns/Makefile Sun Apr 12 19:04:47 2009
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
+ crypto ${.CURDIR}/../../../../../lib/libcrypto
+
+NOCHECKVER= # defined
+
+.include bsd.obj.mk
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/external/bsd/bind/lib/libdns
+.CURDIR:=${NETBSDSRCDIR}/external/bsd/bind/lib/libdns
+
+.include ${NETBSDSRCDIR}/compat/Makefile.compat
+.include ${.CURDIR}/Makefile
+
+# Resolve pathnames from real Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
Index: src/compat/external/bsd/bind/lib/libisc/Makefile
diff -u /dev/null src/compat/external/bsd/bind/lib/libisc/Makefile:1.1
--- /dev/null Sun Apr 12 19:04:48 2009
+++ src/compat/external/bsd/bind/lib/libisc/Makefile Sun Apr 12 19:04:47 2009
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1 2009/04/12 23:04:47 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+LIBDPLIBS= pthread ${.CURDIR}/../../../../../lib/libpthread \
+ crypto ${.CURDIR}/../../../../../lib/libcrypto
+
+NOCHECKVER= # defined
+
CVS commit: src/usr.bin/nfsstat
Module Name:src
Committed By: lukem
Date: Sun Apr 12 23:34:12 UTC 2009
Modified Files:
src/usr.bin/nfsstat: nfsstat.c
Log Message:
Fix -Wextra and -Wsign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/nfsstat/nfsstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/nfsstat/nfsstat.c
diff -u src/usr.bin/nfsstat/nfsstat.c:1.22 src/usr.bin/nfsstat/nfsstat.c:1.23
--- src/usr.bin/nfsstat/nfsstat.c:1.22 Mon Jul 21 14:19:24 2008
+++ src/usr.bin/nfsstat/nfsstat.c Sun Apr 12 23:34:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfsstat.c,v 1.22 2008/07/21 14:19:24 lukem Exp $ */
+/* $NetBSD: nfsstat.c,v 1.23 2009/04/12 23:34:11 lukem Exp $ */
/*
* Copyright (c) 1983, 1989, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = from: @(#)nfsstat.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: nfsstat.c,v 1.22 2008/07/21 14:19:24 lukem Exp $);
+__RCSID($NetBSD: nfsstat.c,v 1.23 2009/04/12 23:34:11 lukem Exp $);
#endif
#endif /* not lint */
@@ -70,8 +70,8 @@
struct nlist nl[] = {
#define N_NFSSTAT 0
- { _nfsstats },
- { },
+ { _nfsstats, 0, 0, 0, 0 },
+ { , 0, 0, 0, 0 },
};
#define MASK(a) (1 NFSPROC_##a)
@@ -404,7 +404,7 @@
memset(last, 0, sizeof(last));
for (hdrcnt = 1;;) {
- int i;
+ size_t i;
if (!--hdrcnt) {
printhdr();
@@ -453,7 +453,7 @@
void
printhdr()
{
- int i;
+ size_t i;
printf();
for (i = 0; i NSHORTPROC; i++)
CVS commit: src/usr.bin/nl
Module Name:src
Committed By: lukem
Date: Sun Apr 12 23:37:12 UTC 2009
Modified Files:
src/usr.bin/nl: nl.c
Log Message:
Fix -Wextra and -Wsign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/nl/nl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/nl/nl.c
diff -u src/usr.bin/nl/nl.c:1.9 src/usr.bin/nl/nl.c:1.10
--- src/usr.bin/nl/nl.c:1.9 Mon Jul 21 14:19:24 2008
+++ src/usr.bin/nl/nl.c Sun Apr 12 23:37:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nl.c,v 1.9 2008/07/21 14:19:24 lukem Exp $ */
+/* $NetBSD: nl.c,v 1.10 2009/04/12 23:37:12 lukem Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 1999\
The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: nl.c,v 1.9 2008/07/21 14:19:24 lukem Exp $);
+__RCSID($NetBSD: nl.c,v 1.10 2009/04/12 23:37:12 lukem Exp $);
#endif
#include errno.h
@@ -69,9 +69,9 @@
#define NP_LAST HEADER
static struct numbering_property numbering_properties[NP_LAST + 1] = {
- { footer, number_none },
- { body, number_nonempty },
- { header, number_none }
+ { footer, number_none, { 0, 0, 0, 0 } },
+ { body, number_nonempty, { 0, 0, 0, 0 } },
+ { header, number_none, { 0, 0, 0, 0 } },
};
#define max(a, b) ((a) (b) ? (a) : (b))
@@ -276,7 +276,7 @@
}
/* Allocate a buffer suitable for preformatting line number. */
- intbuffersize = max(INT_STRLEN_MAXIMUM, width) + 1; /* NUL */
+ intbuffersize = max((int)INT_STRLEN_MAXIMUM, width) + 1; /* NUL */
if ((intbuffer = malloc(intbuffersize)) == NULL) {
perror(cannot allocate preformatting buffer);
exit(EXIT_FAILURE);
CVS commit: src/usr.bin/nohup
Module Name:src
Committed By: lukem
Date: Sun Apr 12 23:38:17 UTC 2009
Modified Files:
src/usr.bin/nohup: nohup.c
Log Message:
Fix -Wcast-qual issue
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/nohup/nohup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/nohup/nohup.c
diff -u src/usr.bin/nohup/nohup.c:1.13 src/usr.bin/nohup/nohup.c:1.14
--- src/usr.bin/nohup/nohup.c:1.13 Mon Jul 21 14:19:24 2008
+++ src/usr.bin/nohup/nohup.c Sun Apr 12 23:38:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nohup.c,v 1.13 2008/07/21 14:19:24 lukem Exp $ */
+/* $NetBSD: nohup.c,v 1.14 2009/04/12 23:38:17 lukem Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)nohup.c 5.4 (Berkeley) 6/1/90;
#endif
-__RCSID($NetBSD: nohup.c,v 1.13 2008/07/21 14:19:24 lukem Exp $);
+__RCSID($NetBSD: nohup.c,v 1.14 2009/04/12 23:38:17 lukem Exp $);
#endif /* not lint */
#include sys/param.h
@@ -103,7 +103,8 @@
dofile()
{
int fd;
- char *p, path[MAXPATHLEN];
+ char path[MAXPATHLEN];
+ const char *p;
/* If the standard output is a terminal, all output written to
its standard output shall be appended to the end of the file
CVS commit: src/usr.bin/passwd
Module Name:src
Committed By: lukem
Date: Sun Apr 12 23:59:37 UTC 2009
Modified Files:
src/usr.bin/passwd: local_passwd.c passwd.c yp_passwd.c
Log Message:
Fix WARNS=4 issues
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/passwd/local_passwd.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/passwd/passwd.c
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/passwd/yp_passwd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/passwd/local_passwd.c
diff -u src/usr.bin/passwd/local_passwd.c:1.31 src/usr.bin/passwd/local_passwd.c:1.32
--- src/usr.bin/passwd/local_passwd.c:1.31 Fri Jan 25 19:36:27 2008
+++ src/usr.bin/passwd/local_passwd.c Sun Apr 12 23:59:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: local_passwd.c,v 1.31 2008/01/25 19:36:27 christos Exp $ */
+/* $NetBSD: local_passwd.c,v 1.32 2009/04/12 23:59:37 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)local_passwd.c8.3 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: local_passwd.c,v 1.31 2008/01/25 19:36:27 christos Exp $);
+__RCSID($NetBSD: local_passwd.c,v 1.32 2009/04/12 23:59:37 lukem Exp $);
#endif
#endif /* not lint */
@@ -81,7 +81,7 @@
(void)printf(Password unchanged.\n);
pw_error(NULL, 0, 0);
}
- if (min_pw_len 0 strlen(p) min_pw_len) {
+ if (min_pw_len 0 (int)strlen(p) min_pw_len) {
(void) printf(Password is too short.\n);
continue;
}
Index: src/usr.bin/passwd/passwd.c
diff -u src/usr.bin/passwd/passwd.c:1.28 src/usr.bin/passwd/passwd.c:1.29
--- src/usr.bin/passwd/passwd.c:1.28 Mon Jul 21 14:19:24 2008
+++ src/usr.bin/passwd/passwd.c Sun Apr 12 23:59:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: passwd.c,v 1.28 2008/07/21 14:19:24 lukem Exp $ */
+/* $NetBSD: passwd.c,v 1.29 2009/04/12 23:59:37 lukem Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = from: @(#)passwd.c8.3 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: passwd.c,v 1.28 2008/07/21 14:19:24 lukem Exp $);
+__RCSID($NetBSD: passwd.c,v 1.29 2009/04/12 23:59:37 lukem Exp $);
#endif
#endif /* not lint */
@@ -79,7 +79,7 @@
/* default -- use whatever PAM decides */
{ NULL, NULL, 0, NULL, pwpam_process },
- { 0 }
+ { NULL, NULL, 0, NULL, NULL }
};
static const struct pw_module_s *personality;
Index: src/usr.bin/passwd/yp_passwd.c
diff -u src/usr.bin/passwd/yp_passwd.c:1.32 src/usr.bin/passwd/yp_passwd.c:1.33
--- src/usr.bin/passwd/yp_passwd.c:1.32 Fri Jan 25 19:36:12 2008
+++ src/usr.bin/passwd/yp_passwd.c Sun Apr 12 23:59:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: yp_passwd.c,v 1.32 2008/01/25 19:36:12 christos Exp $ */
+/* $NetBSD: yp_passwd.c,v 1.33 2009/04/12 23:59:37 lukem Exp $ */
/*
* Copyright (c) 1988, 1990, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)local_passwd.c8.3 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: yp_passwd.c,v 1.32 2008/01/25 19:36:12 christos Exp $);
+__RCSID($NetBSD: yp_passwd.c,v 1.33 2009/04/12 23:59:37 lukem Exp $);
#endif
#endif /* not lint */
@@ -71,10 +71,10 @@
static char *domain;
static void
-pwerror(char *name, int err, int eval)
+pwerror(const char *name, int show_err, int eval)
{
- if (err)
+ if (show_err)
warn(%s, name);
errx(eval, NIS passwd database unchanged);
}
@@ -83,7 +83,8 @@
getnewpasswd(struct passwd *pw, char **old_pass)
{
int tries;
- char *p, *t;
+ const char *p, *t;
+ char *result;
static char buf[_PASSWORD_LEN+1];
char salt[_PASSWORD_LEN+1];
char option[LINE_MAX], *key, *opt;
@@ -140,12 +141,12 @@
warn(Couldn't generate salt);
pwerror(NULL, 0, 0);
}
- p = strdup(crypt(buf, salt));
- if (!p) {
+ result = strdup(crypt(buf, salt));
+ if (!result) {
(void)printf(not enough core.\n);
pwerror(NULL, 0, 0);
}
- return (p);
+ return (result);
}
static void
CVS commit: src/usr.bin/patch
Module Name:src
Committed By: lukem
Date: Mon Apr 13 00:07:26 UTC 2009
Modified Files:
src/usr.bin/patch: inp.c
Log Message:
Fix sign-compare issue
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/patch/inp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/patch/inp.c
diff -u src/usr.bin/patch/inp.c:1.19 src/usr.bin/patch/inp.c:1.20
--- src/usr.bin/patch/inp.c:1.19 Fri Sep 19 18:33:34 2008
+++ src/usr.bin/patch/inp.c Mon Apr 13 00:07:26 2009
@@ -1,7 +1,7 @@
/*
* $OpenBSD: inp.c,v 1.34 2006/03/11 19:41:30 otto Exp $
* $DragonFly: src/usr.bin/patch/inp.c,v 1.6 2007/09/29 23:11:10 swildner Exp $
- * $NetBSD: inp.c,v 1.19 2008/09/19 18:33:34 joerg Exp $
+ * $NetBSD: inp.c,v 1.20 2009/04/13 00:07:26 lukem Exp $
*/
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: inp.c,v 1.19 2008/09/19 18:33:34 joerg Exp $);
+__RCSID($NetBSD: inp.c,v 1.20 2009/04/13 00:07:26 lukem Exp $);
#include sys/types.h
#include sys/file.h
@@ -253,7 +253,7 @@
out_of_mem = false;
return false; /* force plan b because plan a bombed */
}
- if (i_size SIZE_MAX) {
+ if (i_size (off_t)SIZE_MAX) {
say(block too large to mmap\n);
return false;
}
CVS commit: src/usr.bin/pkill
Module Name:src
Committed By: lukem
Date: Mon Apr 13 00:12:16 UTC 2009
Modified Files:
src/usr.bin/pkill: Makefile pkill.c
Log Message:
Fix sign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/pkill/Makefile
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/pkill/pkill.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/pkill/Makefile
diff -u src/usr.bin/pkill/Makefile:1.2 src/usr.bin/pkill/Makefile:1.3
--- src/usr.bin/pkill/Makefile:1.2 Sat Jul 16 16:21:05 2005
+++ src/usr.bin/pkill/Makefile Mon Apr 13 00:12:16 2009
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2005/07/16 16:21:05 christos Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/13 00:12:16 lukem Exp $
PROG= pkill
-WARNS= 3
LDADD+= -lkvm
DPADD+= ${LIBKVM}
Index: src/usr.bin/pkill/pkill.c
diff -u src/usr.bin/pkill/pkill.c:1.24 src/usr.bin/pkill/pkill.c:1.25
--- src/usr.bin/pkill/pkill.c:1.24 Sat Feb 28 18:16:11 2009
+++ src/usr.bin/pkill/pkill.c Mon Apr 13 00:12:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pkill.c,v 1.24 2009/02/28 18:16:11 christos Exp $ */
+/* $NetBSD: pkill.c,v 1.25 2009/04/13 00:12:16 lukem Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: pkill.c,v 1.24 2009/02/28 18:16:11 christos Exp $);
+__RCSID($NetBSD: pkill.c,v 1.25 2009/04/13 00:12:16 lukem Exp $);
#endif /* !lint */
#include sys/types.h
@@ -260,7 +260,7 @@
continue;
j = 0;
-while (j sizeof(buf) *pargv != NULL) {
+while (j (int)sizeof(buf) *pargv != NULL) {
j += snprintf(buf + j, sizeof(buf) - j,
pargv[1] != NULL ? %s : %s,
pargv[0]);
@@ -275,7 +275,7 @@
if (rv == 0) {
if (fullmatch) {
if (regmatch.rm_so == 0
- regmatch.rm_eo == strlen(mstr))
+ regmatch.rm_eo == (regoff_t)strlen(mstr))
selected[i] = 1;
} else
selected[i] = 1;
@@ -319,7 +319,7 @@
}
SLIST_FOREACH(li, ppidlist, li_chain)
- if (kp-p_ppid == (uid_t)li-li_number)
+ if ((uid_t)kp-p_ppid == (uid_t)li-li_number)
break;
if (SLIST_FIRST(ppidlist) != NULL li == NULL) {
selected[i] = 0;
@@ -327,7 +327,7 @@
}
SLIST_FOREACH(li, pgrplist, li_chain)
- if (kp-p__pgid == (uid_t)li-li_number)
+ if (kp-p__pgid == (pid_t)li-li_number)
break;
if (SLIST_FIRST(pgrplist) != NULL li == NULL) {
selected[i] = 0;
@@ -347,7 +347,7 @@
}
SLIST_FOREACH(li, sidlist, li_chain)
- if (kp-p_sid == (uid_t)li-li_number)
+ if (kp-p_sid == (pid_t)li-li_number)
break;
if (SLIST_FIRST(sidlist) != NULL li == NULL) {
selected[i] = 0;
CVS commit: src/usr.bin/pmap
Module Name:src
Committed By: lukem
Date: Mon Apr 13 00:27:38 UTC 2009
Modified Files:
src/usr.bin/pmap: main.c pmap.c pmap.h
Log Message:
Fix WARNS=4 issues (-Wcast-qual -Wextra -Wsign-compare)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/pmap/main.c
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/pmap/pmap.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/pmap/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/pmap/main.c
diff -u src/usr.bin/pmap/main.c:1.19 src/usr.bin/pmap/main.c:1.20
--- src/usr.bin/pmap/main.c:1.19 Tue Jun 17 15:54:45 2008
+++ src/usr.bin/pmap/main.c Mon Apr 13 00:27:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.19 2008/06/17 15:54:45 christos Exp $ */
+/* $NetBSD: main.c,v 1.20 2009/04/13 00:27:38 lukem Exp $ */
/*
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: main.c,v 1.19 2008/06/17 15:54:45 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.20 2009/04/13 00:27:38 lukem Exp $);
#endif
#include sys/param.h
@@ -62,45 +62,45 @@
rlim_t maxssiz;
struct nlist ksyms[] = {
- { _maxsmap },
+ { _maxsmap, 0, 0, 0, 0 },
#define NL_MAXSSIZ 0
- { _uvm_vnodeops },
+ { _uvm_vnodeops, 0, 0, 0, 0 },
#define NL_UVM_VNODEOPS 1
- { _uvm_deviceops },
+ { _uvm_deviceops, 0, 0, 0, 0 },
#define NL_UVM_DEVICEOPS 2
- { _aobj_pager },
+ { _aobj_pager, 0, 0, 0, 0 },
#define NL_AOBJ_PAGER 3
- { _ubc_pager },
+ { _ubc_pager, 0, 0, 0, 0 },
#define NL_UBC_PAGER 4
- { _kernel_map },
+ { _kernel_map, 0, 0, 0, 0 },
#define NL_KERNEL_MAP 5
- { _nchashtbl },
+ { _nchashtbl, 0, 0, 0, 0 },
#define NL_NCHASHTBL 6
- { _nchash },
+ { _nchash, 0, 0, 0, 0 },
#define NL_NCHASH 7
- { NULL }
+ { NULL, 0, 0, 0, 0 }
};
struct nlist kmaps[] = {
- { _kmem_map },
+ { _kmem_map, 0, 0, 0, 0 },
#define NL_kmem_map 0
- { _mb_map },
+ { _mb_map, 0, 0, 0, 0 },
#define NL_mb_map 1
- { _phys_map },
+ { _phys_map, 0, 0, 0, 0 },
#define NL_phys_map 2
- { _exec_map },
+ { _exec_map, 0, 0, 0, 0 },
#define NL_exec_map 3
- { _pager_map },
+ { _pager_map, 0, 0, 0, 0 },
#define NL_pager_map 4
- { _st_map },
+ { _st_map, 0, 0, 0, 0 },
#define NL_st_map 5
- { _pt_map },
+ { _pt_map, 0, 0, 0, 0 },
#define NL_pt_map 6
- { _lkm_map },
+ { _lkm_map, 0, 0, 0, 0 },
#define NL_lkm_map 7
- { _buf_map },
+ { _buf_map, 0, 0, 0, 0 },
#define NL_buf_map 8
- { NULL }
+ { NULL, 0, 0, 0, 0 },
};
#define VMSPACE_ADDRESS 1
@@ -110,7 +110,7 @@
void check_fd(int);
void load_symbols(kvm_t *);
-void cache_enter(int, struct namecache *);
+void cache_enter(u_long, struct namecache *);
int
main(int argc, char *argv[])
@@ -450,8 +450,7 @@
{
struct namecache _ncp, *ncp, *oncp;
struct nchashhead _ncpp, *ncpp;
- u_long nchash;
- int i;
+ u_long nchash, i;
LIST_INIT(lcache);
@@ -484,12 +483,12 @@
}
void
-cache_enter(int i, struct namecache *ncp)
+cache_enter(u_long i, struct namecache *ncp)
{
struct cache_entry *ce;
if (debug DUMP_NAMEI_CACHE)
- printf([%d] ncp-nc_vp %10p, ncp-nc_dvp %10p,
+ printf([%lu] ncp-nc_vp %10p, ncp-nc_dvp %10p,
ncp-nc_nlen %3d [%.*s]\n,
i, ncp-nc_vp, ncp-nc_dvp,
ncp-nc_nlen, ncp-nc_nlen, ncp-nc_name);
@@ -500,7 +499,7 @@
ce-ce_pvp = ncp-nc_dvp;
ce-ce_nlen = ncp-nc_nlen;
strncpy(ce-ce_name, ncp-nc_name, sizeof(ce-ce_name));
- ce-ce_name[MIN(ce-ce_nlen, sizeof(ce-ce_name) - 1)] = '\0';
+ ce-ce_name[MIN(ce-ce_nlen, (int)(sizeof(ce-ce_name) - 1))] = '\0';
LIST_INSERT_HEAD(lcache, ce, ce_next);
}
Index: src/usr.bin/pmap/pmap.c
diff -u src/usr.bin/pmap/pmap.c:1.42 src/usr.bin/pmap/pmap.c:1.43
--- src/usr.bin/pmap/pmap.c:1.42 Mon Dec 29 01:40:59 2008
+++ src/usr.bin/pmap/pmap.c Mon Apr 13 00:27:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.42 2008/12/29 01:40:59 christos Exp $ */
+/* $NetBSD: pmap.c,v 1.43 2009/04/13 00:27:38 lukem Exp $ */
/*
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: pmap.c,v 1.42 2008/12/29 01:40:59 christos Exp $);
+__RCSID($NetBSD: pmap.c,v 1.43 2009/04/13 00:27:38 lukem Exp $);
#endif
#include string.h
@@ -533,7 +533,8 @@
int *am_slots;
int *am_bckptr;
int *am_ppref;
- size_t i, r, l, e;
+ size_t l;
+ int i, r, e;
if (S(amap) == (size_t)-1) {
heapfound = 1;
@@ -630,7 +631,7 @@
l--;
}
- dump_vm_anon(kd, am_anon, (int)i);
+ dump_vm_anon(kd, am_anon, i);
}
free(am_anon);
@@ -720,12 +721,18 @@
(unsigned long long)minor(dev));
name = buf;
}
- else if (UVM_OBJ_IS_AOBJ(D(uvm_obj, uvm_object)))
- name = [ uvm_aobj ];
- else if (UVM_OBJ_IS_UBCPAGER(D(uvm_obj, uvm_object)))
- name = [ ubc_pager ];
- else if (UVM_OBJ_IS_VNODE(D(uvm_obj, uvm_object)))
- name = [ ?VNODE? ];
+ else if (UVM_OBJ_IS_AOBJ(D(uvm_obj, uvm_object))) {
+
CVS commit: src/usr.bin/pr
Module Name:src
Committed By: lukem
Date: Mon Apr 13 00:37:05 UTC 2009
Modified Files:
src/usr.bin/pr: egetopt.c extern.h pr.c
Log Message:
Fix -Wcast-qual issues
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/pr/egetopt.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/pr/extern.h
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/pr/pr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/pr/egetopt.c
diff -u src/usr.bin/pr/egetopt.c:1.7 src/usr.bin/pr/egetopt.c:1.8
--- src/usr.bin/pr/egetopt.c:1.7 Mon Oct 13 07:41:22 2003
+++ src/usr.bin/pr/egetopt.c Mon Apr 13 00:37:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: egetopt.c,v 1.7 2003/10/13 07:41:22 agc Exp $ */
+/* $NetBSD: egetopt.c,v 1.8 2009/04/13 00:37:05 lukem Exp $ */
/*-
* Copyright (c) 1991 Keith Muller.
@@ -38,7 +38,7 @@
#if 0
from: static char sccsid[] = @(#)egetopt.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: egetopt.c,v 1.7 2003/10/13 07:41:22 agc Exp $);
+__RCSID($NetBSD: egetopt.c,v 1.8 2009/04/13 00:37:05 lukem Exp $);
#endif
#endif /* not lint */
@@ -67,7 +67,7 @@
char *eoptarg; /* argument associated with option */
#define BADCH (int)'?'
-#define EMSG
+char EMSG[1] = { '\0' };
int
egetopt(nargc, nargv, ostr)
Index: src/usr.bin/pr/extern.h
diff -u src/usr.bin/pr/extern.h:1.4 src/usr.bin/pr/extern.h:1.5
--- src/usr.bin/pr/extern.h:1.4 Mon Oct 13 07:41:22 2003
+++ src/usr.bin/pr/extern.h Mon Apr 13 00:37:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.4 2003/10/13 07:41:22 agc Exp $ */
+/* $NetBSD: extern.h,v 1.5 2009/04/13 00:37:05 lukem Exp $ */
/*-
* Copyright (c) 1991 Keith Muller.
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 6/6/93
- * $NetBSD: extern.h,v 1.4 2003/10/13 07:41:22 agc Exp $
+ * $NetBSD: extern.h,v 1.5 2009/04/13 00:37:05 lukem Exp $
*/
extern int eoptind;
@@ -47,11 +47,11 @@
int inskip __P((FILE *, int, int));
void mfail __P((void));
int mulfile __P((int, char **));
-FILE *nxtfile __P((int, char **, char **, char *, int));
+FILE *nxtfile __P((int, char **, const char **, char *, int));
int onecol __P((int, char **));
int otln __P((char *, int, int *, int *, int));
void pfail __P((void));
-int prhead __P((char *, char *, int));
+int prhead __P((char *, const char *, int));
int prtail __P((int, int));
int setup __P((int, char **));
void terminate __P((int));
Index: src/usr.bin/pr/pr.c
diff -u src/usr.bin/pr/pr.c:1.19 src/usr.bin/pr/pr.c:1.20
--- src/usr.bin/pr/pr.c:1.19 Mon Jul 21 14:19:24 2008
+++ src/usr.bin/pr/pr.c Mon Apr 13 00:37:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pr.c,v 1.19 2008/07/21 14:19:24 lukem Exp $ */
+/* $NetBSD: pr.c,v 1.20 2009/04/13 00:37:05 lukem Exp $ */
/*-
* Copyright (c) 1991 Keith Muller.
@@ -43,7 +43,7 @@
#if 0
from: static char sccsid[] = @(#)pr.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: pr.c,v 1.19 2008/07/21 14:19:24 lukem Exp $);
+__RCSID($NetBSD: pr.c,v 1.20 2009/04/13 00:37:05 lukem Exp $);
#endif
#endif /* not lint */
@@ -98,7 +98,7 @@
int sflag; /* -s option for multiple columns */
int nohead; /* do not write head and trailer */
int pgwd; /* page width with multiple col output */
-char *timefrmt = TIMEFMT; /* time conversion string */
+const char *timefrmt = TIMEFMT; /* time conversion string */
/*
* misc globals
@@ -165,7 +165,7 @@
char *hbuf = NULL;
char *ohbuf;
FILE *inf = NULL;
- char *fname;
+ const char *fname;
int mor;
int error = 1;
@@ -325,7 +325,7 @@
char *buf = NULL;
char *hbuf = NULL;
char *ohbuf;
- char *fname;
+ const char *fname;
FILE *inf = NULL;
int ips = 0;
int cps = 0;
@@ -642,7 +642,7 @@
char *buf = NULL;
char *hbuf = NULL;
char *ohbuf;
- char *fname;
+ const char *fname;
FILE *inf = NULL;
int ips = 0;
int cps = 0;
@@ -796,7 +796,7 @@
char *buf = NULL;
char *hbuf = NULL;
char *ohbuf;
- char *fname;
+ const char *fname;
int ips = 0;
int cps = 0;
int ops = 0;
@@ -1302,7 +1302,7 @@
nxtfile(argc, argv, fname, buf, dt)
int argc;
char **argv;
- char **fname;
+ const char **fname;
char *buf;
int dt;
{
@@ -1470,7 +1470,7 @@
int
prhead(buf, fname, pagcnt)
char *buf;
- char *fname;
+ const char *fname;
int pagcnt;
{
int ips = 0;
CVS commit: src/usr.bin/mkstr
Module Name:src
Committed By: lukem
Date: Mon Apr 13 00:41:28 UTC 2009
Modified Files:
src/usr.bin/mkstr: mkstr.c
Log Message:
fix sign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/mkstr/mkstr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mkstr/mkstr.c
diff -u src/usr.bin/mkstr/mkstr.c:1.13 src/usr.bin/mkstr/mkstr.c:1.14
--- src/usr.bin/mkstr/mkstr.c:1.13 Sun Apr 12 14:28:30 2009
+++ src/usr.bin/mkstr/mkstr.c Mon Apr 13 00:41:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mkstr.c,v 1.13 2009/04/12 14:28:30 lukem Exp $ */
+/* $NetBSD: mkstr.c,v 1.14 2009/04/13 00:41:28 lukem Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)mkstr.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: mkstr.c,v 1.13 2009/04/12 14:28:30 lukem Exp $);
+__RCSID($NetBSD: mkstr.c,v 1.14 2009/04/13 00:41:28 lukem Exp $);
#endif
#endif /* not lint */
@@ -86,7 +86,7 @@
int match __P((const char *));
int octdigit __P((char));
void inithash __P((void));
-int hashit __P((char *, char, unsigned));
+long hashit __P((char *, char, long));
void copystr __P((void));
int fgetNUL __P((char *, int, FILE *));
@@ -229,7 +229,7 @@
}
out:
*cp = 0;
- printf(%d, hashit(buf, 1, 0));
+ printf(%ld, hashit(buf, 1, 0));
}
int
@@ -244,7 +244,7 @@
inithash()
{
char buf[512];
- int mesgpt = 0;
+ long mesgpt = 0;
rewind(mesgread);
while (fgetNUL(buf, sizeof buf, mesgread) != 0) {
@@ -257,15 +257,15 @@
struct hash {
long hval;
- unsigned hpt;
+ long hpt;
struct hash *hnext;
} *bucket[NBUCKETS];
-int
+long
hashit(str, really, fakept)
char *str;
char really;
- unsigned fakept;
+ long fakept;
{
int i;
struct hash *hp;
@@ -286,10 +286,10 @@
if (really != 0)
for (hp = bucket[i]; hp != 0; hp = hp-hnext)
if (hp-hval == hashval) {
- fseek(mesgread, (long) hp-hpt, 0);
+ fseek(mesgread, hp-hpt, 0);
fgetNUL(buf, sizeof buf, mesgread);
/*
- fprintf(stderr, Got (from %d) %s\n, hp-hpt, buf);
+ fprintf(stderr, Got (from %ld) %s\n, hp-hpt, buf);
*/
if (strcmp(buf, str) == 0)
break;
@@ -306,7 +306,7 @@
bucket[i] = hp;
}
/*
- fprintf(stderr, %s hashed to %ld at %d\n, str, hp-hval, hp-hpt);
+ fprintf(stderr, %s hashed to %ld at %ld\n, str, hp-hval, hp-hpt);
*/
return (hp-hpt);
}
CVS commit: src/usr.bin/quota
Module Name:src
Committed By: lukem
Date: Mon Apr 13 04:16:38 UTC 2009
Modified Files:
src/usr.bin/quota: quota.c
Log Message:
Fix -Wcast-qual and -Wshadow issues
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/quota/quota.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/quota/quota.c
diff -u src/usr.bin/quota/quota.c:1.32 src/usr.bin/quota/quota.c:1.33
--- src/usr.bin/quota/quota.c:1.32 Mon Jul 21 14:19:25 2008
+++ src/usr.bin/quota/quota.c Mon Apr 13 04:16:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.c,v 1.32 2008/07/21 14:19:25 lukem Exp $ */
+/* $NetBSD: quota.c,v 1.33 2009/04/13 04:16:38 lukem Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)quota.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: quota.c,v 1.32 2008/07/21 14:19:25 lukem Exp $);
+__RCSID($NetBSD: quota.c,v 1.33 2009/04/13 04:16:38 lukem Exp $);
#endif
#endif /* not lint */
@@ -75,8 +75,8 @@
#include rpc/pmap_prot.h
#include rpcsvc/rquota.h
-char *qfname = QUOTAFILENAME;
-char *qfextension[] = INITQFNAMES;
+const char *qfname = QUOTAFILENAME;
+const char *qfextension[] = INITQFNAMES;
struct quotause {
struct quotause *next;
@@ -101,7 +101,7 @@
void showquotas __P((int, u_long, const char *));
void showuid __P((uid_t));
void showusrname __P((const char *));
-char *timeprt __P((time_t seconds));
+const char *timeprt __P((time_t seconds));
int ufshasquota __P((struct fstab *, int, char **));
void usage __P((void));
@@ -311,7 +311,7 @@
{
struct quotause *qup;
struct quotause *quplist;
- char *msgi, *msgb, *nam;
+ const char *msgi, *msgb, *nam;
int lines = 0;
static time_t now;
@@ -325,7 +325,7 @@
qup-dqblk.dqb_bsoftlimit == 0
qup-dqblk.dqb_bhardlimit == 0)
continue;
- msgi = (char *)0;
+ msgi = NULL;
if (qup-dqblk.dqb_ihardlimit
qup-dqblk.dqb_curinodes = qup-dqblk.dqb_ihardlimit)
msgi = File limit reached on;
@@ -336,7 +336,7 @@
else
msgi = Over file quota on;
}
- msgb = (char *)0;
+ msgb = NULL;
if (qup-dqblk.dqb_bhardlimit
qup-dqblk.dqb_curblocks = qup-dqblk.dqb_bhardlimit)
msgb = Block limit reached on;
@@ -351,12 +351,12 @@
}
}
if (qflag) {
- if ((msgi != (char *)0 || msgb != (char *)0)
+ if ((msgi != NULL || msgb != NULL)
lines++ == 0)
heading(type, id, name, );
- if (msgi != (char *)0)
+ if (msgi != NULL)
printf(\t%s %s\n, msgi, qup-fsname);
- if (msgb != (char *)0)
+ if (msgb != NULL)
printf(\t%s %s\n, msgb, qup-fsname);
continue;
}
@@ -374,19 +374,19 @@
, nam
, (int)(dbtob((u_quad_t)qup-dqblk.dqb_curblocks)
/ 1024)
- , (msgb == (char *)0) ? ' ' : '*'
+ , (msgb == NULL) ? ' ' : '*'
, (int)(dbtob((u_quad_t)qup-dqblk.dqb_bsoftlimit)
/ 1024)
, (int)(dbtob((u_quad_t)qup-dqblk.dqb_bhardlimit)
/ 1024)
- , (msgb == (char *)0) ?
+ , (msgb == NULL) ?
: timeprt(qup-dqblk.dqb_btime));
printf(%8d%c%7d%8d%8s\n
, qup-dqblk.dqb_curinodes
- , (msgi == (char *)0) ? ' ' : '*'
+ , (msgi == NULL) ? ' ' : '*'
, qup-dqblk.dqb_isoftlimit
, qup-dqblk.dqb_ihardlimit
- , (msgi == (char *)0) ?
+ , (msgi == NULL) ?
: timeprt(qup-dqblk.dqb_itime)
);
continue;
@@ -423,7 +423,7 @@
/*
* Calculate the grace period and return a printable string for it.
*/
-char *
+const char *
timeprt(seconds)
time_t seconds;
{
@@ -710,7 +710,7 @@
struct timeval timeout, tottimeout;
CLIENT *client = NULL;
- int socket = RPC_ANYSOCK;
+ int sock = RPC_ANYSOCK;
if ((hp = gethostbyname(host)) == NULL)
return ((int) RPC_UNKNOWNHOST);
@@ -721,7 +721,7 @@
server_addr.sin_port = 0;
if ((client = clntudp_create(server_addr, prognum,
- versnum, timeout, socket)) == NULL)
+ versnum, timeout, sock)) == NULL)
return ((int) rpc_createerr.cf_stat);
client-cl_auth = authunix_create_default();
CVS commit: src/usr.bin/radioctl
Module Name:src
Committed By: lukem
Date: Mon Apr 13 04:24:29 UTC 2009
Modified Files:
src/usr.bin/radioctl: radioctl.c
Log Message:
Fix WARNS=4 issues (-Wcast-qual -Wsign-compare)
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/radioctl/radioctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/radioctl/radioctl.c
diff -u src/usr.bin/radioctl/radioctl.c:1.7 src/usr.bin/radioctl/radioctl.c:1.8
--- src/usr.bin/radioctl/radioctl.c:1.7 Thu May 11 01:24:14 2006
+++ src/usr.bin/radioctl/radioctl.c Mon Apr 13 04:24:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: radioctl.c,v 1.7 2006/05/11 01:24:14 mrg Exp $ */
+/* $NetBSD: radioctl.c,v 1.8 2009/04/13 04:24:29 lukem Exp $ */
/* $OpenBSD: radioctl.c,v 1.5 2001/12/18 18:42:19 mickey Exp $ */
/* $RuOBSD: radioctl.c,v 1.4 2001/10/20 18:09:10 pva Exp $ */
@@ -29,7 +29,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: radioctl.c,v 1.7 2006/05/11 01:24:14 mrg Exp $);
+__RCSID($NetBSD: radioctl.c,v 1.8 2009/04/13 04:24:29 lukem Exp $);
#endif
#include sys/ioctl.h
@@ -97,8 +97,8 @@
static void usage(void);
static void show_verbose(const char *, int);
-static void show_int_val(u_long, const char *, char *, int);
-static void show_float_val(float, const char *, char *, int);
+static void show_int_val(u_long, const char *, const char *, int);
+static void show_float_val(float, const char *, const char *, int);
static void show_char_val(const char *, const char *, int);
static int str_to_opt(const char *);
static u_long str_to_long(char *, int);
@@ -110,7 +110,7 @@
main(int argc, char **argv)
{
struct opt_t opt;
- char *radiodev = NULL;
+ const char *radiodev = NULL;
int rd = -1;
int optchar;
char *param = NULL;
@@ -378,7 +378,7 @@
/* Set only o-optval, the rest is missing */
if (slen == optlen) {
o-option = str_to_opt(s);
- return o-option == OPTION_NONE ? 0 : 1;
+ return o-option == (int)OPTION_NONE ? 0 : 1;
}
if (optlen slen - 2) {
@@ -394,7 +394,7 @@
}
strlcpy(topt, s, optlen);
- if ((o-option = str_to_opt(topt)) == OPTION_NONE) {
+ if ((o-option = str_to_opt(topt)) == (int)OPTION_NONE) {
free(topt);
return 0;
}
@@ -443,7 +443,7 @@
static void
print_value(int optval)
{
- if (optval == OPTION_NONE)
+ if (optval == (int)OPTION_NONE)
return;
switch (optval) {
@@ -475,14 +475,14 @@
}
static void
-show_int_val(u_long val, const char *nick, char *append, int silent)
+show_int_val(u_long val, const char *nick, const char *append, int silent)
{
show_verbose(nick, silent);
printf(%lu%s\n, val, append);
}
static void
-show_float_val(float val, const char *nick, char *append, int silent)
+show_float_val(float val, const char *nick, const char *append, int silent)
{
show_verbose(nick, silent);
printf(%.2f%s\n, val, append);
CVS commit: src/usr.bin/rdist
Module Name:src
Committed By: lukem
Date: Mon Apr 13 04:35:37 UTC 2009
Modified Files:
src/usr.bin/rdist: defs.h docmd.c expand.c gram.y lookup.c server.c
Log Message:
Fix WARNS=4 issues (-Wshadow -Wcast-qual -Wsign-compare)
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/rdist/defs.h
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/rdist/docmd.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/rdist/expand.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/rdist/gram.y
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/rdist/lookup.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/rdist/server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/rdist/defs.h
diff -u src/usr.bin/rdist/defs.h:1.17 src/usr.bin/rdist/defs.h:1.18
--- src/usr.bin/rdist/defs.h:1.17 Sat Mar 18 09:46:35 2006
+++ src/usr.bin/rdist/defs.h Mon Apr 13 04:35:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.17 2006/03/18 09:46:35 christos Exp $ */
+/* $NetBSD: defs.h,v 1.18 2009/04/13 04:35:36 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -149,7 +149,7 @@
extern uid_t userid; /* user's user ID */
extern gid_t groupid; /* user's group ID */
-int any(int, char *);
+int any(int, const char *);
char *colon(char *);
void cleanup(int);
void define(char *);
@@ -179,5 +179,5 @@
void freesubcmd(struct subcmd *);
void prnames(struct namelist *);
void server(void);
-void yyerror(char *);
+void yyerror(const char *);
int yyparse(void);
Index: src/usr.bin/rdist/docmd.c
diff -u src/usr.bin/rdist/docmd.c:1.27 src/usr.bin/rdist/docmd.c:1.28
--- src/usr.bin/rdist/docmd.c:1.27 Mon Dec 18 15:14:42 2006
+++ src/usr.bin/rdist/docmd.c Mon Apr 13 04:35:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: docmd.c,v 1.27 2006/12/18 15:14:42 christos Exp $ */
+/* $NetBSD: docmd.c,v 1.28 2009/04/13 04:35:36 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)docmd.c 8.1 (Berkeley) 6/9/93;
#else
-__RCSID($NetBSD: docmd.c,v 1.27 2006/12/18 15:14:42 christos Exp $);
+__RCSID($NetBSD: docmd.c,v 1.28 2009/04/13 04:35:36 lukem Exp $);
#endif
#endif /* not lint */
@@ -315,29 +315,29 @@
/*ARGSUSED*/
lostconn(int signo __unused)
{
- char buf[BUFSIZ];
+ char lcbuf[BUFSIZ];
int nr = -1;
if (remerr != -1)
if (ioctl(remerr, FIONREAD, nr) != -1) {
- if (nr = sizeof(buf))
-nr = sizeof(buf) - 1;
- if ((nr = read(remerr, buf, nr)) 0) {
-buf[nr] = '\0';
-if (buf[nr - 1] == '\n')
- buf[--nr] = '\0';
+ if (nr = (int)sizeof(lcbuf))
+nr = sizeof(lcbuf) - 1;
+ if ((nr = read(remerr, lcbuf, nr)) 0) {
+lcbuf[nr] = '\0';
+if (lcbuf[nr - 1] == '\n')
+ lcbuf[--nr] = '\0';
}
}
if (nr = 0)
- (void) strlcpy(buf, lost connection, sizeof(buf));
+ (void) strlcpy(lcbuf, lost connection, sizeof(lcbuf));
if (iamremote)
cleanup(0);
if (lfp)
- dolog(lfp, rdist: %s\n, buf);
+ dolog(lfp, rdist: %s\n, lcbuf);
else
- error(%s\n, buf);
+ error(%s\n, lcbuf);
longjmp(env, 1);
}
Index: src/usr.bin/rdist/expand.c
diff -u src/usr.bin/rdist/expand.c:1.16 src/usr.bin/rdist/expand.c:1.17
--- src/usr.bin/rdist/expand.c:1.16 Thu Aug 7 11:15:35 2003
+++ src/usr.bin/rdist/expand.c Mon Apr 13 04:35:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.16 2003/08/07 11:15:35 agc Exp $ */
+/* $NetBSD: expand.c,v 1.17 2009/04/13 04:35:36 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)expand.c 8.1 (Berkeley) 6/9/93;
#else
-__RCSID($NetBSD: expand.c,v 1.16 2003/08/07 11:15:35 agc Exp $);
+__RCSID($NetBSD: expand.c,v 1.17 2009/04/13 04:35:36 lukem Exp $);
#endif
#endif /* not lint */
@@ -57,7 +57,7 @@
char *path;
char *pathp;
char *lastpathp;
-char *tilde; /* ~user if not expanding tilde, else */
+const char *tilde; /* ~user if not expanding tilde, else */
char *tpathp;
int nleft;
@@ -68,7 +68,7 @@
#define sort() qsort((char *)sortbase, eargv[eargc] - sortbase, \
sizeof(*sortbase), argcmp), sortbase = eargv[eargc]
-static void Cat(char *, char *);
+static void Cat(const char *, const char *);
static void addpath(int);
static int amatch(char *, char *);
static int argcmp(const void *, const void *);
@@ -151,7 +151,7 @@
char *cp, *cp1;
struct namelist *tp;
char *tail;
- char buf[BUFSIZ];
+ char expbuf[BUFSIZ];
int savec, oeargc;
extern char homedir[];
@@ -185,14 +185,14 @@
*tail = savec;
if (tp != NULL) {
for (; tp != NULL; tp = tp-n_next) {
-snprintf(buf, sizeof(buf), %s%s%s, s,
+snprintf(expbuf, sizeof(expbuf), %s%s%s, s,
tp-n_name, tail);
-expstr(buf);
+expstr(expbuf);
}
return;
}
- snprintf(buf, sizeof(buf), %s%s, s, tail);
- expstr(buf);
+ snprintf(expbuf, sizeof(expbuf), %s%s, s, tail);
+ expstr(expbuf);
return;
}
if ((which ~E_VARS) == 0 || !strcmp(s, {) || !strcmp(s, {})) {
@@ -206,17 +206,17 @@
tilde = ~;
