CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Thu May 20 07:13:16 UTC 2010 Modified Files: src/share/man/man3: sigevent.3 Log Message: Add a bold-faced note that the interface is not fully functional, but the opposite. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man3/sigevent.3 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/man3/sigevent.3 diff -u src/share/man/man3/sigevent.3:1.3 src/share/man/man3/sigevent.3:1.4 --- src/share/man/man3/sigevent.3:1.3 Wed May 19 08:02:46 2010 +++ src/share/man/man3/sigevent.3 Thu May 20 07:13:16 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sigevent.3,v 1.3 2010/05/19 08:02:46 jruoho Exp $ +.\" $NetBSD: sigevent.3,v 1.4 2010/05/20 07:13:16 jruoho Exp $ .\" .\" Copyright (c) 2010 Jukka Ruohonen .\" @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 18, 2010 +.Dd May 20, 2010 .Dt SIGEVENT 3 .Os .Sh NAME @@ -38,13 +38,17 @@ .Tn UNIX signal semantics by providing facilities for realtime signal generation and delivery. +.Pp .\" -.\" XXX: Remove the paragraph once RT signals are supported. +.\" XXX: Remove once these are fixed. .\" -Although -.Nx -does not yet support realtime signals, -the described interface is fully functional. +.Bf -symbolic +Please note that this manual describes an interface that +is not yet fully functional in +.Nx : +neither realtime signals nor SIGEV_THREAD +are currently supported. +.Ef .Pp Realtime functions that can generate realtime signals include: .Bl -enum -offset 3n @@ -174,8 +178,3 @@ .Va sigevent structure first appeared in .Nx 1.6 . -.\" -.\" XXX: Remove the paragraph once RT signals are supported. -.\" -.Sh BUGS -Realtime signals are not yet supported.
CVS commit: xsrc/external/mit/xf86-video-igs/dist/src
Module Name:xsrc Committed By: macallan Date: Thu May 20 07:55:20 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-igs/dist/src: igs.h igs_accel.c igs_driver.c Log Message: pick up some nits accidentially left in: - get rid of usleep() while waiting for the blitter - way too crude - sanitize some register writes since last time I looked at this some other problem crept in - we now have syncing issues with text drawing To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-igs/dist/src/igs.h \ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-igs/dist/src/igs.h diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.1 xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.2 --- xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.1 Tue Nov 10 21:39:45 2009 +++ xsrc/external/mit/xf86-video-igs/dist/src/igs.h Thu May 20 07:55:19 2010 @@ -1,5 +1,5 @@ /* $OpenBSD: wsfb_driver.c,v 1.18 2003/04/02 16:42:13 jason Exp $ */ -/* $NetBSD: igs.h,v 1.1 2009/11/10 21:39:45 macallan Exp $ */ +/* $NetBSD: igs.h,v 1.2 2010/05/20 07:55:19 macallan Exp $ */ /* * Copyright (c) 2001 Matthieu Herrb * 2009 Michael Lorenz @@ -57,7 +57,7 @@ int fd; /* file descriptor of open device */ struct wsdisplay_fbinfo info; /* frame buffer characteristics */ int linebytes; /* number of bytes per row */ - uint8_t *reg; + volatile uint8_t *reg; unsigned char* fbstart; unsigned char* fbmem; size_t fbmem_len; @@ -81,6 +81,7 @@ int nDGAMode; #endif OptionInfoPtr Options; + uint8_t mapfmt; } IgsRec, *IgsPtr; #define IGSPTR(p) ((IgsPtr)((p)->driverPrivate)) Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.1 xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.2 --- xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.1 Tue Nov 10 21:39:45 2009 +++ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c Thu May 20 07:55:20 2010 @@ -1,5 +1,5 @@ /* $OpenBSD: wsfb_driver.c,v 1.19 2003/04/27 16:42:32 matthieu Exp $ */ -/* $NetBSD: igs_driver.c,v 1.1 2009/11/10 21:39:45 macallan Exp $ */ +/* $NetBSD: igs_driver.c,v 1.2 2010/05/20 07:55:20 macallan Exp $ */ /* * Copyright (c) 2001 Matthieu Herrb * 2009 Michael Lorenz @@ -416,7 +416,7 @@ IgsPreInit(ScrnInfoPtr pScrn, int flags) { IgsPtr fPtr; - int default_depth, vram_size; + int default_depth, vram_size = 2 * 1024 * 1024; char *dev, *s; char *mod = NULL; const char *reqSym = NULL; Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.2 xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.3 --- xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.2 Sat Nov 21 22:22:27 2009 +++ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c Thu May 20 07:55:20 2010 @@ -21,7 +21,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $NetBSD: igs_accel.c,v 1.2 2009/11/21 22:22:27 macallan Exp $ */ +/* $NetBSD: igs_accel.c,v 1.3 2010/05/20 07:55:20 macallan Exp $ */ #include @@ -71,12 +71,12 @@ int bail = 0x0fff; ENTER; - IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, (fPtr->info.depth >> 3) - 1); + IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, fPtr->mapfmt); while ((IgsRead1(fPtr, IGS_COP_CTL_REG) & (IGS_COP_CTL_BUSY | IGS_COP_CTL_HFEMPTZ) != 0) && (bail > 0)) { bail--; - usleep(1); + IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, fPtr->mapfmt); } /* reset the coprocessor if we run into a timeout */ @@ -100,12 +100,12 @@ int bail = 0x0fff; ENTER; - IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, (fPtr->info.depth >> 3) - 1); + IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, fPtr->mapfmt); while (((IgsRead1(fPtr, IGS_COP_CTL_REG) & (IGS_COP_CTL_BUSY | IGS_COP_CTL_HFEMPTZ)) != 0) && (bail > 0)) { bail--; - usleep(1); + IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, fPtr->mapfmt); } /* reset the coprocessor if we run into a timeout */ @@ -261,12 +261,14 @@ intdst_pitch = exaGetPixmapPitch(pDst); int bpp= pDst->drawable.bitsPerPixel; - int cpp= (bpp + 7) / 8; + int cpp= (bpp + 7) >> 3; int wBytes = w * cpp; ENTER; dst += (x * cpp) + (y * dst_pitch); + IgsWaitReady(fPtr); + while (h--) { memcpy(dst, src, wBytes); src += src_pitch; @@ -289,12 +291,14 @@ intsrc_pitch = exaGetPixmapPitch(pSrc); int bpp= pSrc->drawable.bitsPerPixel; - int cpp= (bpp + 7) / 8; + int cpp= (bpp + 7) >> 3; int wBytes = w * cpp; ENTER; src += (x * cpp) + (y * src_pitch); + IgsWaitReady(fPtr); + while (h--) { memcpy(dst, src, wBytes); src += src_pitch; @@ -343,14 +347,2
CVS commit: src/sys/fs/puffs
Module Name:src Committed By: pooka Date: Thu May 20 12:09:46 UTC 2010 Modified Files: src/sys/fs/puffs: puffs_msgif.h Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/fs/puffs/puffs_msgif.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/puffs/puffs_msgif.h diff -u src/sys/fs/puffs/puffs_msgif.h:1.69 src/sys/fs/puffs/puffs_msgif.h:1.70 --- src/sys/fs/puffs/puffs_msgif.h:1.69 Thu Jan 7 22:45:31 2010 +++ src/sys/fs/puffs/puffs_msgif.h Thu May 20 12:09:45 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: puffs_msgif.h,v 1.69 2010/01/07 22:45:31 pooka Exp $ */ +/* $NetBSD: puffs_msgif.h,v 1.70 2010/05/20 12:09:45 pooka Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. @@ -67,9 +67,9 @@ PUFFS_VFS_ROOT, PUFFS_VFS_STATVFS, PUFFS_VFS_SYNC, PUFFS_VFS_VGET, PUFFS_VFS_FHTOVP, PUFFS_VFS_VPTOFH, PUFFS_VFS_INIT, PUFFS_VFS_DONE, PUFFS_VFS_SNAPSHOT, - PUFFS_VFS_EXTATTCTL, PUFFS_VFS_SUSPEND + PUFFS_VFS_EXTATTRCTL, PUFFS_VFS_SUSPEND }; -#define PUFFS_VFS_MAX PUFFS_VFS_EXTATTCTL +#define PUFFS_VFS_MAX PUFFS_VFS_EXTATTRCTL /* XXX: NOT TRUE!! */ /* moreXXX: we don't need everything here either */ enum {
CVS commit: src/external/mit/xorg
Module Name:src Committed By: christos Date: Thu May 20 12:51:17 UTC 2010 Modified Files: src/external/mit/xorg/bin/xkbcomp: Makefile Makefile.common src/external/mit/xorg/server/xorg-server/xkb: Makefile Log Message: Allow the build to work on a read-only source tree. From Anon Ymous To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xkbcomp/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xkbcomp/Makefile.common cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server/xkb/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/mit/xorg/bin/xkbcomp/Makefile diff -u src/external/mit/xorg/bin/xkbcomp/Makefile:1.5 src/external/mit/xorg/bin/xkbcomp/Makefile:1.6 --- src/external/mit/xorg/bin/xkbcomp/Makefile:1.5 Wed Sep 30 22:27:59 2009 +++ src/external/mit/xorg/bin/xkbcomp/Makefile Thu May 20 08:51:16 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2009/10/01 02:27:59 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2010/05/20 12:51:16 christos Exp $ .include .include "Makefile.common" @@ -9,16 +9,16 @@ symbols.c geometry.c xkbpath.c listing.c \ xkbparse.y parseutils.c utils.c -CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBCOMPDIR}\" +CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBROOTDIR}\" CPPFLAGS+= -I${X11SRCDIR.${PROG}} -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H CPPFLAGS.geometry.c= -Wno-error # XXX -FILESDIR=${X11LIBDIR}/xkb +FILESDIR=${XKBROOTDIR} FILES= README README.config README.enhancing -SYMLINKS+= ${BINDIR}/xkbcomp ${X11LIBDIR}/xkb/xkbcomp -SYMLINKS+= ${XKBCOMPDIR} ${X11LIBDIR}/xkb/compiled +SYMLINKS+= ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp +SYMLINKS+= ${XKBDATADIR} ${XKBCOMPDIR} LDADD+= -lxkbfile -lXext -lX11 DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11} Index: src/external/mit/xorg/bin/xkbcomp/Makefile.common diff -u src/external/mit/xorg/bin/xkbcomp/Makefile.common:1.2 src/external/mit/xorg/bin/xkbcomp/Makefile.common:1.3 --- src/external/mit/xorg/bin/xkbcomp/Makefile.common:1.2 Wed Sep 30 22:27:59 2009 +++ src/external/mit/xorg/bin/xkbcomp/Makefile.common Thu May 20 08:51:16 2010 @@ -1,3 +1,5 @@ -# $NetBSD: Makefile.common,v 1.2 2009/10/01 02:27:59 mrg Exp $ +# $NetBSD: Makefile.common,v 1.3 2010/05/20 12:51:16 christos Exp $ -XKBCOMPDIR= ${X11LIBDIR}/xkb +XKBROOTDIR= ${X11LIBDIR}/xkb +XKBCOMPDIR= ${XKBROOTDIR}/compiled # actually a link to ${XKBDATADIR} +XKBDATADIR= /var/db/xkb # must be writable! Index: src/external/mit/xorg/server/xorg-server/xkb/Makefile diff -u src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.6 src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.7 --- src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.6 Fri Sep 25 02:07:06 2009 +++ src/external/mit/xorg/server/xorg-server/xkb/Makefile Thu May 20 08:51:17 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/09/25 06:07:06 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2010/05/20 12:51:17 christos Exp $ .include "../Makefile.serverlib" .include "../Makefile.servermod" @@ -30,13 +30,15 @@ -I${X11SRCDIR.xorg-server}/hw/xfree86/common \ -I${X11SRCDIR.xorg-server}/../include -# For ${XKBCOMPDIR} +# For ${XKBROOTDIR} and ${XKBCOMPDIR} .include "../../../bin/xkbcomp/Makefile.common" +# XXX: ddxLoad.c expects XKM_OUTPUT_DIR to have a trailing '/'. + CPPFLAGS+= -DXKB_IN_SERVER -DHAVE_XKB_CONFIG_H \ - -DXKB_BASE_DIRECTORY=\"${X11LIBDIR}/xkb\" \ + -DXKB_BASE_DIRECTORY=\"${XKBROOTDIR}\" \ -DXKB_BIN_DIRECTORY=\"${X11BINDIR}\" \ - -DXKM_OUTPUT_DIR=\"${XKBCOMPDIR}\" \ + -DXKM_OUTPUT_DIR=\"${XKBCOMPDIR}/\" \ -DXKB_DFLT_DISABLED=0 COPTS.XKBAlloc.c= -Wno-error # XXX gcc 3.3
CVS commit: src/lib/libpuffs
Module Name:src Committed By: pooka Date: Thu May 20 13:07:28 UTC 2010 Modified Files: src/lib/libpuffs: opdump.c Log Message: * fix typo * fix "that's not supposed to be there" causing off-by-one in array * make compile regardless of dev_t size To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/lib/libpuffs/opdump.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/libpuffs/opdump.c diff -u src/lib/libpuffs/opdump.c:1.30 src/lib/libpuffs/opdump.c:1.31 --- src/lib/libpuffs/opdump.c:1.30 Thu Jan 7 22:46:11 2010 +++ src/lib/libpuffs/opdump.c Thu May 20 13:07:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: opdump.c,v 1.30 2010/01/07 22:46:11 pooka Exp $ */ +/* $NetBSD: opdump.c,v 1.31 2010/05/20 13:07:28 pooka Exp $ */ /* * Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved. @@ -35,7 +35,7 @@ #include #if !defined(lint) -__RCSID("$NetBSD: opdump.c,v 1.30 2010/01/07 22:46:11 pooka Exp $"); +__RCSID("$NetBSD: opdump.c,v 1.31 2010/05/20 13:07:28 pooka Exp $"); #endif /* !lint */ #include @@ -63,7 +63,7 @@ "PUFFS_VFS_INIT", "PUFFS_VFS_DONE", "PUFFS_VFS_SNAPSHOT", - "PUFFS_VFS_EXTATTCTL", + "PUFFS_VFS_EXTATTRCTL", "PUFFS_VFS_SUSPEND" }; /* XXX! */ @@ -109,7 +109,6 @@ "PUFFS_VN_WHITEOUT", "PUFFS_VN_GETPAGES", "PUFFS_VN_PUTPAGES", - "PUFFS_VN_BWRITE", "PUFFS_VN_GETEXTATTR", "PUFFS_VN_LISTEXTATTR", "PUFFS_VN_OPENEXTATTR", @@ -295,7 +294,7 @@ printf("gid: %s\n", buf); DEFAULTBUF(); - if (vap->va_fsid != (dev_t)PUFFS_VNOVAL) + if ((unsigned long long)vap->va_fsid!=(unsigned long long)PUFFS_VNOVAL) snprintf(buf, sizeof(buf), "0x%llx", (unsigned long long)vap->va_fsid); printf(DINT DINT "fsid: %s, ", buf);
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Thu May 20 14:42:21 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c Log Message: extend the resolve_userid() function to take a keyring, and use it for functions which require a secret key as well. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 \ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.52 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.53 --- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.52 Thu May 20 00:36:31 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Thu May 20 14:42:21 2010 @@ -34,7 +34,7 @@ #if defined(__NetBSD__) __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: netpgp.c,v 1.52 2010/05/20 00:36:31 agc Exp $"); +__RCSID("$NetBSD: netpgp.c,v 1.53 2010/05/20 14:42:21 agc Exp $"); #endif #include @@ -294,9 +294,9 @@ return 1; } -/* set ssh uid to first one in ring */ +/* set ssh uid to first one in pubring */ static void -set_ssh_userid(__ops_keyring_t *pubring, char *id, size_t len, int last) +set_first_pubring(__ops_keyring_t *pubring, char *id, size_t len, int last) { uint8_t *src; int i; @@ -383,7 +383,7 @@ /* resolve the userid */ static const __ops_key_t * -resolve_userid(netpgp_t *netpgp, const char *userid) +resolve_userid(netpgp_t *netpgp, const __ops_keyring_t *keyring, const char *userid) { const __ops_key_t *key; __ops_io_t *io; @@ -394,7 +394,7 @@ userid += 2; } io = netpgp->io; - if ((key = __ops_getkeybyname(io, netpgp->pubring, userid)) == NULL) { + if ((key = __ops_getkeybyname(io, keyring, userid)) == NULL) { (void) fprintf(io->errs, "Can't find key '%s'\n", userid); } return key; @@ -511,7 +511,7 @@ return 0; } if ((userid = netpgp_getvar(netpgp, "userid")) == NULL) { - set_ssh_userid(netpgp->pubring, id, sizeof(id), last); + set_first_pubring(netpgp->pubring, id, sizeof(id), last); netpgp_setvar(netpgp, "userid", userid = id); } if (userid == NULL) { @@ -611,8 +611,10 @@ (pubs.c == 1) ? "" : "s"); } for (k = 0 ; k < pubs.c ; k++) { - (void) fprintf(fp, "%s", pubs.v[k]); - free(pubs.v[k]); + if (pubs.v[k]) { + (void) fprintf(fp, "%s%s", pubs.v[k], (k < pubs.c - 1) ? "\n" : ""); + free(pubs.v[k]); + } } free(pubs.v); return pubs.c; @@ -669,11 +671,9 @@ netpgp_get_key(netpgp_t *netpgp, const char *name, const char *fmt) { const __ops_key_t *key; - __ops_io_t *io; char *newkey; - io = netpgp->io; - if ((key = resolve_userid(netpgp, name)) == NULL) { + if ((key = resolve_userid(netpgp, netpgp->pubring, name)) == NULL) { return NULL; } if (strcmp(fmt, "mr") == 0) { @@ -696,7 +696,7 @@ __ops_io_t *io; io = netpgp->io; - if ((key = resolve_userid(netpgp, name)) == NULL) { + if ((key = resolve_userid(netpgp, netpgp->pubring, name)) == NULL) { return NULL; } return __ops_export_key(io, key, NULL); @@ -822,7 +822,8 @@ return 0; } suffix = (armored) ? ".asc" : ".gpg"; - if ((keypair = resolve_userid(netpgp, userid)) == NULL) { + /* get key with which to sign */ + if ((keypair = resolve_userid(netpgp, netpgp->pubring, userid)) == NULL) { return 0; } if (out == NULL) { @@ -893,14 +894,9 @@ "netpgp_sign_file: no filename specified\n"); return 0; } - if (userid == NULL) { - userid = netpgp_getvar(netpgp, "userid"); - } /* get key with which to sign */ - keypair = __ops_getkeybyname(io, netpgp->secring, userid); - if (keypair == NULL) { - (void) fprintf(io->errs, "Userid '%s' not found in secring\n", -userid); + if ((keypair = resolve_userid(netpgp, netpgp->secring, userid)) == NULL) { + (void) fprintf(io->errs, "netpgp_sign_file: userid '%s' not found\n", userid); return 0; } ret = 1; @@ -1027,14 +1023,7 @@ "netpgp_sign_memory: no memory to sign\n"); return 0; } - if (userid == NULL) { - userid = netpgp_getvar(netpgp, "userid"); - } - /* get key with which to sign */ - keypair = __ops_getkeybyname(io, netpgp->secring, userid); - if (keypair == NULL) { - (void) fprintf(io->errs, "Userid '%s' not found in keyring\n", -userid); + if ((keypair = resolve_userid(netpgp, netpgp->secring, userid)) == NULL) { return 0; } ret = 1; @@ -1155,13 +1144,7 @@ "netpgp_encrypt_buf: no memory to encrypt\n"); return 0; } - if (userid == NULL) { - userid = netpgp_getvar(netpgp, "userid"); - } - keypair = __ops_getkeybyname(io, netpgp->pubring, userid); - if (keypair == NULL) { - (void) fprintf(io->errs, "Userid '%s' not found in keyring\n", - userid); + if ((keypair = resolve_userid(netpgp, netpgp->pubring, userid)) == NULL) { return 0; } if (in == out
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Thu May 20 14:43:42 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c Log Message: avoid a duplicated error message To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 \ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.53 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.54 --- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.53 Thu May 20 14:42:21 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Thu May 20 14:43:42 2010 @@ -34,7 +34,7 @@ #if defined(__NetBSD__) __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: netpgp.c,v 1.53 2010/05/20 14:42:21 agc Exp $"); +__RCSID("$NetBSD: netpgp.c,v 1.54 2010/05/20 14:43:42 agc Exp $"); #endif #include @@ -896,7 +896,6 @@ } /* get key with which to sign */ if ((keypair = resolve_userid(netpgp, netpgp->secring, userid)) == NULL) { - (void) fprintf(io->errs, "netpgp_sign_file: userid '%s' not found\n", userid); return 0; } ret = 1;
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: pooka Date: Thu May 20 15:46:47 UTC 2010 Modified Files: src/sys/rump/librump/rumpvfs: rump_vfs.c rumpvfs.ifspec Log Message: open VFS_EXTATTRCTL to user namespace To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/rump/librump/rumpvfs/rump_vfs.c cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpvfs/rumpvfs.ifspec Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpvfs/rump_vfs.c diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.50 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.51 --- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.50 Tue May 11 14:49:07 2010 +++ src/sys/rump/librump/rumpvfs/rump_vfs.c Thu May 20 15:46:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_vfs.c,v 1.50 2010/05/11 14:49:07 pooka Exp $ */ +/* $NetBSD: rump_vfs.c,v 1.51 2010/05/20 15:46:47 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.50 2010/05/11 14:49:07 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.51 2010/05/20 15:46:47 pooka Exp $"); #include #include @@ -411,6 +411,14 @@ return VFS_VPTOFH(vp, fid, fidsize); } +int +rump_vfs_extattrctl(struct mount *mp, int cmd, struct vnode *vp, + int attrnamespace, const char *attrname) +{ + + return VFS_EXTATTRCTL(mp, cmd, vp, attrnamespace, attrname); +} + /*ARGSUSED*/ void rump_vfs_syncwait(struct mount *mp) Index: src/sys/rump/librump/rumpvfs/rumpvfs.ifspec diff -u src/sys/rump/librump/rumpvfs/rumpvfs.ifspec:1.2 src/sys/rump/librump/rumpvfs/rumpvfs.ifspec:1.3 --- src/sys/rump/librump/rumpvfs/rumpvfs.ifspec:1.2 Wed Apr 14 14:12:48 2010 +++ src/sys/rump/librump/rumpvfs/rumpvfs.ifspec Thu May 20 15:46:47 2010 @@ -1,4 +1,4 @@ -; $NetBSD: rumpvfs.ifspec,v 1.2 2010/04/14 14:12:48 pooka Exp $ +; $NetBSD: rumpvfs.ifspec,v 1.3 2010/05/20 15:46:47 pooka Exp $ NAME|vfs PUBHDR|include/rump/rumpvfs_if_pub.h @@ -46,6 +46,8 @@ int |vfs_sync |struct mount *, int, struct kauth_cred * int |vfs_fhtovp |struct mount *, struct fid *, struct vnode ** int |vfs_vptofh |struct vnode *, struct fid *, size_t * +int |vfs_extattrctl |struct mount *, int, struct vnode *, \ + int, const char * void |vfs_syncwait |struct mount * int |vfs_getmp |const char *, struct mount **
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Thu May 20 15:47:45 UTC 2010 Modified Files: src/sys/rump/include/rump: rumpvfs_if_pub.h src/sys/rump/librump/rumpvfs: rumpvfs_if_wrappers.c Log Message: regen: rump_vfs_extattrctl To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/rump/rumpvfs_if_pub.h cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.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/rump/include/rump/rumpvfs_if_pub.h diff -u src/sys/rump/include/rump/rumpvfs_if_pub.h:1.4 src/sys/rump/include/rump/rumpvfs_if_pub.h:1.5 --- src/sys/rump/include/rump/rumpvfs_if_pub.h:1.4 Wed Apr 14 14:14:53 2010 +++ src/sys/rump/include/rump/rumpvfs_if_pub.h Thu May 20 15:47:45 2010 @@ -1,8 +1,8 @@ -/* $NetBSD: rumpvfs_if_pub.h,v 1.4 2010/04/14 14:14:53 pooka Exp $ */ +/* $NetBSD: rumpvfs_if_pub.h,v 1.5 2010/05/20 15:47:45 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. - * from: NetBSD: rumpvfs.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp + * from: NetBSD: rumpvfs.ifspec,v 1.3 2010/05/20 15:46:47 pooka Exp * by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp */ @@ -31,6 +31,7 @@ int rump_pub_vfs_sync(struct mount *, int, struct kauth_cred *); int rump_pub_vfs_fhtovp(struct mount *, struct fid *, struct vnode **); int rump_pub_vfs_vptofh(struct vnode *, struct fid *, size_t *); +int rump_pub_vfs_extattrctl(struct mount *, int, struct vnode *, int, const char *); void rump_pub_vfs_syncwait(struct mount *); int rump_pub_vfs_getmp(const char *, struct mount **); void rump_pub_rcvp_set(struct vnode *, struct vnode *); Index: src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c diff -u src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c:1.4 src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c:1.5 --- src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c:1.4 Wed Apr 14 14:14:53 2010 +++ src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c Thu May 20 15:47:45 2010 @@ -1,8 +1,8 @@ -/* $NetBSD: rumpvfs_if_wrappers.c,v 1.4 2010/04/14 14:14:53 pooka Exp $ */ +/* $NetBSD: rumpvfs_if_wrappers.c,v 1.5 2010/05/20 15:47:45 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. - * from: NetBSD: rumpvfs.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp + * from: NetBSD: rumpvfs.ifspec,v 1.3 2010/05/20 15:46:47 pooka Exp * by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp */ @@ -296,6 +296,18 @@ return rv; } +int +rump_pub_vfs_extattrctl(struct mount *arg1, int arg2, struct vnode *arg3, int arg4, const char *arg5) +{ + int rv; + + rump_schedule(); + rv = rump_vfs_extattrctl(arg1, arg2, arg3, arg4, arg5); + rump_unschedule(); + + return rv; +} + void rump_pub_vfs_syncwait(struct mount *arg1) {
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: pooka Date: Thu May 20 15:58:09 UTC 2010 Modified Files: src/sys/rump/librump/rumpvfs: rumpvfs_if_priv.h Log Message: one more file to commit with regen To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h diff -u src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h:1.4 src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h:1.5 --- src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h:1.4 Wed Apr 14 14:14:53 2010 +++ src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h Thu May 20 15:58:09 2010 @@ -1,8 +1,8 @@ -/* $NetBSD: rumpvfs_if_priv.h,v 1.4 2010/04/14 14:14:53 pooka Exp $ */ +/* $NetBSD: rumpvfs_if_priv.h,v 1.5 2010/05/20 15:58:09 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. - * from: NetBSD: rumpvfs.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp + * from: NetBSD: rumpvfs.ifspec,v 1.3 2010/05/20 15:46:47 pooka Exp * by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp */ @@ -31,6 +31,7 @@ int rump_vfs_sync(struct mount *, int, struct kauth_cred *); int rump_vfs_fhtovp(struct mount *, struct fid *, struct vnode **); int rump_vfs_vptofh(struct vnode *, struct fid *, size_t *); +int rump_vfs_extattrctl(struct mount *, int, struct vnode *, int, const char *); void rump_vfs_syncwait(struct mount *); int rump_vfs_getmp(const char *, struct mount **); void rump_rcvp_set(struct vnode *, struct vnode *);
CVS commit: src/sys/kern
Module Name:src Committed By: drochner Date: Thu May 20 17:10:42 UTC 2010 Modified Files: src/sys/kern: sys_sig.c Log Message: fix sigwaitinfo/sigtimedwait: -allow NULL "info" pointer -return signal number To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/kern/sys_sig.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/kern/sys_sig.c diff -u src/sys/kern/sys_sig.c:1.26 src/sys/kern/sys_sig.c:1.27 --- src/sys/kern/sys_sig.c:1.26 Tue Jan 19 22:28:31 2010 +++ src/sys/kern/sys_sig.c Thu May 20 17:10:42 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_sig.c,v 1.26 2010/01/19 22:28:31 pooka Exp $ */ +/* $NetBSD: sys_sig.c,v 1.27 2010/05/20 17:10:42 drochner Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_sig.c,v 1.26 2010/01/19 22:28:31 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_sig.c,v 1.27 2010/05/20 17:10:42 drochner Exp $"); #include #include @@ -742,9 +742,11 @@ * Copy only the used part of siginfo, the padding part is * left unchanged (userland is not supposed to touch it anyway). */ - if (error == 0) { + if (error == 0 && SCARG(uap, info)) { error = (*storeinf)(&ksi.ksi_info, SCARG(uap, info), sizeof(ksi.ksi_info)); } + if (error == 0) + *retval = ksi.ksi_info._signo; return error; }
CVS commit: src/sys/rump/fs/lib/libffs
Module Name:src Committed By: pooka Date: Thu May 20 18:23:59 UTC 2010 Modified Files: src/sys/rump/fs/lib/libffs: Makefile Log Message: include extattr support To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/rump/fs/lib/libffs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/fs/lib/libffs/Makefile diff -u src/sys/rump/fs/lib/libffs/Makefile:1.11 src/sys/rump/fs/lib/libffs/Makefile:1.12 --- src/sys/rump/fs/lib/libffs/Makefile:1.11 Tue Mar 2 11:29:04 2010 +++ src/sys/rump/fs/lib/libffs/Makefile Thu May 20 18:23:59 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2010/03/02 11:29:04 pooka Exp $ +# $NetBSD: Makefile,v 1.12 2010/05/20 18:23:59 pooka Exp $ # .PATH: ${.CURDIR}/../../../../ufs/ffs ${.CURDIR}/../../../../ufs/ufs @@ -9,10 +9,10 @@ ffs_snapshot.c ffs_subr.c ffs_tables.c ffs_vfsops.c ffs_vnops.c \ ffs_wapbl.c -SRCS+= ufs_bmap.c ufs_dirhash.c ufs_ihash.c ufs_inode.c ufs_lookup.c \ - ufs_vfsops.c ufs_vnops.c ufs_wapbl.c +SRCS+= ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_ihash.c ufs_inode.c \ + ufs_lookup.c ufs_vfsops.c ufs_vnops.c ufs_wapbl.c -CPPFLAGS+= -DFFS_EI -DUFS_DIRHASH -DWAPBL -DAPPLE_UFS +CPPFLAGS+= -DFFS_EI -DUFS_DIRHASH -DWAPBL -DAPPLE_UFS -DUFS_EXTATTR .include .include
CVS commit: [netbsd-5] src/sys/arch
Module Name:src Committed By: snj Date: Thu May 20 18:44:47 UTC 2010 Modified Files: src/sys/arch/i386/i386 [netbsd-5]: pmc.c src/sys/arch/x86/x86 [netbsd-5]: via_padlock.c Log Message: Apply patch (requested by sborrill in ticket #1404): Fix build of the i386 ALL kernel. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/i386/i386/pmc.c cvs rdiff -u -r1.9 -r1.9.14.1 src/sys/arch/x86/x86/via_padlock.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/arch/i386/i386/pmc.c diff -u src/sys/arch/i386/i386/pmc.c:1.17 src/sys/arch/i386/i386/pmc.c:1.17.8.1 --- src/sys/arch/i386/i386/pmc.c:1.17 Sun May 11 14:44:54 2008 +++ src/sys/arch/i386/i386/pmc.c Thu May 20 18:44:46 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmc.c,v 1.17 2008/05/11 14:44:54 ad Exp $ */ +/* $NetBSD: pmc.c,v 1.17.8.1 2010/05/20 18:44:46 snj Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.17 2008/05/11 14:44:54 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.17.8.1 2010/05/20 18:44:46 snj Exp $"); #include #include @@ -50,6 +50,7 @@ #include #include #include +#include static int pmc_initialized; static int pmc_ncounters; Index: src/sys/arch/x86/x86/via_padlock.c diff -u src/sys/arch/x86/x86/via_padlock.c:1.9 src/sys/arch/x86/x86/via_padlock.c:1.9.14.1 --- src/sys/arch/x86/x86/via_padlock.c:1.9 Wed Apr 16 16:06:52 2008 +++ src/sys/arch/x86/x86/via_padlock.c Thu May 20 18:44:47 2010 @@ -1,5 +1,5 @@ /* $OpenBSD: via.c,v 1.8 2006/11/17 07:47:56 tom Exp $ */ -/* $NetBSD: via_padlock.c,v 1.9 2008/04/16 16:06:52 cegger Exp $ */ +/* $NetBSD: via_padlock.c,v 1.9.14.1 2010/05/20 18:44:47 snj Exp $ */ /*- * Copyright (c) 2003 Jason Wright @@ -20,7 +20,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.9 2008/04/16 16:06:52 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.9.14.1 2010/05/20 18:44:47 snj Exp $"); #include "opt_viapadlock.h" @@ -36,6 +36,7 @@ #include #include +#include #include #include
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Thu May 20 18:46:36 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1404. To generate a diff of this commit: cvs rdiff -u -r1.1.2.230 -r1.1.2.231 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.230 src/doc/CHANGES-5.1:1.1.2.231 --- src/doc/CHANGES-5.1:1.1.2.230 Thu May 20 06:06:48 2010 +++ src/doc/CHANGES-5.1 Thu May 20 18:46:36 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.230 2010/05/20 06:06:48 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.231 2010/05/20 18:46:36 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -17298,6 +17298,12 @@ entered with what look like valid registers. [riz, ticket #1401] +sys/arch/i386/i386/pmc.c patch +sys/arch/x86/x86/via_padlock.c patch + + Fix build of the i386 ALL kernel. + [sborrill, ticket #1404] + gnu/usr.bin/groff/tmac/mdoc.local patch sys/sys/param.h patch
CVS commit: src/sys/arch/sandpoint
Module Name:src Committed By: phx Date: Thu May 20 19:27:26 UTC 2010 Modified Files: src/sys/arch/sandpoint/include: bootinfo.h src/sys/arch/sandpoint/sandpoint: machdep.c src/sys/arch/sandpoint/stand/netboot: main.c Log Message: Netboot generates a BTINFO_PRODFAMILY boot-info which specifies the family name of the board. The kernel uses this information to make a new sysctl entry called machdep.prodfamily. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sandpoint/include/bootinfo.h cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sandpoint/sandpoint/machdep.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sandpoint/stand/netboot/main.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/arch/sandpoint/include/bootinfo.h diff -u src/sys/arch/sandpoint/include/bootinfo.h:1.6 src/sys/arch/sandpoint/include/bootinfo.h:1.7 --- src/sys/arch/sandpoint/include/bootinfo.h:1.6 Tue May 18 15:07:50 2010 +++ src/sys/arch/sandpoint/include/bootinfo.h Thu May 20 19:27:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bootinfo.h,v 1.6 2010/05/18 15:07:50 phx Exp $ */ +/* $NetBSD: bootinfo.h,v 1.7 2010/05/20 19:27:25 phx Exp $ */ /* * Copyright (c) 1997 @@ -43,6 +43,7 @@ #define BTINFO_BOOTPATH 5 #define BTINFO_ROOTDEVICE 6 #define BTINFO_NET 7 +#define BTINFO_PRODFAMILY 8 struct btinfo_magic { struct btinfo_common common; @@ -84,6 +85,11 @@ uint8_t mac_address[6]; }; +struct btinfo_prodfamily { + struct btinfo_common common; + char name[24]; +}; + #define BOOTINFO_MAXSIZE 4096 #ifdef _KERNEL Index: src/sys/arch/sandpoint/sandpoint/machdep.c diff -u src/sys/arch/sandpoint/sandpoint/machdep.c:1.49 src/sys/arch/sandpoint/sandpoint/machdep.c:1.50 --- src/sys/arch/sandpoint/sandpoint/machdep.c:1.49 Fri Nov 27 03:23:13 2009 +++ src/sys/arch/sandpoint/sandpoint/machdep.c Thu May 20 19:27:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.49 2009/11/27 03:23:13 rmind Exp $ */ +/* $NetBSD: machdep.c,v 1.50 2010/05/20 19:27:25 phx Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2009/11/27 03:23:13 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2010/05/20 19:27:25 phx Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -585,3 +585,22 @@ kcomcnpollc(dev_t dev, int on) { } + +SYSCTL_SETUP(sysctl_machdep_prodfamily, "sysctl machdep prodfamily") +{ + const struct sysctlnode *mnode, *node; + struct btinfo_prodfamily *pfam; + + pfam = lookup_bootinfo(BTINFO_PRODFAMILY); + if (pfam != NULL) { + sysctl_createv(NULL, 0, NULL, &mnode, + CTLFLAG_PERMANENT, CTLTYPE_NODE, "machdep", NULL, + NULL, 0, NULL, 0, CTL_MACHDEP, CTL_EOL); + + sysctl_createv(NULL, 0, &mnode, &node, + CTLFLAG_PERMANENT, CTLTYPE_STRING, "prodfamily", + SYSCTL_DESCR("Board family name."), + NULL, 0, pfam->name, 0, + CTL_CREATE, CTL_EOL); + } +} Index: src/sys/arch/sandpoint/stand/netboot/main.c diff -u src/sys/arch/sandpoint/stand/netboot/main.c:1.31 src/sys/arch/sandpoint/stand/netboot/main.c:1.32 --- src/sys/arch/sandpoint/stand/netboot/main.c:1.31 Wed May 19 15:05:58 2010 +++ src/sys/arch/sandpoint/stand/netboot/main.c Thu May 20 19:27:26 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.31 2010/05/19 15:05:58 phx Exp $ */ +/* $NetBSD: main.c,v 1.32 2010/05/20 19:27:26 phx Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -57,6 +57,23 @@ { "debug", AB_DEBUG } }; +static const struct prodfamily { + int id; + const char *family; + const char *verbose; +} prodfamilies[] = { + { BRD_SANDPOINTX2, "sandpointx2", "Sandpoint X2" }, + { BRD_SANDPOINTX3, "sandpointx3", "Sandpoint X3" }, + { BRD_ENCOREPP1, "encorepp1", "EnCore PP1"}, + { BRD_KUROBOX, "kurobox", "KuroBox"}, + { BRD_QNAPTS101, "qnap", "QNAP TS-101"}, + { BRD_SYNOLOGY, "synology", "Synology DS"}, + { BRD_STORCENTER, "iomega", "IOMEGA Storcenter"}, + { BRD_UNKNOWN, "unknown", "Unknown board" } +}; + +static const struct prodfamily *get_prodfamily(void); + void *bootinfo; /* low memory reserved to pass bootinfo structures */ int bi_size; /* BOOTINFO_MAXSIZE */ char *bi_next; @@ -87,6 +104,8 @@ struct btinfo_bootpath bi_path; struct btinfo_rootdevice bi_rdev; struct btinfo_net bi_net; + struct btinfo_prodfamily bi_fam; + const struct prodfamily *pfam; unsigned long marks[MARK_MAX]; unsigned lata[1][2], lnif[1][2]; unsigned memsize, tag; @@ -98,23 +117,9 @@ printf("\n"); printf(">> NetBSD/sandpoint Boot, Revision %s\n", bootprog_rev); printf(">> (%s, %s)\n", bootprog_maker, bootprog_date); - switch (brdtype) { - case BRD_SANDPOINTX3: - printf("Sandpoint X3"); break; - case BRD_ENCOREPP1: - printf("Encore PP1"); break; - case BRD_QNAPTS101: - printf("QNAP TS-101"); break; - case BRD_KUROBOX: - printf("Kuro Box"); break; - case BRD_SYNOLOGY: - printf("Synolog
CVS commit: xsrc/external/mit/xf86-video-igs/dist/src
Module Name:xsrc Committed By: macallan Date: Thu May 20 19:45:21 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-igs/dist/src: igs_accel.c Log Message: add a PrepareAccess method to make sure the drawing engine is idle before trying to scribble into video memory This should not be necessary but for some reason we need it here. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.3 xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.4 --- xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.3 Thu May 20 07:55:20 2010 +++ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c Thu May 20 19:45:21 2010 @@ -21,7 +21,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $NetBSD: igs_accel.c,v 1.3 2010/05/20 07:55:20 macallan Exp $ */ +/* $NetBSD: igs_accel.c,v 1.4 2010/05/20 19:45:21 macallan Exp $ */ #include @@ -308,6 +308,23 @@ return TRUE; } +#ifdef __arm__ +static Bool +IgsPrepareAccess(PixmapPtr pPix, int index) +{ + ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; + IgsPtr fPtr = IGSPTR(pScrn); + + IgsWaitReady(fPtr); + return TRUE; +} + +static void +IgsFinishAccess(PixmapPtr pPix, int index) +{ +} +#endif + Bool IgsInitAccel(ScreenPtr pScreen) { @@ -368,6 +385,9 @@ */ pExa->UploadToScreen = IgsUploadToScreen; pExa->DownloadFromScreen = IgsDownloadFromScreen; - +#ifdef __arm__ + pExa->PrepareAccess = IgsPrepareAccess; + pExa->FinishAccess = IgsFinishAccess; +#endif return exaDriverInit(pScreen, pExa); }
CVS commit: xsrc/external/mit/xf86-video-igs/dist/src
Module Name:xsrc Committed By: macallan Date: Thu May 20 20:05:34 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-igs/dist/src: igs_accel.c Log Message: sprinkle some more volatile To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.4 xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.5 --- xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.4 Thu May 20 19:45:21 2010 +++ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c Thu May 20 20:05:34 2010 @@ -21,7 +21,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $NetBSD: igs_accel.c,v 1.4 2010/05/20 19:45:21 macallan Exp $ */ +/* $NetBSD: igs_accel.c,v 1.5 2010/05/20 20:05:34 macallan Exp $ */ #include @@ -45,12 +45,12 @@ static inline void IgsWrite2(IgsPtr fPtr, int offset, uint16_t val) { - *(uint16_t *)(fPtr->reg + offset) = val; + *(volatile uint16_t *)(fPtr->reg + offset) = val; } static inline void IgsWrite4(IgsPtr fPtr, int offset, uint32_t val) { - *(uint32_t *)(fPtr->reg + offset) = val; + *(volatile uint32_t *)(fPtr->reg + offset) = val; } static inline uint8_t IgsRead1(IgsPtr fPtr, int offset) @@ -60,7 +60,7 @@ static inline uint16_t IgsRead2(IgsPtr fPtr, int offset) { - return *(uint16_t *)(fPtr->reg + offset); + return *(volatile uint16_t *)(fPtr->reg + offset); } static void
CVS commit: src/sys/arch/sandpoint/stand/netboot
Module Name:src Committed By: phx Date: Thu May 20 20:18:51 UTC 2010 Modified Files: src/sys/arch/sandpoint/stand/netboot: brdsetup.c globals.h main.c version Log Message: brdsetup() cleanup by Toru Nishimura. Put all board-relevant data into a structure. A few modifications by myself to use the new structure for generating the BTINFO_PRODFAMILY boot node. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/stand/netboot/brdsetup.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sandpoint/stand/netboot/globals.h cvs rdiff -u -r1.32 -r1.33 src/sys/arch/sandpoint/stand/netboot/main.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/stand/netboot/version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sandpoint/stand/netboot/brdsetup.c diff -u src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.18 src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.19 --- src/sys/arch/sandpoint/stand/netboot/brdsetup.c:1.18 Wed May 19 15:04:51 2010 +++ src/sys/arch/sandpoint/stand/netboot/brdsetup.c Thu May 20 20:18:51 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: brdsetup.c,v 1.18 2010/05/19 15:04:51 phx Exp $ */ +/* $NetBSD: brdsetup.c,v 1.19 2010/05/20 20:18:51 phx Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -39,16 +39,82 @@ #include "globals.h" -const unsigned dcache_line_size = 32; /* 32B linesize */ -const unsigned dcache_range_size = 4 * 1024; /* 16KB / 4-way */ +#define BRD_DECL(xxx) \ +void xxx ## setup(struct brdprop *); \ +void xxx ## brdfix(struct brdprop *); \ +void xxx ## pcifix(struct brdprop *); \ +void xxx ## reset(void) + +BRD_DECL(enc); +BRD_DECL(mot); +BRD_DECL(kuro); +BRD_DECL(syno); + +static struct brdprop brdlist[] = { +{ + "sandpoint", + "Sandpoint X3", + BRD_SANDPOINTX3, + 0, + "com", 0x3f8, 115200, + motsetup, NULL, motpcifix }, +{ + "encpp1", + "EnCore PP1", + BRD_ENCOREPP1, + 0, + "com", 0x3f8, 115200, + encsetup, NULL, encpcifix }, +{ + "kurobox", + "KuroBox", + BRD_KUROBOX, + 32768000, + "eumb", 0x4600, 57600, + kurosetup, kurobrdfix, kuropcifix }, +{ + "synology", + "Synology DS", + BRD_SYNOLOGY, + 33164691, /* from Synology/Linux source */ + /* 33168000, XXX better precision? */ + "eumb", 0x4500, 115200, + synosetup, synobrdfix, synopcifix, synoreset }, +{ + "qnap", + "QNAP TS-101", + BRD_QNAPTS101, + 0, + "eumb", 0x4500, 115200, + NULL, NULL, NULL }, +{ + "iomega", + "IOMEGA Storcenter", + BRD_STORCENTER, + 0, + "eumb", 0x4500, 115200, + NULL, NULL, NULL }, +{ + "unknown", + "Unknown board", + BRD_UNKNOWN, + 0, + "eumb", 0x4500, 115200, + NULL, NULL, NULL }, /* must be the last */ +}; +static struct brdprop *brdprop; static uint32_t ns_per_tick; -void brdsetup(void); -void setup_82C686B(void); -void setup_83C553F(void); - +static void brdfixup(void); +static void setup(void); +static inline uint32_t cputype(void); static inline u_quad_t mftb(void); +static void init_uart(unsigned, unsigned, uint8_t); +static void send_sat(char *); + +const unsigned dcache_line_size = 32; /* 32B linesize */ +const unsigned dcache_range_size = 4 * 1024; /* 16KB / 4-way */ unsigned uart1base; /* console */ unsigned uart2base; /* optional satellite processor */ @@ -71,42 +137,7 @@ #define UART_READ(base, r) *(volatile char *)(base + (r)) #define UART_WRITE(base, r, v) *(volatile char *)(base + (r)) = (v) -static __inline uint32_t -cputype(void) -{ - uint32_t pvr; - - __asm volatile ("mfpvr %0" : "=r"(pvr)); - return pvr >> 16; -} - -static void -init_uart(unsigned base, unsigned speed, uint8_t lcr) -{ - unsigned div; - - div = busclock / speed / 16; - UART_WRITE(base, LCR, 0x80); /* turn on DLAB bit */ - UART_WRITE(base, FCR, 0x00); - UART_WRITE(base, DMB, div >> 8); /* set speed */ - UART_WRITE(base, DLB, div & 0xff); - UART_WRITE(base, LCR, lcr); - UART_WRITE(base, FCR, 0x07); /* FIFO on, TXRX FIFO reset */ - UART_WRITE(base, IER, 0x00); /* make sure INT disabled */ -} - -/* talk to satellite processor */ -static void -send_sat(char *msg) -{ - unsigned savedbase; - - savedbase = uart1base; - uart1base = uart2base; - while (*msg) - putchar(*msg++); - uart1base = savedbase; -} +void brdsetup(void); void brdsetup(void) @@ -143,50 +174,32 @@ if (pcifinddev(0x10ad, 0x0565, &pcib) == 0) { brdtype = BRD_SANDPOINTX3; - setup_83C553F(); } else if (pcifinddev(0x1106, 0x0686, &pcib) == 0) { brdtype = BRD_ENCOREPP1; - setup_82C686B(); } else if ((pcicfgread(pcimaketag(0, 11, 0), PCI_CLASS_REG) >> 16) == PCI_CLASS_ETH) { /* tlp (ADMtek AN985) or re (RealTek 8169S) at dev 11 */ brdtype = BRD_KUROBOX; - consname = "eumb"; - consport = 0x4600; - consspeed = 57600; - if (PCI_VENDOR(pcicfgread(pcimaketag(0, 11, 0), PCI_ID_REG)) - == 0x10ec) - extclk = 32768000; /* decr 2457600Hz */ - else - extclk = 32521333; /* decr 2439100Hz *
CVS commit: xsrc/external/mit/imake/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:35:42 UTC 2010 Update of /cvsroot/xsrc/external/mit/imake/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4450 Log Message: initial import of imake-1.0.3 Status: Vendor Tag: xorg Release Tags: imake-1-0-3 U xsrc/external/mit/imake/dist/mkdirhier.man U xsrc/external/mit/imake/dist/xmkmf.cpp U xsrc/external/mit/imake/dist/imake.man U xsrc/external/mit/imake/dist/mergelib.man U xsrc/external/mit/imake/dist/revpath.c U xsrc/external/mit/imake/dist/mkhtmlindex.pl U xsrc/external/mit/imake/dist/depcomp U xsrc/external/mit/imake/dist/missing U xsrc/external/mit/imake/dist/cleanlinks.man U xsrc/external/mit/imake/dist/revpath.man U xsrc/external/mit/imake/dist/aclocal.m4 U xsrc/external/mit/imake/dist/mdepend.cpp U xsrc/external/mit/imake/dist/makeg.man U xsrc/external/mit/imake/dist/COPYING U xsrc/external/mit/imake/dist/mkhtmlindex.man U xsrc/external/mit/imake/dist/install-sh U xsrc/external/mit/imake/dist/README U xsrc/external/mit/imake/dist/imake.c U xsrc/external/mit/imake/dist/configure.ac U xsrc/external/mit/imake/dist/config.h.in U xsrc/external/mit/imake/dist/mergelib.cpp U xsrc/external/mit/imake/dist/config.guess U xsrc/external/mit/imake/dist/mkdirhier U xsrc/external/mit/imake/dist/Makefile.am U xsrc/external/mit/imake/dist/xmkmf.man U xsrc/external/mit/imake/dist/makeg U xsrc/external/mit/imake/dist/mkhtmlindex.sh U xsrc/external/mit/imake/dist/Makefile.in U xsrc/external/mit/imake/dist/imakemdep.h U xsrc/external/mit/imake/dist/cleanlinks U xsrc/external/mit/imake/dist/ChangeLog U xsrc/external/mit/imake/dist/ccmakedep.man N xsrc/external/mit/imake/dist/INSTALL U xsrc/external/mit/imake/dist/config.sub U xsrc/external/mit/imake/dist/configure No conflicts created by this import
CVS commit: xsrc/external/mit/listres/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:35:52 UTC 2010 Update of /cvsroot/xsrc/external/mit/listres/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23924 Log Message: initial import of listres-1.0.2 Status: Vendor Tag: xorg Release Tags: listres-1-0-2 U xsrc/external/mit/listres/dist/config.sub U xsrc/external/mit/listres/dist/depcomp U xsrc/external/mit/listres/dist/Makefile.in U xsrc/external/mit/listres/dist/missing U xsrc/external/mit/listres/dist/configure.ac U xsrc/external/mit/listres/dist/ChangeLog U xsrc/external/mit/listres/dist/Makefile.am U xsrc/external/mit/listres/dist/COPYING U xsrc/external/mit/listres/dist/listres.man U xsrc/external/mit/listres/dist/configure U xsrc/external/mit/listres/dist/README U xsrc/external/mit/listres/dist/install-sh U xsrc/external/mit/listres/dist/config.h.in U xsrc/external/mit/listres/dist/aclocal.m4 U xsrc/external/mit/listres/dist/listres.c U xsrc/external/mit/listres/dist/config.guess U xsrc/external/mit/listres/dist/INSTALL No conflicts created by this import
CVS commit: xsrc/external/mit/luit/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:36:02 UTC 2010 Update of /cvsroot/xsrc/external/mit/luit/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15532 Log Message: initial import of luit-1.0.5 Status: Vendor Tag: xorg Release Tags: luit-1-0-5 U xsrc/external/mit/luit/dist/config.guess U xsrc/external/mit/luit/dist/missing U xsrc/external/mit/luit/dist/luit.h U xsrc/external/mit/luit/dist/other.c U xsrc/external/mit/luit/dist/iso2022.c U xsrc/external/mit/luit/dist/parser.h U xsrc/external/mit/luit/dist/COPYING U xsrc/external/mit/luit/dist/aclocal.m4 U xsrc/external/mit/luit/dist/config.h.in U xsrc/external/mit/luit/dist/charset.h U xsrc/external/mit/luit/dist/sys.h U xsrc/external/mit/luit/dist/depcomp U xsrc/external/mit/luit/dist/Makefile.in U xsrc/external/mit/luit/dist/sys.c U xsrc/external/mit/luit/dist/luit.man U xsrc/external/mit/luit/dist/config.sub U xsrc/external/mit/luit/dist/other.h U xsrc/external/mit/luit/dist/locale.c U xsrc/external/mit/luit/dist/luit.c U xsrc/external/mit/luit/dist/README U xsrc/external/mit/luit/dist/ChangeLog U xsrc/external/mit/luit/dist/Makefile.am U xsrc/external/mit/luit/dist/parser.c U xsrc/external/mit/luit/dist/iso2022.h U xsrc/external/mit/luit/dist/install-sh U xsrc/external/mit/luit/dist/charset.c U xsrc/external/mit/luit/dist/INSTALL U xsrc/external/mit/luit/dist/configure U xsrc/external/mit/luit/dist/configure.ac No conflicts created by this import
CVS commit: xsrc/external/mit/viewres/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:36:12 UTC 2010 Update of /cvsroot/xsrc/external/mit/viewres/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11988 Log Message: initial import of viewres-1.0.2 Status: Vendor Tag: xorg Release Tags: viewres-1-0-2 U xsrc/external/mit/viewres/dist/viewres.c U xsrc/external/mit/viewres/dist/README U xsrc/external/mit/viewres/dist/config.guess U xsrc/external/mit/viewres/dist/config.h.in U xsrc/external/mit/viewres/dist/INSTALL U xsrc/external/mit/viewres/dist/viewres.man U xsrc/external/mit/viewres/dist/config.sub U xsrc/external/mit/viewres/dist/configure U xsrc/external/mit/viewres/dist/missing U xsrc/external/mit/viewres/dist/Makefile.am U xsrc/external/mit/viewres/dist/depcomp U xsrc/external/mit/viewres/dist/ChangeLog U xsrc/external/mit/viewres/dist/configure.ac U xsrc/external/mit/viewres/dist/install-sh U xsrc/external/mit/viewres/dist/COPYING U xsrc/external/mit/viewres/dist/aclocal.m4 U xsrc/external/mit/viewres/dist/Makefile.in N xsrc/external/mit/viewres/dist/app-defaults/Viewres-color N xsrc/external/mit/viewres/dist/app-defaults/Viewres No conflicts created by this import
CVS commit: xsrc/external/mit/xbiff/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:36:22 UTC 2010 Update of /cvsroot/xsrc/external/mit/xbiff/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29069 Log Message: initial import of xbiff-1.0.2 Status: Vendor Tag: xorg Release Tags: xbiff-1-0-2 U xsrc/external/mit/xbiff/dist/config.guess U xsrc/external/mit/xbiff/dist/INSTALL U xsrc/external/mit/xbiff/dist/xbiff.c U xsrc/external/mit/xbiff/dist/MailboxP.h U xsrc/external/mit/xbiff/dist/config.sub U xsrc/external/mit/xbiff/dist/README U xsrc/external/mit/xbiff/dist/xbiff.man U xsrc/external/mit/xbiff/dist/config.h.in U xsrc/external/mit/xbiff/dist/Mailbox.h U xsrc/external/mit/xbiff/dist/Makefile.am U xsrc/external/mit/xbiff/dist/COPYING U xsrc/external/mit/xbiff/dist/configure.ac U xsrc/external/mit/xbiff/dist/Makefile.in U xsrc/external/mit/xbiff/dist/depcomp U xsrc/external/mit/xbiff/dist/Mailbox.c U xsrc/external/mit/xbiff/dist/missing U xsrc/external/mit/xbiff/dist/ChangeLog U xsrc/external/mit/xbiff/dist/aclocal.m4 U xsrc/external/mit/xbiff/dist/configure U xsrc/external/mit/xbiff/dist/install-sh U xsrc/external/mit/xbiff/dist/bitmaps/mail-down-mask U xsrc/external/mit/xbiff/dist/bitmaps/mail-up-mask U xsrc/external/mit/xbiff/dist/bitmaps/mail-down U xsrc/external/mit/xbiff/dist/bitmaps/mail-up No conflicts created by this import
CVS commit: xsrc/external/mit/xcalc/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:36:32 UTC 2010 Update of /cvsroot/xsrc/external/mit/xcalc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28996 Log Message: initial import of xcalc-1.0.3 Status: Vendor Tag: xorg Release Tags: xcalc-1-0-3 U xsrc/external/mit/xcalc/dist/xcalc.man U xsrc/external/mit/xcalc/dist/xcalc.c U xsrc/external/mit/xcalc/dist/config.guess U xsrc/external/mit/xcalc/dist/INSTALL U xsrc/external/mit/xcalc/dist/README U xsrc/external/mit/xcalc/dist/math.c U xsrc/external/mit/xcalc/dist/aclocal.m4 U xsrc/external/mit/xcalc/dist/install-sh U xsrc/external/mit/xcalc/dist/config.h.in U xsrc/external/mit/xcalc/dist/autogen.sh U xsrc/external/mit/xcalc/dist/actions.c U xsrc/external/mit/xcalc/dist/Makefile.am U xsrc/external/mit/xcalc/dist/configure U xsrc/external/mit/xcalc/dist/COPYING U xsrc/external/mit/xcalc/dist/ChangeLog U xsrc/external/mit/xcalc/dist/Makefile.in U xsrc/external/mit/xcalc/dist/xcalc.h U xsrc/external/mit/xcalc/dist/config.sub U xsrc/external/mit/xcalc/dist/depcomp U xsrc/external/mit/xcalc/dist/missing U xsrc/external/mit/xcalc/dist/configure.ac N xsrc/external/mit/xcalc/dist/app-defaults/XCalc-color N xsrc/external/mit/xcalc/dist/app-defaults/XCalc No conflicts created by this import
CVS commit: xsrc/external/mit/xdm/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:36:47 UTC 2010 Update of /cvsroot/xsrc/external/mit/xdm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9757 Log Message: initial import of xdm-1.1.10 Status: Vendor Tag: xorg Release Tags: xdm-1-1-10 U xsrc/external/mit/xdm/dist/configure.ac U xsrc/external/mit/xdm/dist/README U xsrc/external/mit/xdm/dist/aclocal.m4 U xsrc/external/mit/xdm/dist/Makefile.am U xsrc/external/mit/xdm/dist/Makefile.in U xsrc/external/mit/xdm/dist/config.h.in U xsrc/external/mit/xdm/dist/configure U xsrc/external/mit/xdm/dist/cpprules.in U xsrc/external/mit/xdm/dist/AUTHORS U xsrc/external/mit/xdm/dist/COPYING U xsrc/external/mit/xdm/dist/ChangeLog U xsrc/external/mit/xdm/dist/INSTALL U xsrc/external/mit/xdm/dist/compile U xsrc/external/mit/xdm/dist/config.guess U xsrc/external/mit/xdm/dist/config.sub U xsrc/external/mit/xdm/dist/depcomp U xsrc/external/mit/xdm/dist/install-sh U xsrc/external/mit/xdm/dist/ltmain.sh U xsrc/external/mit/xdm/dist/missing U xsrc/external/mit/xdm/dist/chooser.c U xsrc/external/mit/xdm/dist/auth.c U xsrc/external/mit/xdm/dist/daemon.c U xsrc/external/mit/xdm/dist/server.c U xsrc/external/mit/xdm/dist/dpylist.c U xsrc/external/mit/xdm/dist/dm.c U xsrc/external/mit/xdm/dist/error.c U xsrc/external/mit/xdm/dist/file.c U xsrc/external/mit/xdm/dist/netaddr.c U xsrc/external/mit/xdm/dist/reset.c U xsrc/external/mit/xdm/dist/resource.c U xsrc/external/mit/xdm/dist/protodpy.c U xsrc/external/mit/xdm/dist/policy.c U xsrc/external/mit/xdm/dist/session.c U xsrc/external/mit/xdm/dist/socket.c U xsrc/external/mit/xdm/dist/streams.c U xsrc/external/mit/xdm/dist/util.c U xsrc/external/mit/xdm/dist/xdmcp.c U xsrc/external/mit/xdm/dist/mitauth.c U xsrc/external/mit/xdm/dist/genauth.c U xsrc/external/mit/xdm/dist/access.c U xsrc/external/mit/xdm/dist/choose.c U xsrc/external/mit/xdm/dist/dm_auth.h U xsrc/external/mit/xdm/dist/dm_error.h U xsrc/external/mit/xdm/dist/dm.h U xsrc/external/mit/xdm/dist/dm_socket.h U xsrc/external/mit/xdm/dist/greet.h U xsrc/external/mit/xdm/dist/xdmauth.c U xsrc/external/mit/xdm/dist/prngc.c U xsrc/external/mit/xdm/dist/rpcauth.c U xsrc/external/mit/xdm/dist/krb5auth.c U xsrc/external/mit/xdm/dist/xdmshell.c U xsrc/external/mit/xdm/dist/xdm.man.cpp U xsrc/external/mit/xdm/dist/app-defaults/Chooser.ad U xsrc/external/mit/xdm/dist/greeter/Makefile.am C xsrc/external/mit/xdm/dist/greeter/greet.c U xsrc/external/mit/xdm/dist/greeter/Login.c U xsrc/external/mit/xdm/dist/greeter/Login.h U xsrc/external/mit/xdm/dist/greeter/LoginP.h U xsrc/external/mit/xdm/dist/greeter/verify.c U xsrc/external/mit/xdm/dist/greeter/Makefile.in N xsrc/external/mit/xdm/dist/m4/ac_define_dir.m4 N xsrc/external/mit/xdm/dist/m4/libtool.m4 N xsrc/external/mit/xdm/dist/m4/ltoptions.m4 N xsrc/external/mit/xdm/dist/m4/ltsugar.m4 N xsrc/external/mit/xdm/dist/m4/ltversion.m4 N xsrc/external/mit/xdm/dist/m4/lt~obsolete.m4 U xsrc/external/mit/xdm/dist/config/xorg-bw.xpm U xsrc/external/mit/xdm/dist/config/README U xsrc/external/mit/xdm/dist/config/GiveConsole U xsrc/external/mit/xdm/dist/config/xorg.xpm U xsrc/external/mit/xdm/dist/config/Xaccess U xsrc/external/mit/xdm/dist/config/Xservers.ws.cpp U xsrc/external/mit/xdm/dist/config/TakeConsole U xsrc/external/mit/xdm/dist/config/Xsetup_0 U xsrc/external/mit/xdm/dist/config/Xwilling U xsrc/external/mit/xdm/dist/config/Makefile.am U xsrc/external/mit/xdm/dist/config/Makefile.in U xsrc/external/mit/xdm/dist/config/xdm-config.cpp U xsrc/external/mit/xdm/dist/config/Xservers.fs U xsrc/external/mit/xdm/dist/config/Xresources.cpp U xsrc/external/mit/xdm/dist/config/Xreset.cpp U xsrc/external/mit/xdm/dist/config/Xsession.cpp C xsrc/external/mit/xdm/dist/config/Xstartup.cpp 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xdm/dist
CVS commit: xsrc/external/mit/xgc/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:37:00 UTC 2010 Update of /cvsroot/xsrc/external/mit/xgc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10954 Log Message: initial import of xgc-1.0.2 Status: Vendor Tag: xorg Release Tags: xgc-1-0-2 U xsrc/external/mit/xgc/dist/configure U xsrc/external/mit/xgc/dist/xgc.h U xsrc/external/mit/xgc/dist/choice.c U xsrc/external/mit/xgc/dist/tests.c U xsrc/external/mit/xgc/dist/NEWS U xsrc/external/mit/xgc/dist/getfile.c U xsrc/external/mit/xgc/dist/COPYING U xsrc/external/mit/xgc/dist/AUTHORS U xsrc/external/mit/xgc/dist/Makefile.am U xsrc/external/mit/xgc/dist/config.guess U xsrc/external/mit/xgc/dist/ChangeLog U xsrc/external/mit/xgc/dist/gram.c U xsrc/external/mit/xgc/dist/lex.c U xsrc/external/mit/xgc/dist/tile U xsrc/external/mit/xgc/dist/main.c U xsrc/external/mit/xgc/dist/gram.y U xsrc/external/mit/xgc/dist/aclocal.m4 U xsrc/external/mit/xgc/dist/record.c U xsrc/external/mit/xgc/dist/text.c U xsrc/external/mit/xgc/dist/install-sh U xsrc/external/mit/xgc/dist/missing U xsrc/external/mit/xgc/dist/depcomp U xsrc/external/mit/xgc/dist/README U xsrc/external/mit/xgc/dist/constants.h U xsrc/external/mit/xgc/dist/Makefile.in U xsrc/external/mit/xgc/dist/planemask.c U xsrc/external/mit/xgc/dist/gram.h U xsrc/external/mit/xgc/dist/testfrac.c N xsrc/external/mit/xgc/dist/ylwrap U xsrc/external/mit/xgc/dist/INSTALL U xsrc/external/mit/xgc/dist/dashlist.c U xsrc/external/mit/xgc/dist/interpret.c U xsrc/external/mit/xgc/dist/config.h.in U xsrc/external/mit/xgc/dist/configure.ac U xsrc/external/mit/xgc/dist/config.sub U xsrc/external/mit/xgc/dist/lex.l U xsrc/external/mit/xgc/dist/Bugs U xsrc/external/mit/xgc/dist/xgc.man U xsrc/external/mit/xgc/dist/Written/Interface U xsrc/external/mit/xgc/dist/Written/Notes2 U xsrc/external/mit/xgc/dist/Written/FilledRects U xsrc/external/mit/xgc/dist/Written/Outline U xsrc/external/mit/xgc/dist/Written/Notes U xsrc/external/mit/xgc/dist/Written/Jim U xsrc/external/mit/xgc/dist/Written/Widget N xsrc/external/mit/xgc/dist/app-defaults/Xgc-color N xsrc/external/mit/xgc/dist/app-defaults/Xgc No conflicts created by this import
CVS commit: xsrc/external/mit/xkbprint/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:37:09 UTC 2010 Update of /cvsroot/xsrc/external/mit/xkbprint/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5061 Log Message: initial import of xkbprint-1.0.2 Status: Vendor Tag: xorg Release Tags: xkbprint-1-0-2 U xsrc/external/mit/xkbprint/dist/config.h.in U xsrc/external/mit/xkbprint/dist/README U xsrc/external/mit/xkbprint/dist/INSTALL U xsrc/external/mit/xkbprint/dist/configure.ac U xsrc/external/mit/xkbprint/dist/xkbprint.c U xsrc/external/mit/xkbprint/dist/utils.c U xsrc/external/mit/xkbprint/dist/config.sub U xsrc/external/mit/xkbprint/dist/Makefile.in U xsrc/external/mit/xkbprint/dist/NEWS U xsrc/external/mit/xkbprint/dist/AUTHORS U xsrc/external/mit/xkbprint/dist/COPYING U xsrc/external/mit/xkbprint/dist/config.guess U xsrc/external/mit/xkbprint/dist/isokeys.h U xsrc/external/mit/xkbprint/dist/install-sh U xsrc/external/mit/xkbprint/dist/xkbprint.man U xsrc/external/mit/xkbprint/dist/aclocal.m4 U xsrc/external/mit/xkbprint/dist/missing U xsrc/external/mit/xkbprint/dist/depcomp U xsrc/external/mit/xkbprint/dist/Makefile.am U xsrc/external/mit/xkbprint/dist/ChangeLog U xsrc/external/mit/xkbprint/dist/configure U xsrc/external/mit/xkbprint/dist/xkbprint.h U xsrc/external/mit/xkbprint/dist/utils.h U xsrc/external/mit/xkbprint/dist/psgeom.c No conflicts created by this import
CVS commit: xsrc/external/mit/xlogo/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:37:16 UTC 2010 Update of /cvsroot/xsrc/external/mit/xlogo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24638 Log Message: initial import of xlogo-1.0.2 Status: Vendor Tag: xorg Release Tags: xlogo-1-0-2 U xsrc/external/mit/xlogo/dist/ChangeLog U xsrc/external/mit/xlogo/dist/config.h.in U xsrc/external/mit/xlogo/dist/config.guess U xsrc/external/mit/xlogo/dist/INSTALL U xsrc/external/mit/xlogo/dist/config.sub U xsrc/external/mit/xlogo/dist/configure U xsrc/external/mit/xlogo/dist/xlogo.h U xsrc/external/mit/xlogo/dist/RenderLogo.h U xsrc/external/mit/xlogo/dist/Logo.h U xsrc/external/mit/xlogo/dist/COPYING U xsrc/external/mit/xlogo/dist/install-sh U xsrc/external/mit/xlogo/dist/aclocal.m4 U xsrc/external/mit/xlogo/dist/Makefile.in U xsrc/external/mit/xlogo/dist/LogoP.h U xsrc/external/mit/xlogo/dist/Logo.c U xsrc/external/mit/xlogo/dist/README U xsrc/external/mit/xlogo/dist/Makefile.am U xsrc/external/mit/xlogo/dist/configure.ac U xsrc/external/mit/xlogo/dist/xlogo.c U xsrc/external/mit/xlogo/dist/RenderLogo.c U xsrc/external/mit/xlogo/dist/depcomp U xsrc/external/mit/xlogo/dist/missing U xsrc/external/mit/xlogo/dist/xlogo.man N xsrc/external/mit/xlogo/dist/app-defaults/XLogo-color N xsrc/external/mit/xlogo/dist/app-defaults/XLogo No conflicts created by this import
CVS commit: xsrc/external/mit/imake/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:48:54 UTC 2010 Removed Files: xsrc/external/mit/imake/dist: compile Log Message: merge imake-1.0.3. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/imake/dist/compile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/listres/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:50:48 UTC 2010 Removed Files: xsrc/external/mit/listres/dist: AUTHORS NEWS compile mkinstalldirs Log Message: merge listres-1.0.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/listres/dist/AUTHORS \ xsrc/external/mit/listres/dist/NEWS \ xsrc/external/mit/listres/dist/compile \ xsrc/external/mit/listres/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/viewres/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:51:48 UTC 2010 Removed Files: xsrc/external/mit/viewres/dist: AUTHORS NEWS Viewres.ad compile mkinstalldirs Log Message: merge viewres-1.0.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/viewres/dist/AUTHORS \ xsrc/external/mit/viewres/dist/NEWS \ xsrc/external/mit/viewres/dist/Viewres.ad \ xsrc/external/mit/viewres/dist/compile \ xsrc/external/mit/viewres/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xlogo/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:52:25 UTC 2010 Removed Files: xsrc/external/mit/xlogo/dist: AUTHORS NEWS XLogo-color.ad XLogo.ad compile mkinstalldirs print.c print.h Log Message: merge xlogo 1.0.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xlogo/dist/AUTHORS \ xsrc/external/mit/xlogo/dist/NEWS \ xsrc/external/mit/xlogo/dist/XLogo-color.ad \ xsrc/external/mit/xlogo/dist/XLogo.ad \ xsrc/external/mit/xlogo/dist/compile \ xsrc/external/mit/xlogo/dist/mkinstalldirs \ xsrc/external/mit/xlogo/dist/print.c xsrc/external/mit/xlogo/dist/print.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xbiff/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:53:38 UTC 2010 Removed Files: xsrc/external/mit/xbiff/dist: AUTHORS NEWS compile mkinstalldirs Log Message: merge xbiff 1.0.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xbiff/dist/AUTHORS \ xsrc/external/mit/xbiff/dist/NEWS xsrc/external/mit/xbiff/dist/compile \ xsrc/external/mit/xbiff/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xcalc/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:54:26 UTC 2010 Removed Files: xsrc/external/mit/xcalc/dist: AUTHORS NEWS XCalc-color.ad XCalc.ad actions.h Log Message: merge xcalc 1.0.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xcalc/dist/AUTHORS \ xsrc/external/mit/xcalc/dist/NEWS \ xsrc/external/mit/xcalc/dist/XCalc-color.ad \ xsrc/external/mit/xcalc/dist/XCalc.ad \ xsrc/external/mit/xcalc/dist/actions.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xgc/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:54:41 UTC 2010 Removed Files: xsrc/external/mit/xgc/dist: Xgc.ad compile main.h mkinstalldirs Log Message: merge xgc 1.0.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xgc/dist/Xgc.ad \ xsrc/external/mit/xgc/dist/compile xsrc/external/mit/xgc/dist/main.h \ xsrc/external/mit/xgc/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xkbprint/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:55:04 UTC 2010 Removed Files: xsrc/external/mit/xkbprint/dist: compile mkinstalldirs Log Message: merge xkbprint 1.0.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkbprint/dist/compile \ xsrc/external/mit/xkbprint/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xdm/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 04:59:52 UTC 2010 Modified Files: xsrc/external/mit/xdm/dist/config: Xstartup.cpp xsrc/external/mit/xdm/dist/greeter: greet.c Removed Files: xsrc/external/mit/xdm/dist: NEWS acinclude.m4 Log Message: merge xdm 1.1.10 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xdm/dist/NEWS cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xdm/dist/acinclude.m4 cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xdm/dist/config/Xstartup.cpp cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xdm/dist/greeter/greet.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xdm/dist/config/Xstartup.cpp diff -u xsrc/external/mit/xdm/dist/config/Xstartup.cpp:1.2 xsrc/external/mit/xdm/dist/config/Xstartup.cpp:1.3 --- xsrc/external/mit/xdm/dist/config/Xstartup.cpp:1.2 Fri Mar 13 08:34:19 2009 +++ xsrc/external/mit/xdm/dist/config/Xstartup.cpp Fri May 21 04:59:52 2010 @@ -1,5 +1,5 @@ XCOMM!/bin/sh XCOMM Register a login (derived from GiveConsole as follows:) XCOMM -BINDIR/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \ +exec BINDIR/sessreg -a -w WTMP_FILE -u UTMP_FILE \ -x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER Index: xsrc/external/mit/xdm/dist/greeter/greet.c diff -u xsrc/external/mit/xdm/dist/greeter/greet.c:1.3 xsrc/external/mit/xdm/dist/greeter/greet.c:1.4 --- xsrc/external/mit/xdm/dist/greeter/greet.c:1.3 Mon Nov 9 07:12:59 2009 +++ xsrc/external/mit/xdm/dist/greeter/greet.c Fri May 21 04:59:52 2010 @@ -25,32 +25,27 @@ from The Open Group. */ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. +/* + * Copyright © 2006 Sun Microsystems, Inc. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL - * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING - * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */ @@ -78,7 +73,7 @@ #include "dm.h" #include "dm_error.h" #include "greet.h" -#include "Login.h" +#include "LoginP.h" #if defined(HAVE_OPENLOG) && defined(HAVE_SYSLOG_H) # define USE_SYSLOG @@ -347,6 +342,8 @@ XSetAccessControl (dpy, DisableAccess); } XtDestroyWidget (toplevel); +toplevel = NULL; +login = NULL; /* child of toplevel, which we just destroyed */ ClearCloseOnFork (XConnectionNumber (dpy)); XCloseDisplay (dpy); Debug ("Greet connection closed\n"); @@ -415,9 +412,14 @@ FailedLogin (struct display *d, struct greet_info *greet) { #ifdef USE_SYSLOG +
CVS commit: xsrc/external/mit/imake/include
Module Name:xsrc Committed By: mrg Date: Fri May 21 05:55:02 UTC 2010 Added Files: xsrc/external/mit/imake/include: config.h Log Message: imake 1.0.3 wants a config.h To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/imake/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/imake/include/config.h diff -u /dev/null xsrc/external/mit/imake/include/config.h:1.1 --- /dev/null Fri May 21 05:55:02 2010 +++ xsrc/external/mit/imake/include/config.h Fri May 21 05:55:02 2010 @@ -0,0 +1,68 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the "mkstemp" function. */ +#define HAS_MKSTEMP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Name of package */ +#define PACKAGE "imake" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"; + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "imake" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "imake 1.0.3" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "imake" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.0.3" + +/* Major version of this package */ +#define PACKAGE_VERSION_MAJOR 1 + +/* Minor version of this package */ +#define PACKAGE_VERSION_MINOR 0 + +/* Patch version of this package */ +#define PACKAGE_VERSION_PATCHLEVEL 3 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "1.0.3"
CVS commit: src/external/mit/xorg/bin/imake
Module Name:src Committed By: mrg Date: Fri May 21 05:55:24 UTC 2010 Modified Files: src/external/mit/xorg/bin/imake: Makefile Log Message: find config.h where it is now available from. for imake 1.0.3. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/imake/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/mit/xorg/bin/imake/Makefile diff -u src/external/mit/xorg/bin/imake/Makefile:1.2 src/external/mit/xorg/bin/imake/Makefile:1.3 --- src/external/mit/xorg/bin/imake/Makefile:1.2 Tue Oct 14 23:37:19 2008 +++ src/external/mit/xorg/bin/imake/Makefile Fri May 21 05:55:24 2010 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $ +# $NetBSD: Makefile,v 1.3 2010/05/21 05:55:24 mrg Exp $ .include PROG= imake CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 +CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include CPP_PROGRAM= cpp CPPFLAGS+= -DCPP_PROGRAM=\"$(CPP_PROGRAM)\"
CVS commit: src/external/mit/xorg/bin
Module Name:src Committed By: mrg Date: Fri May 21 06:04:37 UTC 2010 Modified Files: src/external/mit/xorg/bin/viewres: Makefile src/external/mit/xorg/bin/xcalc: Makefile src/external/mit/xorg/bin/xgc: Makefile src/external/mit/xorg/bin/xlogo: Makefile Log Message: look for and find the app-defaults in the new app-defalts/ subdir of the distribution sources. also, most of them lost the ".ad" suffix. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/viewres/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xcalc/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xgc/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xlogo/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/mit/xorg/bin/viewres/Makefile diff -u src/external/mit/xorg/bin/viewres/Makefile:1.1.1.1 src/external/mit/xorg/bin/viewres/Makefile:1.2 --- src/external/mit/xorg/bin/viewres/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/viewres/Makefile Fri May 21 06:04:36 2010 @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:36 mrg Exp $ .include PROG= viewres -APPDEFS=Viewres.ad +APPDEFS=Viewres Viewres-color LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ ${LIBXPM} ${LIBXEXT} ${LIBX11} -.PATH: ${X11SRCDIR.${PROG}} +.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults .include .include Index: src/external/mit/xorg/bin/xcalc/Makefile diff -u src/external/mit/xorg/bin/xcalc/Makefile:1.1.1.1 src/external/mit/xorg/bin/xcalc/Makefile:1.2 --- src/external/mit/xorg/bin/xcalc/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/xcalc/Makefile Fri May 21 06:04:36 2010 @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:36 mrg Exp $ .include PROG= xcalc SRCS= actions.c math.c xcalc.c -APPDEFS=XCalc.ad XCalc-color.ad +APPDEFS=XCalc XCalc-color LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM} -.PATH: ${X11SRCDIR.${PROG}} +.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults .include .include Index: src/external/mit/xorg/bin/xgc/Makefile diff -u src/external/mit/xorg/bin/xgc/Makefile:1.1.1.1 src/external/mit/xorg/bin/xgc/Makefile:1.2 --- src/external/mit/xorg/bin/xgc/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/xgc/Makefile Fri May 21 06:04:37 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:37 mrg Exp $ .include @@ -9,13 +9,13 @@ YHEADER=1 CPPFLAGS+=-I. -I${X11SRCDIR.${PROG}} -DHAS_SNPRINTF -APPDEFS=Xgc.ad +APPDEFS=Xgc Xgc-color LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXPM} \ ${LIBXEXT} ${LIBX11} ${LIBM} -.PATH: ${X11SRCDIR.${PROG}} +.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults .include .include Index: src/external/mit/xorg/bin/xlogo/Makefile diff -u src/external/mit/xorg/bin/xlogo/Makefile:1.1.1.1 src/external/mit/xorg/bin/xlogo/Makefile:1.2 --- src/external/mit/xorg/bin/xlogo/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/xlogo/Makefile Fri May 21 06:04:37 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:37 mrg Exp $ .include @@ -7,7 +7,7 @@ CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2 -APPDEFS=XLogo.ad XLogo-color.ad +APPDEFS=XLogo XLogo-color LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER} @@ -15,7 +15,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM} -.PATH: ${X11SRCDIR.${PROG}} +.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults .include .include
CVS commit: src/distrib/sets/lists/xbase
Module Name:src Committed By: mrg Date: Fri May 21 06:09:34 UTC 2010 Modified Files: src/distrib/sets/lists/xbase: mi Log Message: add Viewres-color and Xgc-color app-defaults for Xorg builds. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/xbase/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/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.88 src/distrib/sets/lists/xbase/mi:1.89 --- src/distrib/sets/lists/xbase/mi:1.88 Sat May 15 15:34:09 2010 +++ src/distrib/sets/lists/xbase/mi Fri May 21 06:09:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.88 2010/05/15 15:34:09 nonaka Exp $ +# $NetBSD: mi,v 1.89 2010/05/21 06:09:34 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1530,6 +1530,7 @@ ./usr/X11R7/lib/X11/app-defaults/SshAskpass -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/UXTerm -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/Viewres -unknown- xorg +./usr/X11R7/lib/X11/app-defaults/Viewres-color -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/XCalc -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/XCalc-color -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/XClipboard -unknown- xorg @@ -1550,6 +1551,7 @@ ./usr/X11R7/lib/X11/app-defaults/Xedit-color -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/Xfd -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/Xgc -unknown- xorg +./usr/X11R7/lib/X11/app-defaults/Xgc-color -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/Xmag -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/Xman -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/Xmessage -unknown- xorg
CVS commit: xsrc/external/mit/xeyes/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 06:28:58 UTC 2010 Update of /cvsroot/xsrc/external/mit/xeyes/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1137 Log Message: initial import of xeyes-1.1.0 Status: Vendor Tag: xorg Release Tags: xeyes-1-1-0 U xsrc/external/mit/xeyes/dist/ChangeLog U xsrc/external/mit/xeyes/dist/COPYING U xsrc/external/mit/xeyes/dist/Makefile.am U xsrc/external/mit/xeyes/dist/Eyes.c U xsrc/external/mit/xeyes/dist/Eyes.h U xsrc/external/mit/xeyes/dist/EyesP.h U xsrc/external/mit/xeyes/dist/INSTALL U xsrc/external/mit/xeyes/dist/Makefile.in U xsrc/external/mit/xeyes/dist/README U xsrc/external/mit/xeyes/dist/aclocal.m4 U xsrc/external/mit/xeyes/dist/config.guess U xsrc/external/mit/xeyes/dist/config.h.in U xsrc/external/mit/xeyes/dist/config.sub U xsrc/external/mit/xeyes/dist/configure U xsrc/external/mit/xeyes/dist/configure.ac U xsrc/external/mit/xeyes/dist/depcomp U xsrc/external/mit/xeyes/dist/eyes.bit U xsrc/external/mit/xeyes/dist/eyesmask.bit U xsrc/external/mit/xeyes/dist/install-sh U xsrc/external/mit/xeyes/dist/missing U xsrc/external/mit/xeyes/dist/transform.c U xsrc/external/mit/xeyes/dist/transform.h U xsrc/external/mit/xeyes/dist/xeyes.c U xsrc/external/mit/xeyes/dist/xeyes.man No conflicts created by this import
CVS commit: xsrc/external/mit/xproto/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 06:29:01 UTC 2010 Update of /cvsroot/xsrc/external/mit/xproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9919 Log Message: initial import of xproto-7.0.17 Status: Vendor Tag: xorg Release Tags: xproto-7-0-17 U xsrc/external/mit/xproto/dist/Xfuncproto.h.in U xsrc/external/mit/xproto/dist/ap_keysym.h U xsrc/external/mit/xproto/dist/X.h U xsrc/external/mit/xproto/dist/Xwindows.h U xsrc/external/mit/xproto/dist/do-not-use-config.h.in U xsrc/external/mit/xproto/dist/XF86keysym.h U xsrc/external/mit/xproto/dist/HPkeysym.h U xsrc/external/mit/xproto/dist/missing U xsrc/external/mit/xproto/dist/DECkeysym.h U xsrc/external/mit/xproto/dist/config.guess U xsrc/external/mit/xproto/dist/COPYING U xsrc/external/mit/xproto/dist/AUTHORS U xsrc/external/mit/xproto/dist/aclocal.m4 U xsrc/external/mit/xproto/dist/Xwinsock.h U xsrc/external/mit/xproto/dist/Xfuncs.h U xsrc/external/mit/xproto/dist/Xos.h U xsrc/external/mit/xproto/dist/Xthreads.h U xsrc/external/mit/xproto/dist/Xatom.h U xsrc/external/mit/xproto/dist/Xos_r.h U xsrc/external/mit/xproto/dist/Xproto.h U xsrc/external/mit/xproto/dist/Makefile.in U xsrc/external/mit/xproto/dist/Xpoll.h.in U xsrc/external/mit/xproto/dist/config.sub U xsrc/external/mit/xproto/dist/Xprotostr.h U xsrc/external/mit/xproto/dist/Xdefs.h N xsrc/external/mit/xproto/dist/README U xsrc/external/mit/xproto/dist/Sunkeysym.h U xsrc/external/mit/xproto/dist/Xw32defs.h U xsrc/external/mit/xproto/dist/Xosdefs.h U xsrc/external/mit/xproto/dist/ChangeLog U xsrc/external/mit/xproto/dist/keysym.h U xsrc/external/mit/xproto/dist/keysymdef.h U xsrc/external/mit/xproto/dist/Makefile.am U xsrc/external/mit/xproto/dist/Xmd.h U xsrc/external/mit/xproto/dist/Xarch.h U xsrc/external/mit/xproto/dist/install-sh N xsrc/external/mit/xproto/dist/INSTALL U xsrc/external/mit/xproto/dist/XWDFile.h U xsrc/external/mit/xproto/dist/configure U xsrc/external/mit/xproto/dist/Xalloca.h U xsrc/external/mit/xproto/dist/xproto.pc.in U xsrc/external/mit/xproto/dist/configure.ac No conflicts created by this import
CVS commit: xsrc/external/mit/xvidtune/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 06:29:02 UTC 2010 Update of /cvsroot/xsrc/external/mit/xvidtune/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25185 Log Message: initial import of xvidtune-1.0.2 Status: Vendor Tag: xorg Release Tags: xvidtune-1-0-2 U xsrc/external/mit/xvidtune/dist/Makefile.am U xsrc/external/mit/xvidtune/dist/INSTALL U xsrc/external/mit/xvidtune/dist/README U xsrc/external/mit/xvidtune/dist/config.guess U xsrc/external/mit/xvidtune/dist/Makefile.in U xsrc/external/mit/xvidtune/dist/config.sub U xsrc/external/mit/xvidtune/dist/xvidtune.man U xsrc/external/mit/xvidtune/dist/xvidtune.c U xsrc/external/mit/xvidtune/dist/COPYING U xsrc/external/mit/xvidtune/dist/configure U xsrc/external/mit/xvidtune/dist/install-sh U xsrc/external/mit/xvidtune/dist/aclocal.m4 U xsrc/external/mit/xvidtune/dist/configure.ac U xsrc/external/mit/xvidtune/dist/depcomp U xsrc/external/mit/xvidtune/dist/missing U xsrc/external/mit/xvidtune/dist/ChangeLog U xsrc/external/mit/xvidtune/dist/config.h.in N xsrc/external/mit/xvidtune/dist/app-defaults/Xvidtune No conflicts created by this import
CVS commit: xsrc/external/mit/xeyes/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 06:31:05 UTC 2010 Removed Files: xsrc/external/mit/xeyes/dist: AUTHORS NEWS compile mkinstalldirs Log Message: merge xeyes 1.1.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xeyes/dist/AUTHORS \ xsrc/external/mit/xeyes/dist/NEWS xsrc/external/mit/xeyes/dist/compile \ xsrc/external/mit/xeyes/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xvidtune/dist
Module Name:xsrc Committed By: mrg Date: Fri May 21 06:31:15 UTC 2010 Removed Files: xsrc/external/mit/xvidtune/dist: AUTHORS NEWS Xvidtune.cpp compile mkinstalldirs Log Message: merge xvidtune 1.0.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xvidtune/dist/AUTHORS \ xsrc/external/mit/xvidtune/dist/NEWS \ xsrc/external/mit/xvidtune/dist/Xvidtune.cpp \ xsrc/external/mit/xvidtune/dist/compile \ xsrc/external/mit/xvidtune/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/xvidtune
Module Name:src Committed By: mrg Date: Fri May 21 06:37:26 UTC 2010 Modified Files: src/external/mit/xorg/bin/xvidtune: Makefile Log Message: find the app-defaults file in the new place, as a non- .cpp file. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xvidtune/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/mit/xorg/bin/xvidtune/Makefile diff -u src/external/mit/xorg/bin/xvidtune/Makefile:1.2 src/external/mit/xorg/bin/xvidtune/Makefile:1.3 --- src/external/mit/xorg/bin/xvidtune/Makefile:1.2 Fri Jun 12 06:57:22 2009 +++ src/external/mit/xorg/bin/xvidtune/Makefile Fri May 21 06:37:26 2010 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2009/06/12 06:57:22 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2010/05/21 06:37:26 mrg Exp $ .include PROG= xvidtune -APPDEFS= Xvidtune.ad +APPDEFS= Xvidtune SRCS= xvidtune.c @@ -11,16 +11,9 @@ DPADD+= ${LIBXXF86VM} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ ${LIBXPM} ${LIBXEXT} ${LIBX11} -.PATH: ${X11SRCDIR.${PROG}} +.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults VENDOR_NAME=The Xorg Foundation -Xvidtune.ad: Xvidtune.cpp Makefile - $(CC) -E ${X11SRCDIR.xvidtune}/Xvidtune.cpp | \ - sed -e 's/^\#.*$$//g' -e 's|__VENDOR__|$(VENDOR_NAME)|' > ${.TARGET} - -CLEANFILES+= Xvidtune.ad - .include .include -#XTODO= Xvidtune.ad
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Fri May 21 06:53:51 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c Log Message: Protect against NULL pointers in key output in a different way - only advance its counter if it's non-NULL. Regression test for this is: netpgpkeys --list-key '\.de\>' with my standard keyring (to list all keys which have at least one subuid with a German email address). To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 \ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.54 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.55 --- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.54 Thu May 20 14:43:42 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Fri May 21 06:53:51 2010 @@ -34,7 +34,7 @@ #if defined(__NetBSD__) __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: netpgp.c,v 1.54 2010/05/20 14:43:42 agc Exp $"); +__RCSID("$NetBSD: netpgp.c,v 1.55 2010/05/21 06:53:51 agc Exp $"); #endif #include @@ -600,7 +600,9 @@ "pub", &key->key.pubkey, psigs); } - pubs.c += 1; + if (pubs.v[pubs.c] != NULL) { +pubs.c += 1; + } k += 1; } } while (key != NULL); @@ -611,10 +613,8 @@ (pubs.c == 1) ? "" : "s"); } for (k = 0 ; k < pubs.c ; k++) { - if (pubs.v[k]) { - (void) fprintf(fp, "%s%s", pubs.v[k], (k < pubs.c - 1) ? "\n" : ""); - free(pubs.v[k]); - } + (void) fprintf(fp, "%s%s", pubs.v[k], (k < pubs.c - 1) ? "\n" : ""); + free(pubs.v[k]); } free(pubs.v); return pubs.c;