CVS commit: src/games/robots
Module Name:src
Committed By: dholland
Date: Mon Jul 20 06:00:56 UTC 2009
Modified Files:
src/games/robots: auto.c extern.c flush_in.c init_field.c main.c
make_level.c move.c move_robs.c play_level.c query.c rnd_pos.c
robots.h score.c
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/games/robots/auto.c \
src/games/robots/init_field.c
cvs rdiff -u -r1.8 -r1.9 src/games/robots/extern.c \
src/games/robots/make_level.c src/games/robots/move_robs.c
cvs rdiff -u -r1.7 -r1.8 src/games/robots/flush_in.c \
src/games/robots/play_level.c src/games/robots/query.c
cvs rdiff -u -r1.25 -r1.26 src/games/robots/main.c
cvs rdiff -u -r1.13 -r1.14 src/games/robots/move.c
cvs rdiff -u -r1.6 -r1.7 src/games/robots/rnd_pos.c
cvs rdiff -u -r1.19 -r1.20 src/games/robots/robots.h src/games/robots/score.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/robots/auto.c
diff -u src/games/robots/auto.c:1.9 src/games/robots/auto.c:1.10
--- src/games/robots/auto.c:1.9 Mon Jul 20 05:44:02 2009
+++ src/games/robots/auto.c Mon Jul 20 06:00:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: auto.c,v 1.9 2009/07/20 05:44:02 dholland Exp $ */
+/* $NetBSD: auto.c,v 1.10 2009/07/20 06:00:56 dholland Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -32,14 +32,14 @@
/*
* Automatic move.
* intelligent ?
- * Algo :
+ * Algo :
* IF scrapheaps don't exist THEN
- * IF not in danger THEN
+ * IF not in danger THEN
*stay at current position
* ELSE
*move away from the closest robot
* FI
- * ELSE
+ * ELSE
* find closest heap
* find closest robot
* IF scrapheap is adjacent THEN
@@ -70,16 +70,16 @@
static int between(COORD *, COORD *);
/* distance():
- * return move number distance of the two coordinates
+ * return move number distance of the two coordinates
*/
-static int
+static int
distance(int x1, int y1, int x2, int y2)
{
return MAX(ABS(ABS(x1) - ABS(x2)), ABS(ABS(y1) - ABS(y2)));
}
/* xinc():
- * Return x coordinate moves
+ * Return x coordinate moves
*/
static int
xinc(int dir)
@@ -101,7 +101,7 @@
}
/* yinc():
- * Return y coordinate moves
+ * Return y coordinate moves
*/
static int
yinc(int dir)
@@ -123,7 +123,7 @@
}
/* find_moves():
- * Find possible moves
+ * Find possible moves
*/
static const char *
find_moves(void)
@@ -136,17 +136,17 @@
static char ans[sizeof moves];
a = ans;
-for(m = moves; *m; m++) {
+for (m = moves; *m; m++) {
test.x = My_pos.x + xinc(*m);
test.y = My_pos.y + yinc(*m);
move(test.y, test.x);
switch(winch(stdscr)) {
case ' ':
case PLAYER:
-for(x = test.x - 1; x = test.x + 1; x++) {
-for(y = test.y - 1; y = test.y + 1; y++) {
+for (x = test.x - 1; x = test.x + 1; x++) {
+for (y = test.y - 1; y = test.y + 1; y++) {
move(y, x);
-if(winch(stdscr) == ROBOT)
+if (winch(stdscr) == ROBOT)
goto bad;
}
}
@@ -155,15 +155,15 @@
bad:;
}
*a = 0;
-if(ans[0])
+if (ans[0])
return ans;
else
return t;
}
/* closest_robot():
- * return the robot closest to us
- * and put in dist its distance
+ * return the robot closest to us
+ * and put in dist its distance
*/
static COORD *
closest_robot(int *dist)
@@ -183,10 +183,10 @@
*dist = mindist;
return minrob;
}
-
+
/* closest_heap():
- * return the heap closest to us
- * and put in dist its distance
+ * return the heap closest to us
+ * and put in dist its distance
*/
static COORD *
closest_heap(int *dist)
@@ -210,9 +210,9 @@
}
/* move_towards():
- * move as close to the given direction as possible
+ * move as close to the given direction as possible
*/
-static char
+static char
move_towards(int dx, int dy)
{
char ok_moves[10], best_move;
@@ -220,7 +220,7 @@
int move_judge, cur_judge, mvx, mvy;
(void)strcpy(ok_moves, find_moves());
- best_move = ok_moves[0];
+ best_move = ok_moves[0];
if (best_move != 't') {
mvx = xinc(best_move);
mvy = yinc(best_move);
@@ -239,7 +239,7 @@
}
/* move_away():
- * move away form the robot given
+ * move away form the robot given
*/
static char
move_away(COORD *rob)
@@ -253,7 +253,7 @@
/* move_between():
- * move the closest heap between us and the closest robot
+ * move the closest heap between us and the closest robot
*/
static char
move_between(COORD *rob, COORD *hp)
@@ -263,8 +263,8 @@
/* equation of
CVS commit: src/games/robots
Module Name:src Committed By: dholland Date: Mon Jul 20 06:09:29 UTC 2009 Modified Files: src/games/robots: init_field.c main.c Log Message: A bit more whitespace. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/games/robots/init_field.c cvs rdiff -u -r1.26 -r1.27 src/games/robots/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/games/robots/init_field.c diff -u src/games/robots/init_field.c:1.10 src/games/robots/init_field.c:1.11 --- src/games/robots/init_field.c:1.10 Mon Jul 20 06:00:56 2009 +++ src/games/robots/init_field.c Mon Jul 20 06:09:29 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: init_field.c,v 1.10 2009/07/20 06:00:56 dholland Exp $ */ +/* $NetBSD: init_field.c,v 1.11 2009/07/20 06:09:29 dholland Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,11 +34,11 @@ #if 0 static char sccsid[] = @(#)init_field.c 8.1 (Berkeley) 5/31/93; #else -__RCSID($NetBSD: init_field.c,v 1.10 2009/07/20 06:00:56 dholland Exp $); +__RCSID($NetBSD: init_field.c,v 1.11 2009/07/20 06:09:29 dholland Exp $); #endif #endif /* not lint */ -# include robots.h +#include robots.h static int telx = 0; static int tely = 0; Index: src/games/robots/main.c diff -u src/games/robots/main.c:1.26 src/games/robots/main.c:1.27 --- src/games/robots/main.c:1.26 Mon Jul 20 06:00:56 2009 +++ src/games/robots/main.c Mon Jul 20 06:09:29 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.26 2009/07/20 06:00:56 dholland Exp $ */ +/* $NetBSD: main.c,v 1.27 2009/07/20 06:09:29 dholland Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = @(#)main.c 8.1 (Berkeley) 5/31/93; #else -__RCSID($NetBSD: main.c,v 1.26 2009/07/20 06:00:56 dholland Exp $); +__RCSID($NetBSD: main.c,v 1.27 2009/07/20 06:09:29 dholland Exp $); #endif #endif /* not lint */ @@ -81,7 +81,7 @@ score_wfd = open(Scorefile, O_RDWR); if (score_wfd 0) score_err = errno; -# ifdef FANCY +#ifdef FANCY sp = strrchr(Scorefile, '/'); if (sp == NULL) sp = Scorefile; @@ -91,7 +91,7 @@ Stand_still = TRUE; if (Pattern_roll || Stand_still) Teleport = TRUE; -# endif +#endif } else for (sp = av[0][1]; *sp; sp++)
CVS commit: src/games/robots
Module Name:src
Committed By: dholland
Date: Mon Jul 20 06:43:18 UTC 2009
Modified Files:
src/games/robots: main.c rnd_pos.c
Log Message:
Use random() instead of rand(), and seed with time instead of pid.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/games/robots/main.c
cvs rdiff -u -r1.8 -r1.9 src/games/robots/rnd_pos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/robots/main.c
diff -u src/games/robots/main.c:1.28 src/games/robots/main.c:1.29
--- src/games/robots/main.c:1.28 Mon Jul 20 06:39:06 2009
+++ src/games/robots/main.c Mon Jul 20 06:43:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.28 2009/07/20 06:39:06 dholland Exp $ */
+/* $NetBSD: main.c,v 1.29 2009/07/20 06:43:18 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)main.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: main.c,v 1.28 2009/07/20 06:39:06 dholland Exp $);
+__RCSID($NetBSD: main.c,v 1.29 2009/07/20 06:43:18 dholland Exp $);
#endif
#endif /* not lint */
@@ -50,6 +50,7 @@
#include fcntl.h
#include signal.h
#include stdlib.h
+#include time.h
#include unistd.h
#include robots.h
@@ -167,7 +168,7 @@
stdscr = newwin(Y_SIZE, X_SIZE, 0, 0);
}
- srand(getpid());
+ srandom(time(NULL));
if (Real_time)
signal(SIGALRM, move_robots);
do {
Index: src/games/robots/rnd_pos.c
diff -u src/games/robots/rnd_pos.c:1.8 src/games/robots/rnd_pos.c:1.9
--- src/games/robots/rnd_pos.c:1.8 Mon Jul 20 06:39:06 2009
+++ src/games/robots/rnd_pos.c Mon Jul 20 06:43:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd_pos.c,v 1.8 2009/07/20 06:39:06 dholland Exp $ */
+/* $NetBSD: rnd_pos.c,v 1.9 2009/07/20 06:43:18 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)rnd_pos.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: rnd_pos.c,v 1.8 2009/07/20 06:39:06 dholland Exp $);
+__RCSID($NetBSD: rnd_pos.c,v 1.9 2009/07/20 06:43:18 dholland Exp $);
#endif
#endif /* not lint */
@@ -67,5 +67,5 @@
rnd(int range)
{
- return rand() % range;
+ return random() % range;
}
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Jul 20 07:58:54 UTC 2009 Modified Files: src/share/man/man4: ip.4 Log Message: Formatting nit. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/share/man/man4/ip.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/ip.4 diff -u src/share/man/man4/ip.4:1.29 src/share/man/man4/ip.4:1.30 --- src/share/man/man4/ip.4:1.29 Sun Jul 19 23:17:33 2009 +++ src/share/man/man4/ip.4 Mon Jul 20 07:58:54 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: ip.4,v 1.29 2009/07/19 23:17:33 minskim Exp $ +.\ $NetBSD: ip.4,v 1.30 2009/07/20 07:58:54 wiz Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -190,7 +190,9 @@ The .Dv IP_MINTTL option may be used on -.Dv SOCK_DGRAM or SOCK_STREAM +.Dv SOCK_DGRAM +or +.Dv SOCK_STREAM sockets to discard packets with a TTL lower than the option value. This can be used to implement the .Em Generalized TTL Security Mechanism (GTSM)
CVS commit: src/sys/lib/libkern/arch/ia64
Module Name:src Committed By: kiyohara Date: Mon Jul 20 11:23:04 UTC 2009 Modified Files: src/sys/lib/libkern/arch/ia64: Makefile.inc Added Files: src/sys/lib/libkern/arch/ia64: bswap64.S byte_swap_8.S Log Message: Fix little bit, and add a few files. current status is to see following thread. http://mail-index.netbsd.org/port-ia64/2009/06/18/msg000102.html To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/lib/libkern/arch/ia64/Makefile.inc cvs rdiff -u -r0 -r1.1 src/sys/lib/libkern/arch/ia64/bswap64.S \ src/sys/lib/libkern/arch/ia64/byte_swap_8.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/arch/ia64/Makefile.inc diff -u src/sys/lib/libkern/arch/ia64/Makefile.inc:1.1 src/sys/lib/libkern/arch/ia64/Makefile.inc:1.2 --- src/sys/lib/libkern/arch/ia64/Makefile.inc:1.1 Fri Apr 7 13:57:43 2006 +++ src/sys/lib/libkern/arch/ia64/Makefile.inc Mon Jul 20 11:23:04 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2006/04/07 13:57:43 cherry Exp $ +# $NetBSD: Makefile.inc,v 1.2 2009/07/20 11:23:04 kiyohara Exp $ # SRCS+= __assert.c __main.c memset.c skpc.c scanc.c random.c \ @@ -8,5 +8,5 @@ memchr.c SRCS+= divdi3.S divsi3.S modsi3.S moddi3.S udivdi3.S udivsi3.S \ - umoddi3.S umodsi3.S bswap32.S bswap16.S ntohl.S htonl.S \ + umoddi3.S umodsi3.S bswap64.S bswap32.S bswap16.S ntohl.S htonl.S \ memcpy.S Added files: Index: src/sys/lib/libkern/arch/ia64/bswap64.S diff -u /dev/null src/sys/lib/libkern/arch/ia64/bswap64.S:1.1 --- /dev/null Mon Jul 20 11:23:04 2009 +++ src/sys/lib/libkern/arch/ia64/bswap64.S Mon Jul 20 11:23:04 2009 @@ -0,0 +1,37 @@ +/* $NetBSD: bswap64.S,v 1.1 2009/07/20 11:23:04 kiyohara Exp $ */ + +/*- + * Copyright (c) 1996 Carnegie-Mellon University. + * All rights reserved. + * + * Author: Chris G. Demetriou + * + * Permission to use, copy, modify and distribute this software and + * its documentation is hereby granted, provided that both the copyright + * notice and this permission notice appear in all copies of the + * software, derivative works or modified versions, and any portions + * thereof, and that both notices appear in supporting documentation. + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS AS IS + * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND + * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. + * + * Carnegie Mellon requests users of this software to return to + * + * Software Distribution Coordinator or software.distribut...@cs.cmu.edu + * School of Computer Science + * Carnegie Mellon University + * Pittsburgh PA 15213-3890 + * + * any improvements or extensions that they make and grant Carnegie the + * rights to redistribute these changes. + * + * from: NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd + * from: src/sys/libkern/ia64/htonl.S,v 1.2 2002/02/18 20:35:21 + * + * $FreeBSD$ + */ + +#define NAME bswap64 + +#include byte_swap_8.S Index: src/sys/lib/libkern/arch/ia64/byte_swap_8.S diff -u /dev/null src/sys/lib/libkern/arch/ia64/byte_swap_8.S:1.1 --- /dev/null Mon Jul 20 11:23:04 2009 +++ src/sys/lib/libkern/arch/ia64/byte_swap_8.S Mon Jul 20 11:23:04 2009 @@ -0,0 +1,45 @@ +/* $NetBSD: byte_swap_8.S,v 1.1 2009/07/20 11:23:04 kiyohara Exp $ */ + +/*- + * Copyright (c) 1996 Carnegie-Mellon University. + * All rights reserved. + * + * Author: Chris G. Demetriou + * + * Permission to use, copy, modify and distribute this software and + * its documentation is hereby granted, provided that both the copyright + * notice and this permission notice appear in all copies of the + * software, derivative works or modified versions, and any portions + * thereof, and that both notices appear in supporting documentation. + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS AS IS + * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND + * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. + * + * Carnegie Mellon requests users of this software to return to + * + * Software Distribution Coordinator or software.distribut...@cs.cmu.edu + * School of Computer Science + * Carnegie Mellon University + * Pittsburgh PA 15213-3890 + * + * any improvements or extensions that they make and grant Carnegie the + * rights to redistribute these changes. + */ + +#include machine/asm.h + +#ifndef NAME +#error NAME not defined +#endif + +/* + * Byte-swap a 8-byte quantity. + * (Convert 0x0123456789012345 to 0x4523018967452301.) + * + * Argument is an unsigned 8-byte integer (u_int64_t). + */ +ENTRY(NAME, 1) + mux1 r8=in0,@rev + br.ret.sptk.few rp +END(NAME)
CVS commit: src/sys/arch/sandpoint/stand
Module Name:src
Committed By: nisimura
Date: Mon Jul 20 11:43:09 UTC 2009
Modified Files:
src/sys/arch/sandpoint/stand/netboot: Makefile devopen.c globals.h
nif.c rge.c
Added Files:
src/sys/arch/sandpoint/stand: Makefile
Log Message:
- fix rge.c breakage.
- stand/netboot is reported working for KuroBox and TeraStatation.
Some more fixes will follow.
- withdraw files which remain work-in-progress for now.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/sandpoint/stand/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sandpoint/stand/netboot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sandpoint/stand/netboot/devopen.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sandpoint/stand/netboot/globals.h \
src/sys/arch/sandpoint/stand/netboot/nif.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sandpoint/stand/netboot/rge.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/stand/netboot/Makefile
diff -u src/sys/arch/sandpoint/stand/netboot/Makefile:1.14 src/sys/arch/sandpoint/stand/netboot/Makefile:1.15
--- src/sys/arch/sandpoint/stand/netboot/Makefile:1.14 Mon Jan 12 08:06:54 2009
+++ src/sys/arch/sandpoint/stand/netboot/Makefile Mon Jul 20 11:43:08 2009
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2009/01/12 08:06:54 tsutsui Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/20 11:43:08 nisimura Exp $
S= ${.CURDIR}/../../../..
PROG= netboot
SRCS= entry.S main.c brdsetup.c pci.c devopen.c dev_net.c nif.c \
- fxp.c tlp.c pcn.c sip.c nvt.c kse.c sme.c rge.c vge.c wm.c \
- atawd.c pciide.c siisata.c printf.c
+ fxp.c tlp.c rge.c printf.c
CLEANFILES+= vers.c vers.o ${PROG} ${PROG}.bin
CFLAGS+= -Wall -Wno-main -ffreestanding -msoft-float -mmultiple
CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
Index: src/sys/arch/sandpoint/stand/netboot/devopen.c
diff -u src/sys/arch/sandpoint/stand/netboot/devopen.c:1.9 src/sys/arch/sandpoint/stand/netboot/devopen.c:1.10
--- src/sys/arch/sandpoint/stand/netboot/devopen.c:1.9 Sat Mar 14 15:36:13 2009
+++ src/sys/arch/sandpoint/stand/netboot/devopen.c Mon Jul 20 11:43:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.9 2009/03/14 15:36:13 dsl Exp $ */
+/* $NetBSD: devopen.c,v 1.10 2009/07/20 11:43:09 nisimura Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -31,34 +31,21 @@
#include sys/param.h
-#include sys/disklabel.h
#include netinet/in.h
-#include dev/ic/wdcreg.h
-#include dev/ata/atareg.h
-
#include lib/libsa/stand.h
#include lib/libsa/nfs.h
-#include lib/libsa/ufs.h
-#include lib/libsa/ext2fs.h
-#include lib/libsa/dosfs.h
#include lib/libkern/libkern.h
#include globals.h
-static void parseunit(const char *, int *, int *, char **);
-
struct devsw devsw[] = {
{ net, net_strategy, net_open, net_close, noioctl },
- { dsk, wdstrategy, wdopen, wdclose, noioctl },
};
int ndevs = sizeof(devsw) / sizeof(devsw[0]);
struct fs_ops fssw[] = {
FS_OPS(nfs),
- FS_OPS(ffsv1),
- FS_OPS(ext2fs),
- FS_OPS(dosfs),
};
struct fs_ops file_system[1];
int nfsys = 1;
@@ -66,7 +53,7 @@
int
devopen(struct open_file *of, const char *name, char **file)
{
- int error, unit, part;
+ int error;
extern char bootfile[]; /* handed by DHCP */
if (of-f_flags != F_READ)
@@ -80,6 +67,7 @@
*file = bootfile; /* resolved fname */
return 0; /* NFS */
}
+#if 0 /* later */
if (name[0] == 'w' name[1] == 'd') {
parseunit(name[2], unit, part, file);
of-f_dev = devsw[1];
@@ -96,6 +84,7 @@
}
return 0;
}
+#endif
return ENOENT;
}
@@ -107,6 +96,7 @@
return EINVAL;
}
+#if 0
static void
parseunit(const char *name, int *unitp, int *partp, char **pathp)
{
@@ -125,3 +115,4 @@
*partp = (part == -1) ? 0 : part;
*pathp = (*p == ':') ? (char *)p + 1 : NULL;
}
+#endif
Index: src/sys/arch/sandpoint/stand/netboot/globals.h
diff -u src/sys/arch/sandpoint/stand/netboot/globals.h:1.10 src/sys/arch/sandpoint/stand/netboot/globals.h:1.11
--- src/sys/arch/sandpoint/stand/netboot/globals.h:1.10 Fri Jul 3 10:31:19 2009
+++ src/sys/arch/sandpoint/stand/netboot/globals.h Mon Jul 20 11:43:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: globals.h,v 1.10 2009/07/03 10:31:19 nisimura Exp $ */
+/* $NetBSD: globals.h,v 1.11 2009/07/20 11:43:09 nisimura Exp $ */
/* clock feed */
#ifndef TICKS_PER_SEC
@@ -88,64 +88,4 @@
NIF_DECL(fxp);
NIF_DECL(tlp);
-NIF_DECL(nvt);
-NIF_DECL(sip);
-NIF_DECL(pcn);
-NIF_DECL(kse);
-NIF_DECL(sme);
-NIF_DECL(vge);
NIF_DECL(rge);
-NIF_DECL(wm);
-
-#ifdef LABELSECTOR
-/* IDE/SATA and disk */
-int wdopen(struct open_file *, ...);
-int wdclose(struct open_file *);
-int wdstrategy(void *, int, daddr_t, size_t, void *, size_t *);
-int parsefstype(void *);
-
-struct atac_channel {
- volatile uint8_t *c_cmdbase;
- volatile uint8_t *c_ctlbase;
- volatile uint8_t *c_cmdreg[8 + 2];
- volatile uint16_t *c_data;
- int compatchan;
-#define
CVS commit: src/sys/arch/sandpoint/conf
Module Name:src Committed By: nisimura Date: Mon Jul 20 11:46:17 UTC 2009 Modified Files: src/sys/arch/sandpoint/conf: GENERIC.NAS Log Message: - add missing usb* at ehci? line. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sandpoint/conf/GENERIC.NAS 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/conf/GENERIC.NAS diff -u src/sys/arch/sandpoint/conf/GENERIC.NAS:1.9 src/sys/arch/sandpoint/conf/GENERIC.NAS:1.10 --- src/sys/arch/sandpoint/conf/GENERIC.NAS:1.9 Sat Jan 24 05:06:07 2009 +++ src/sys/arch/sandpoint/conf/GENERIC.NAS Mon Jul 20 11:46:17 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.NAS,v 1.9 2009/01/24 05:06:07 mrg Exp $ +# $NetBSD: GENERIC.NAS,v 1.10 2009/07/20 11:46:17 nisimura Exp $ # # machine description file for GENERIC.NAS # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC.NAS-$Revision: 1.9 $ +#ident GENERIC.NAS-$Revision: 1.10 $ maxusers 32 @@ -197,6 +197,7 @@ ohci* at pci? dev ? function ? # Open Host Controller # USB bus support +usb* at ehci? usb* at ohci? # USB Hubs
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: pooka
Date: Mon Jul 20 12:10:03 UTC 2009
Modified Files:
src/lib/libc/stdlib: malloc.3
Log Message:
Re-add explanation of how to correctly use realloc.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/stdlib/malloc.3
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/stdlib/malloc.3
diff -u src/lib/libc/stdlib/malloc.3:1.29 src/lib/libc/stdlib/malloc.3:1.30
--- src/lib/libc/stdlib/malloc.3:1.29 Mon May 18 09:00:02 2009
+++ src/lib/libc/stdlib/malloc.3 Mon Jul 20 12:10:03 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: malloc.3,v 1.29 2009/05/18 09:00:02 wiz Exp $
+.\ $NetBSD: malloc.3,v 1.30 2009/07/20 12:10:03 pooka Exp $
.\
.\ Copyright (c) 1980, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -34,7 +34,7 @@
.\ @(#)malloc.3 8.1 (Berkeley) 6/4/93
.\ $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.73 2007/06/15 22:32:33 jasone Exp $
.\
-.Dd October 15, 2007
+.Dd June 20, 2009
.Dt MALLOC 3
.Os
.Sh NAME
@@ -106,6 +106,36 @@
.Fn malloc
for the specified size.
.Pp
+When using
+.Fn realloc
+one must be careful to avoid the following idiom:
+.Pp
+.Bd -literal -offset indent
+nsize += 50;
+if ((p = realloc(p, nsize)) == NULL)
+ return (NULL);
+.Ed
+.Pp
+Do not adjust the variable describing how much memory has been allocated
+until one knows the allocation has been successful.
+This can cause aberrant program behavior if the incorrect size value is used.
+In most cases, the above sample will also result in a leak of memory.
+As stated earlier, a return value of
+.Dv NULL
+indicates that the old object still remains allocated.
+Better code looks like this:
+.Bd -literal -offset indent
+newsize = size + 50;
+if ((p2 = realloc(p, newsize)) == NULL) {
+ if (p)
+ free(p);
+ p = NULL;
+ return (NULL);
+}
+p = p2;
+size = newsize;
+.Ed
+.Pp
The
.Fn free
function causes the allocated memory referenced by
CVS commit: src/lib
Module Name:src
Committed By: skrll
Date: Mon Jul 20 12:16:37 UTC 2009
Modified Files:
src/lib/libhx509: Makefile
src/lib/libkrb5: Makefile
src/lib/libradius: Makefile
Log Message:
libcrypto moved.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libhx509/Makefile
cvs rdiff -u -r1.40 -r1.41 src/lib/libkrb5/Makefile
cvs rdiff -u -r1.10 -r1.11 src/lib/libradius/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/libhx509/Makefile
diff -u src/lib/libhx509/Makefile:1.5 src/lib/libhx509/Makefile:1.6
--- src/lib/libhx509/Makefile:1.5 Mon Oct 27 07:26:55 2008
+++ src/lib/libhx509/Makefile Mon Jul 20 12:16:37 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/10/27 07:26:55 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/20 12:16:37 skrll Exp $
USE_FORT?= yes # cryptographic software
@@ -13,7 +13,7 @@
LIB= hx509
-LIBDPLIBS+= crypto ${.CURDIR}/../libcrypto \
+LIBDPLIBS+= crypto ${.CURDIR}/../../crypto/external/bsd/openssl/lib/libcrypto \
asn1 ${.CURDIR}/../libasn1 \
roken ${.CURDIR}/../libroken
Index: src/lib/libkrb5/Makefile
diff -u src/lib/libkrb5/Makefile:1.40 src/lib/libkrb5/Makefile:1.41
--- src/lib/libkrb5/Makefile:1.40 Sun Apr 13 21:29:15 2008
+++ src/lib/libkrb5/Makefile Mon Jul 20 12:16:37 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2008/04/13 21:29:15 mlelstv Exp $
+# $NetBSD: Makefile,v 1.41 2009/07/20 12:16:37 skrll Exp $
USE_FORT?= yes # network protocol library
@@ -14,7 +14,7 @@
LIB= krb5
LIBDPLIBS+= hx509 ${.CURDIR}/../libhx509 \
- crypto ${.CURDIR}/../libcrypto \
+ crypto ${.CURDIR}/../../crypto/external/bsd/openssl/lib/libcrypto \
asn1 ${.CURDIR}/../libasn1 \
com_err ${.CURDIR}/../libcom_err \
roken ${.CURDIR}/../libroken
Index: src/lib/libradius/Makefile
diff -u src/lib/libradius/Makefile:1.10 src/lib/libradius/Makefile:1.11
--- src/lib/libradius/Makefile:1.10 Mon May 28 12:06:20 2007
+++ src/lib/libradius/Makefile Mon Jul 20 12:16:37 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/05/28 12:06:20 tls Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/20 12:16:37 skrll Exp $
USE_FORT?= yes # network protocol library
@@ -13,7 +13,7 @@
.if (${MKCRYPTO} != no)
CPPFLAGS+= -DWITH_SSL
-LIBDPLIBS+=crypto ${.CURDIR}/../libcrypto
+LIBDPLIBS+=crypto ${.CURDIR}/../../crypto/external/bsd/openssl/lib/libcrypto
.endif
SRCS= radlib.c
CVS commit: src/common/lib/libc/arch/x86_64/string
Module Name:src Committed By: christos Date: Mon Jul 20 15:21:00 UTC 2009 Modified Files: src/common/lib/libc/arch/x86_64/string: ffs.S memchr.S strchr.S Log Message: Put back dsl's string changes, but fix memchr.S to use cmp so that the condition code is set (and fix the comments 0x10-0x01). From Anon Ymous We need a test for memchr(x, -1)... To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/x86_64/string/ffs.S \ src/common/lib/libc/arch/x86_64/string/memchr.S cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/x86_64/string/strchr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/x86_64/string/ffs.S diff -u src/common/lib/libc/arch/x86_64/string/ffs.S:1.3 src/common/lib/libc/arch/x86_64/string/ffs.S:1.4 --- src/common/lib/libc/arch/x86_64/string/ffs.S:1.3 Sun Jul 19 19:45:29 2009 +++ src/common/lib/libc/arch/x86_64/string/ffs.S Mon Jul 20 11:21:00 2009 @@ -7,15 +7,14 @@ #include machine/asm.h #if defined(LIBC_SCCS) - RCSID($NetBSD: ffs.S,v 1.3 2009/07/19 23:45:29 christos Exp $) + RCSID($NetBSD: ffs.S,v 1.4 2009/07/20 15:21:00 christos Exp $) #endif ENTRY(ffs) bsfl %edi,%eax - jz L1 /* ZF is set if all bits are 0 */ + jz 1f /* ZF is set if all bits are 0 */ incl %eax /* bits numbered from 1, not 0 */ ret - _ALIGN_TEXT -L1: xorl %eax,%eax /* clear result */ +1: xorl %eax,%eax /* clear result */ ret Index: src/common/lib/libc/arch/x86_64/string/memchr.S diff -u src/common/lib/libc/arch/x86_64/string/memchr.S:1.3 src/common/lib/libc/arch/x86_64/string/memchr.S:1.4 --- src/common/lib/libc/arch/x86_64/string/memchr.S:1.3 Sun Jul 19 19:45:29 2009 +++ src/common/lib/libc/arch/x86_64/string/memchr.S Mon Jul 20 11:21:00 2009 @@ -1,111 +1,115 @@ -/* - * Written by J.T. Conklin j...@acorntoolworks.com - * Public domain. +/* $NetBSD: memchr.S,v 1.4 2009/07/20 15:21:00 christos Exp $ */ + +/*- + * Copyright (c) 2009 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by David Laight. + * + * 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. */ #include machine/asm.h #if defined(LIBC_SCCS) - RCSID($NetBSD: memchr.S,v 1.3 2009/07/19 23:45:29 christos Exp $) + RCSID($NetBSD: memchr.S,v 1.4 2009/07/20 15:21:00 christos Exp $) #endif -ENTRY(memchr) - movzbq %sil,%rcx - - /* - * Align to word boundary. - * Consider unrolling loop? - */ - testq %rdx,%rdx /* nbytes == 0? */ - je .Lzero -.Lalign: - testb $7,%dil - je .Lword_aligned - movq %rdi,%rax - cmpb (%rdi),%cl - je .Ldone - incq %rdi - decq %rdx - jnz .Lalign - jmp .Lzero - -.Lword_aligned: - /* copy char to all bytes in word */ - movb %cl,%ch - movq %rcx,%rsi - salq $16,%rcx - orq %rsi,%rcx - movq %rcx,%rsi - salq $32,%rcx - orq %rsi,%rcx +/* + * The instruction sequences used try to avoid data dependencies + * between adjacent instructions (to allow parallel execution). + * The 'imul' for %r9 could be put into the delay following the + * memory read (ie inside the loop) at no obvious cost - except + * that the loop is currently exactly 32 bytes - 2 fetch blocks!. + * + * I don't think aligning any of the other branch targets is useful. + */ +ENTRY(memchr) movabsq $0x0101010101010101,%r8 - movabsq $0x8080808080808080,%r9 + lea (%rdi,%rdx),%r10 /* limit of buffer to scan */ + movzbq %sil,%rsi /* mask high bits! */ - _ALIGN_TEXT -.Lloop: - cmpq $7,%rdx /* nbytes 8 */ - jbe .Lbyte - movq (%rdi),%rsi - addq $8,%rdi - xorq %rcx,%rsi - subq $8,%rdx - subq %r8,%rsi - testq %r9,%rsi - je .Lloop - - /* - * In rare cases,
CVS commit: src/external/bsd/openldap/dist/libraries/libldap
Module Name:src
Committed By: christos
Date: Mon Jul 20 15:32:33 UTC 2009
Modified Files:
src/external/bsd/openldap/dist/libraries/libldap: tls.c
Log Message:
catch up with openssl constification
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/openldap/dist/libraries/libldap/tls.c
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/openldap/dist/libraries/libldap/tls.c
diff -u src/external/bsd/openldap/dist/libraries/libldap/tls.c:1.1.1.2 src/external/bsd/openldap/dist/libraries/libldap/tls.c:1.2
--- src/external/bsd/openldap/dist/libraries/libldap/tls.c:1.1.1.2 Wed Jul 9 19:56:44 2008
+++ src/external/bsd/openldap/dist/libraries/libldap/tls.c Mon Jul 20 11:32:33 2009
@@ -2786,9 +2786,9 @@
ldap_pvt_tls_get_strength( void *s )
{
#ifdef HAVE_OPENSSL
- SSL_CIPHER *c;
+ const SSL_CIPHER *c;
- c = SSL_get_current_cipher((SSL *)s);
+ c = SSL_get_current_cipher((const SSL *)s);
return SSL_CIPHER_get_bits(c, NULL);
#elif defined(HAVE_GNUTLS)
tls_session *session = s;
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Mon Jul 20 15:33:44 UTC 2009
Modified Files:
src/crypto/external/bsd/openssh/dist: cipher-3des1.c cipher-bf1.c
cipher-ctr.c
Log Message:
catch up with openssl's abi change. do_cipher length changed from u_int to
size_t.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/cipher-3des1.c \
src/crypto/external/bsd/openssh/dist/cipher-bf1.c \
src/crypto/external/bsd/openssh/dist/cipher-ctr.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/openssh/dist/cipher-3des1.c
diff -u src/crypto/external/bsd/openssh/dist/cipher-3des1.c:1.2 src/crypto/external/bsd/openssh/dist/cipher-3des1.c:1.3
--- src/crypto/external/bsd/openssh/dist/cipher-3des1.c:1.2 Sun Jun 7 18:38:46 2009
+++ src/crypto/external/bsd/openssh/dist/cipher-3des1.c Mon Jul 20 11:33:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cipher-3des1.c,v 1.2 2009/06/07 22:38:46 christos Exp $ */
+/* $NetBSD: cipher-3des1.c,v 1.3 2009/07/20 15:33:44 christos Exp $ */
/* $OpenBSD: cipher-3des1.c,v 1.6 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include includes.h
-__RCSID($NetBSD: cipher-3des1.c,v 1.2 2009/06/07 22:38:46 christos Exp $);
+__RCSID($NetBSD: cipher-3des1.c,v 1.3 2009/07/20 15:33:44 christos Exp $);
#include sys/types.h
#include openssl/evp.h
@@ -95,7 +95,7 @@
}
static int
-ssh1_3des_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, u_int len)
+ssh1_3des_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, size_t len)
{
struct ssh1_3des_ctx *c;
Index: src/crypto/external/bsd/openssh/dist/cipher-bf1.c
diff -u src/crypto/external/bsd/openssh/dist/cipher-bf1.c:1.2 src/crypto/external/bsd/openssh/dist/cipher-bf1.c:1.3
--- src/crypto/external/bsd/openssh/dist/cipher-bf1.c:1.2 Sun Jun 7 18:38:46 2009
+++ src/crypto/external/bsd/openssh/dist/cipher-bf1.c Mon Jul 20 11:33:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cipher-bf1.c,v 1.2 2009/06/07 22:38:46 christos Exp $ */
+/* $NetBSD: cipher-bf1.c,v 1.3 2009/07/20 15:33:44 christos Exp $ */
/* $OpenBSD: cipher-bf1.c,v 1.5 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include includes.h
-__RCSID($NetBSD: cipher-bf1.c,v 1.2 2009/06/07 22:38:46 christos Exp $);
+__RCSID($NetBSD: cipher-bf1.c,v 1.3 2009/07/20 15:33:44 christos Exp $);
#include sys/types.h
#include openssl/evp.h
@@ -60,10 +60,10 @@
}
}
-static int (*orig_bf)(EVP_CIPHER_CTX *, u_char *, const u_char *, u_int) = NULL;
+static int (*orig_bf)(EVP_CIPHER_CTX *, u_char *, const u_char *, size_t) = NULL;
static int
-bf_ssh1_cipher(EVP_CIPHER_CTX *ctx, u_char *out, const u_char *in, u_int len)
+bf_ssh1_cipher(EVP_CIPHER_CTX *ctx, u_char *out, const u_char *in, size_t len)
{
int ret;
Index: src/crypto/external/bsd/openssh/dist/cipher-ctr.c
diff -u src/crypto/external/bsd/openssh/dist/cipher-ctr.c:1.2 src/crypto/external/bsd/openssh/dist/cipher-ctr.c:1.3
--- src/crypto/external/bsd/openssh/dist/cipher-ctr.c:1.2 Sun Jun 7 18:38:46 2009
+++ src/crypto/external/bsd/openssh/dist/cipher-ctr.c Mon Jul 20 11:33:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cipher-ctr.c,v 1.2 2009/06/07 22:38:46 christos Exp $ */
+/* $NetBSD: cipher-ctr.c,v 1.3 2009/07/20 15:33:44 christos Exp $ */
/* $OpenBSD: cipher-ctr.c,v 1.10 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright (c) 2003 Markus Friedl mar...@openbsd.org
@@ -17,7 +17,7 @@
*/
#include includes.h
-__RCSID($NetBSD: cipher-ctr.c,v 1.2 2009/06/07 22:38:46 christos Exp $);
+__RCSID($NetBSD: cipher-ctr.c,v 1.3 2009/07/20 15:33:44 christos Exp $);
#include sys/types.h
#include string.h
@@ -29,7 +29,7 @@
#include log.h
const EVP_CIPHER *evp_aes_128_ctr(void);
-void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
+void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t);
struct ssh_aes_ctr_ctx
{
@@ -43,7 +43,7 @@
* (LSB at ctr[len-1], MSB at ctr[0])
*/
static void
-ssh_ctr_inc(u_char *ctr, u_int len)
+ssh_ctr_inc(u_char *ctr, size_t len)
{
int i;
@@ -54,10 +54,10 @@
static int
ssh_aes_ctr(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src,
-u_int len)
+size_t len)
{
struct ssh_aes_ctr_ctx *c;
- u_int n = 0;
+ size_t n = 0;
u_char buf[AES_BLOCK_SIZE];
if (len == 0)
@@ -108,7 +108,7 @@
}
void
-ssh_aes_ctr_iv(EVP_CIPHER_CTX *evp, int doset, u_char * iv, u_int len)
+ssh_aes_ctr_iv(EVP_CIPHER_CTX *evp, int doset, u_char * iv, size_t len)
{
struct ssh_aes_ctr_ctx *c;
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/sha
Module Name:src Committed By: christos Date: Mon Jul 20 15:34:49 UTC 2009 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/sha: sha.h Log Message: make sha256/512 binary compatible with the libc version which we now use. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/crypto/sha/sha.h 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/openssl/dist/crypto/sha/sha.h diff -u src/crypto/external/bsd/openssl/dist/crypto/sha/sha.h:1.2 src/crypto/external/bsd/openssl/dist/crypto/sha/sha.h:1.3 --- src/crypto/external/bsd/openssl/dist/crypto/sha/sha.h:1.2 Sun Jul 19 19:30:41 2009 +++ src/crypto/external/bsd/openssl/dist/crypto/sha/sha.h Mon Jul 20 11:34:49 2009 @@ -136,7 +136,6 @@ SHA_LONG h[8]; SHA_LONG Nl,Nh; SHA_LONG data[SHA_LBLOCK]; - unsigned int num,md_len; } SHA256_CTX; #ifndef OPENSSL_NO_SHA256 @@ -182,7 +181,6 @@ SHA_LONG64 d[SHA_LBLOCK]; unsigned char p[SHA512_CBLOCK]; } u; - unsigned int num,md_len; } SHA512_CTX; #endif
CVS commit: src/external/bsd/bind
Module Name:src
Committed By: christos
Date: Mon Jul 20 15:40:05 UTC 2009
Modified Files:
src/external/bsd/bind: Makefile.inc
Log Message:
find the correct libcrypto
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/Makefile.inc
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/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.2 src/external/bsd/bind/Makefile.inc:1.3
--- src/external/bsd/bind/Makefile.inc:1.2 Mon Apr 13 17:20:40 2009
+++ src/external/bsd/bind/Makefile.inc Mon Jul 20 11:40:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2009/04/13 21:20:40 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2009/07/20 15:40:05 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -75,7 +75,7 @@
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
.else
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/lib/libcrypto
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
.endif
.endif
CVS commit: src/external/bsd/openldap/lib/libldap
Module Name:src
Committed By: christos
Date: Mon Jul 20 15:41:55 UTC 2009
Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap
Log Message:
depend on the proper libcrypto
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap
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/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.4 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.5
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.4 Mon Oct 27 03:26:29 2008
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap Mon Jul 20 11:41:55 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libldap,v 1.4 2008/10/27 07:26:29 mrg Exp $
+# $NetBSD: Makefile.libldap,v 1.5 2009/07/20 15:41:55 christos Exp $
.include ../../openldap.mk
@@ -26,6 +26,6 @@
LIBDPLIBS+= lber ${.CURDIR}/../liblber
.if ${MKCRYPTO} != no
-LIBDPLIBS+= crypto ${.CURDIR}/../../../../../lib/libcrypto
-LIBDPLIBS+= ssl ${.CURDIR}/../../../../../lib/libssl
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
.endif
CVS commit: src/crypto/external/bsd/netpgp/lib
Module Name:src
Committed By: christos
Date: Mon Jul 20 15:43:51 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/lib: Makefile
Log Message:
use the proper libcrypto
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/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/crypto/external/bsd/netpgp/lib/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/Makefile:1.6 src/crypto/external/bsd/netpgp/lib/Makefile:1.7
--- src/crypto/external/bsd/netpgp/lib/Makefile:1.6 Wed May 27 00:47:08 2009
+++ src/crypto/external/bsd/netpgp/lib/Makefile Mon Jul 20 11:43:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/27 04:47:08 agc Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/20 15:43:51 christos Exp $
.include bsd.own.mk
@@ -20,7 +20,7 @@
INCS+= netpgp.h
INCSDIR=/usr/include
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/lib/libcrypto
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
CVS commit: src/external/bsd/fetch/lib
Module Name:src
Committed By: christos
Date: Mon Jul 20 15:46:51 UTC 2009
Modified Files:
src/external/bsd/fetch/lib: Makefile
Log Message:
Use the correct libcrypto.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/fetch/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/bsd/fetch/lib/Makefile
diff -u src/external/bsd/fetch/lib/Makefile:1.3 src/external/bsd/fetch/lib/Makefile:1.4
--- src/external/bsd/fetch/lib/Makefile:1.3 Thu May 28 06:44:29 2009
+++ src/external/bsd/fetch/lib/Makefile Mon Jul 20 11:46:51 2009
@@ -20,8 +20,8 @@
LDADD= -lssl -lcrypto
-LIBDPLIBS+= ssl ${NETBSDSRCDIR}/lib/libssl \
- crypto ${NETBSDSRCDIR}/lib/libcrypto
+LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl \
+ crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
.endif
CLEANFILES+= ftperr.h httperr.h
CVS commit: src/crypto/external/bsd/openssh/lib
Module Name:src
Committed By: christos
Date: Mon Jul 20 15:48:16 UTC 2009
Modified Files:
src/crypto/external/bsd/openssh/lib: Makefile
Log Message:
use the proper libcrypto
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/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/crypto/external/bsd/openssh/lib/Makefile
diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.1 src/crypto/external/bsd/openssh/lib/Makefile:1.2
--- src/crypto/external/bsd/openssh/lib/Makefile:1.1 Sun Jun 7 18:38:48 2009
+++ src/crypto/external/bsd/openssh/lib/Makefile Mon Jul 20 11:48:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/07 22:38:48 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/20 15:48:16 christos Exp $
.include bsd.own.mk
@@ -23,7 +23,7 @@
CPPFLAGS+= -I${SSHDIST}
.PATH: ${SSHDIST}
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/lib/libcrypto \
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
crypt ${NETBSDSRCDIR}/lib/libcrypt \
z ${NETBSDSRCDIR}/lib/libz
CVS commit: src/sys/arch/pmax/pmax
Module Name:src
Committed By: tsutsui
Date: Mon Jul 20 16:25:23 UTC 2009
Modified Files:
src/sys/arch/pmax/pmax: dec_3100.c dec_3max.c dec_3maxplus.c dec_3min.c
dec_maxine.c
Log Message:
Sprinkle keyword volatile around device register accesses.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/pmax/pmax/dec_3100.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/pmax/pmax/dec_3max.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/pmax/pmax/dec_3maxplus.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/pmax/pmax/dec_3min.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/pmax/pmax/dec_maxine.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/pmax/pmax/dec_3100.c
diff -u src/sys/arch/pmax/pmax/dec_3100.c:1.47 src/sys/arch/pmax/pmax/dec_3100.c:1.48
--- src/sys/arch/pmax/pmax/dec_3100.c:1.47 Mon Mar 16 23:11:14 2009
+++ src/sys/arch/pmax/pmax/dec_3100.c Mon Jul 20 16:25:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3100.c,v 1.47 2009/03/16 23:11:14 dsl Exp $ */
+/* $NetBSD: dec_3100.c,v 1.48 2009/07/20 16:25:22 tsutsui Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -105,7 +105,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dec_3100.c,v 1.47 2009/03/16 23:11:14 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: dec_3100.c,v 1.48 2009/07/20 16:25:22 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -274,11 +274,11 @@
{
u_int16_t csr;
- csr = *(u_int16_t *)MIPS_PHYS_TO_KSEG1(KN01_SYS_CSR);
+ csr = *(volatile u_int16_t *)MIPS_PHYS_TO_KSEG1(KN01_SYS_CSR);
if (csr KN01_CSR_MERR) {
printf(Memory error at 0x%x\n,
- *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KN01_SYS_ERRADR));
+ *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KN01_SYS_ERRADR));
panic(Mem error interrupt);
}
csr = (csr ~KN01_CSR_MBZ) | 0xff;
Index: src/sys/arch/pmax/pmax/dec_3max.c
diff -u src/sys/arch/pmax/pmax/dec_3max.c:1.48 src/sys/arch/pmax/pmax/dec_3max.c:1.49
--- src/sys/arch/pmax/pmax/dec_3max.c:1.48 Mon Mar 16 23:11:14 2009
+++ src/sys/arch/pmax/pmax/dec_3max.c Mon Jul 20 16:25:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3max.c,v 1.48 2009/03/16 23:11:14 dsl Exp $ */
+/* $NetBSD: dec_3max.c,v 1.49 2009/07/20 16:25:22 tsutsui Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -106,7 +106,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: dec_3max.c,v 1.48 2009/03/16 23:11:14 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: dec_3max.c,v 1.49 2009/07/20 16:25:22 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -167,7 +167,7 @@
/* no high resolution timer available */
/* clear any memory errors */
- *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_ERRADR) = 0;
+ *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_ERRADR) = 0;
kn02_wbflush();
ipl2spl_table = dec_3max_ipl2spl_table;
@@ -179,9 +179,9 @@
* Enable ECC memory correction, turn off LEDs, and
* disable all TURBOchannel interrupts.
*/
- csr = *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR);
+ csr = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR);
csr = ~(KN02_CSR_WRESERVED|KN02_CSR_IOINTEN|KN02_CSR_CORRECT|0xff);
- *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR) = csr;
+ *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR) = csr;
kn02_wbflush();
strcpy(cpu_model, DECstation 5000/200 (3MAX));
@@ -197,10 +197,10 @@
* Reset interrupts, clear any errors from newconf probes
*/
- *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_ERRADR) = 0;
+ *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_ERRADR) = 0;
kn02_wbflush();
- *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CHKSYN) = 0;
+ *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CHKSYN) = 0;
kn02_wbflush();
}
@@ -263,9 +263,10 @@
intrtab[(int)cookie].ih_func = handler;
intrtab[(int)cookie].ih_arg = arg;
- csr = *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR) 0x0000;
+ csr = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR)
+ 0x0000;
csr |= (kn02intrs[i].intrbit 16);
- *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR) = csr;
+ *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR) = csr;
kn02_wbflush();
}
@@ -286,7 +287,7 @@
if (ipending MIPS_INT_MASK_1) {
struct clockframe cf;
- csr = *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR);
+ csr = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR);
if ((csr KN02_CSR_PSWARN) !warned) {
warned = 1;
printf(WARNING: power supply is overheating!\n);
@@ -310,7 +311,7 @@
_splset(MIPS_SR_INT_IE | (status MIPS_INT_MASK_1));
if (ipending MIPS_INT_MASK_0) {
- csr = *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR);
+ csr = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR);
csr = (csr KN02_CSR_IOINTEN_SHIFT);
if (csr (KN02_IP_DZ | KN02_IP_LANCE | KN02_IP_SCSI)) {
if (csr KN02_IP_DZ)
@@ -349,11 +350,11 @@
u_int32_t erradr,
CVS commit: src/sys/arch/pmax/pmax
Module Name:src
Committed By: tsutsui
Date: Mon Jul 20 16:45:50 UTC 2009
Modified Files:
src/sys/arch/pmax/pmax: memc_3min.c
Log Message:
Sprinkle keyword volatile around device register accesses.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/pmax/pmax/memc_3min.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/pmax/pmax/memc_3min.c
diff -u src/sys/arch/pmax/pmax/memc_3min.c:1.10 src/sys/arch/pmax/pmax/memc_3min.c:1.11
--- src/sys/arch/pmax/pmax/memc_3min.c:1.10 Sun Dec 11 12:18:39 2005
+++ src/sys/arch/pmax/pmax/memc_3min.c Mon Jul 20 16:45:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: memc_3min.c,v 1.10 2005/12/11 12:18:39 christos Exp $ */
+/* $NetBSD: memc_3min.c,v 1.11 2009/07/20 16:45:50 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -79,7 +79,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: memc_3min.c,v 1.10 2005/12/11 12:18:39 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: memc_3min.c,v 1.11 2009/07/20 16:45:50 tsutsui Exp $);
/*
* Motherboard memory error contoller used in both
@@ -105,12 +105,12 @@
int mer, adr, siz, err;
static int errintr_cnt = 0;
- siz = *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KMIN_REG_MSR);
- mer = *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KMIN_REG_MER);
- adr = *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KMIN_REG_AER);
+ siz = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KMIN_REG_MSR);
+ mer = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KMIN_REG_MER);
+ adr = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KMIN_REG_AER);
/* clear interrupt bit */
- *(u_int32_t *)MIPS_PHYS_TO_KSEG1(KMIN_REG_TIMEOUT) = 0;
+ *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(KMIN_REG_TIMEOUT) = 0;
err = 0; /* XXX gcc */
switch (mer KMIN_MER_LASTBYTE) {
CVS commit: src
Module Name:src Committed By: joerg Date: Mon Jul 20 17:03:38 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist src/include: stdlib.h src/lib/libc: shlib_version src/lib/libc/stdlib: Makefile.inc src/tests: Makefile Added Files: src/lib/libc/stdlib: mi_vector_hash.3 mi_vector_hash.c src/tests/lib: Atffile Makefile src/tests/lib/libc: Atffile Makefile src/tests/lib/libc/stdlib: Atffile Makefile t_mi_vector_hash.c Log Message: Add a fast, platform independent hash function to libc. The algorithm used is the Jenkins hash. The name (mi_vector_hash) reflects the nature of the hash function. Add glue for libc ATF tests and include a test case to make sure that (mis)alignment and endianess are handled correctly. Bump libc minor to 169. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.480 -r1.481 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1283 -r1.1284 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.405 -r1.406 src/etc/mtree/NetBSD.dist cvs rdiff -u -r1.88 -r1.89 src/include/stdlib.h cvs rdiff -u -r1.212 -r1.213 src/lib/libc/shlib_version cvs rdiff -u -r1.71 -r1.72 src/lib/libc/stdlib/Makefile.inc cvs rdiff -u -r0 -r1.1 src/lib/libc/stdlib/mi_vector_hash.3 \ src/lib/libc/stdlib/mi_vector_hash.c cvs rdiff -u -r1.15 -r1.16 src/tests/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/Atffile src/tests/lib/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/Atffile src/tests/lib/libc/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/stdlib/Atffile \ src/tests/lib/libc/stdlib/Makefile \ src/tests/lib/libc/stdlib/t_mi_vector_hash.c 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.58 src/distrib/sets/lists/base/md.amd64:1.59 --- src/distrib/sets/lists/base/md.amd64:1.58 Sun Jul 19 23:38:11 2009 +++ src/distrib/sets/lists/base/md.amd64 Mon Jul 20 17:03:36 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.58 2009/07/19 23:38:11 christos Exp $ +# $NetBSD: md.amd64,v 1.59 2009/07/20 17:03:36 joerg Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -64,7 +64,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.168 base-compat-shlib compat,pic +./usr/lib/i386/libc.so.12.169 base-compat-shlib compat,pic ./usr/lib/i386/libcom_err.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/i386/libcom_err.so.6.0 base-compat-shlib compat,pic,kerberos ./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.52 src/distrib/sets/lists/base/md.sparc64:1.53 --- src/distrib/sets/lists/base/md.sparc64:1.52 Sun Jul 19 23:38:11 2009 +++ src/distrib/sets/lists/base/md.sparc64 Mon Jul 20 17:03:36 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.52 2009/07/19 23:38:11 christos Exp $ +# $NetBSD: md.sparc64,v 1.53 2009/07/20 17:03:36 joerg Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin @@ -63,7 +63,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.168 base-compat-shlib compat,pic +./usr/lib/sparc/libc.so.12.169 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.480 src/distrib/sets/lists/base/shl.mi:1.481 --- src/distrib/sets/lists/base/shl.mi:1.480 Sun Jul 19 23:38:11 2009 +++ src/distrib/sets/lists/base/shl.mi Mon Jul 20 17:03:36 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.480 2009/07/19 23:38:11 christos Exp $ +# $NetBSD: shl.mi,v 1.481 2009/07/20 17:03:36 joerg 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.168base-sys-shlib dynamicroot +./lib/libc.so.12.169base-sys-shlib dynamicroot
CVS commit: src/sys/arch/pmax/pmax
Module Name:src
Committed By: tsutsui
Date: Mon Jul 20 17:05:13 UTC 2009
Modified Files:
src/sys/arch/pmax/pmax: autoconf.c bus_dma.c bus_space.c cpu.c
dec_3100.c dec_3max.c dec_3maxplus.c dec_3min.c dec_5100.c
dec_maxine.c disksubr.c mainbus.c memc.h memc_3max.c memc_3min.c
promcall.c
Log Message:
KNF, ANSIfy, and misc cosmetics.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/pmax/pmax/autoconf.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/pmax/pmax/bus_dma.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/pmax/pmax/bus_space.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/pmax/pmax/cpu.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/pmax/pmax/dec_3100.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/pmax/pmax/dec_3max.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/pmax/pmax/dec_3maxplus.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/pmax/pmax/dec_3min.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/pmax/pmax/dec_5100.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/pmax/pmax/dec_maxine.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/pmax/pmax/disksubr.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/pmax/pmax/mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/pmax/pmax/memc.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/pmax/pmax/memc_3max.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/pmax/pmax/memc_3min.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/pmax/pmax/promcall.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/pmax/pmax/autoconf.c
diff -u src/sys/arch/pmax/pmax/autoconf.c:1.73 src/sys/arch/pmax/pmax/autoconf.c:1.74
--- src/sys/arch/pmax/pmax/autoconf.c:1.73 Wed Mar 18 10:22:33 2009
+++ src/sys/arch/pmax/pmax/autoconf.c Mon Jul 20 17:05:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.73 2009/03/18 10:22:33 cegger Exp $ */
+/* $NetBSD: autoconf.c,v 1.74 2009/07/20 17:05:13 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
*/
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.73 2009/03/18 10:22:33 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.74 2009/07/20 17:05:13 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -111,6 +111,7 @@
void
cpu_configure(void)
{
+
/* Kick off autoconfiguration. */
(void)splhigh();
@@ -185,6 +186,7 @@
void
cpu_rootconf(void)
{
+
printf(boot device: %s\n,
booted_device ? booted_device-dv_xname : unknown);
Index: src/sys/arch/pmax/pmax/bus_dma.c
diff -u src/sys/arch/pmax/pmax/bus_dma.c:1.51 src/sys/arch/pmax/pmax/bus_dma.c:1.52
--- src/sys/arch/pmax/pmax/bus_dma.c:1.51 Sat Mar 14 21:04:14 2009
+++ src/sys/arch/pmax/pmax/bus_dma.c Mon Jul 20 17:05:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.51 2009/03/14 21:04:14 dsl Exp $ */
+/* $NetBSD: bus_dma.c,v 1.52 2009/07/20 17:05:13 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.51 2009/03/14 21:04:14 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.52 2009/07/20 17:05:13 tsutsui Exp $);
#include opt_cputype.h
@@ -90,7 +90,8 @@
* DMA map creation functions.
*/
int
-_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments, bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
+_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
+bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
struct pmax_bus_dmamap *map;
void *mapstore;
@@ -127,7 +128,7 @@
map-dm_nsegs = 0;
*dmamp = map;
- return (0);
+ return 0;
}
/*
@@ -148,16 +149,8 @@
* first indicates if this is the first invocation of this function.
*/
static int
-_bus_dmamap_load_buffer(map, buf, buflen, vm, flags,
-lastaddrp, segp, first)
- bus_dmamap_t map;
- void *buf;
- bus_size_t buflen;
- struct vmspace *vm;
- int flags;
- vaddr_t *lastaddrp;
- int *segp;
- int first;
+_bus_dmamap_load_buffer(bus_dmamap_t map, void *buf, bus_size_t buflen,
+struct vmspace *vm, int flags, vaddr_t *lastaddrp, int *segp, int first)
{
bus_size_t sgsize;
bus_addr_t curaddr, lastaddr, baddr, bmask;
@@ -231,9 +224,9 @@
* Did we fit?
*/
if (buflen != 0)
- return (EFBIG); /* XXX better return value here? */
+ return EFBIG; /* XXX better return value here? */
- return (0);
+ return 0;
}
/*
@@ -241,7 +234,8 @@
* buffer.
*/
int
-_bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen, struct proc *p, int flags)
+_bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
+bus_size_t buflen, struct proc *p, int flags)
{
vaddr_t lastaddr;
int seg, error;
@@ -255,7 +249,7 @@
KASSERT(map-dm_maxsegsz = map-_dm_maxmaxsegsz);
if (buflen map-_dm_size)
- return (EINVAL);
+ return EINVAL;
if (p != NULL) {
vm = p-p_vmspace;
@@ -281,14 +275,15 @@
buf (void
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Mon Jul 20 17:12:43 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: emul.c
Log Message:
realloc works much better if it actually uses realloc instead of malloc
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/rump/librump/rumpkern/emul.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/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.90 src/sys/rump/librump/rumpkern/emul.c:1.91
--- src/sys/rump/librump/rumpkern/emul.c:1.90 Tue Jun 9 14:30:06 2009
+++ src/sys/rump/librump/rumpkern/emul.c Mon Jul 20 17:12:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.90 2009/06/09 14:30:06 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.91 2009/07/20 17:12:43 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.90 2009/06/09 14:30:06 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.91 2009/07/20 17:12:43 pooka Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -292,7 +292,7 @@
kern_realloc(void *ptr, unsigned long size, struct malloc_type *type, int flags)
{
- return rumpuser_malloc(size, (flags (M_CANFAIL | M_NOWAIT)) != 0);
+ return rumpuser_realloc(ptr, size, (flags (M_CANFAIL|M_NOWAIT)) != 0);
}
void
CVS commit: src/lib/libgssapi
Module Name:src
Committed By: christos
Date: Mon Jul 20 17:28:51 UTC 2009
Modified Files:
src/lib/libgssapi: Makefile
Log Message:
use the proper libcrypto
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libgssapi/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/libgssapi/Makefile
diff -u src/lib/libgssapi/Makefile:1.21 src/lib/libgssapi/Makefile:1.22
--- src/lib/libgssapi/Makefile:1.21 Thu Aug 28 20:02:22 2008
+++ src/lib/libgssapi/Makefile Mon Jul 20 13:28:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/08/29 00:02:22 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.22 2009/07/20 17:28:51 christos Exp $
USE_FORT?= yes# network protocol library
@@ -21,7 +21,7 @@
asn1 ${.CURDIR}/../libasn1 \
com_err ${.CURDIR}/../libcom_err \
roken ${.CURDIR}/../libroken \
- crypto ${.CURDIR}/../libcrypto \
+ crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
heimntlm ${.CURDIR}/../libheimntlm
.if ${USETOOLS} != yes
CVS commit: src/lib/libpam/modules
Module Name:src
Committed By: christos
Date: Mon Jul 20 17:29:08 UTC 2009
Modified Files:
src/lib/libpam/modules/pam_afslog: Makefile
src/lib/libpam/modules/pam_krb5: Makefile
src/lib/libpam/modules/pam_ksu: Makefile
src/lib/libpam/modules/pam_ssh: Makefile
Log Message:
use the proper libcrypto
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libpam/modules/pam_afslog/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/libpam/modules/pam_krb5/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/libpam/modules/pam_ksu/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/libpam/modules/pam_ssh/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/libpam/modules/pam_afslog/Makefile
diff -u src/lib/libpam/modules/pam_afslog/Makefile:1.4 src/lib/libpam/modules/pam_afslog/Makefile:1.5
--- src/lib/libpam/modules/pam_afslog/Makefile:1.4 Mon Oct 27 03:57:41 2008
+++ src/lib/libpam/modules/pam_afslog/Makefile Mon Jul 20 13:29:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/10/27 07:57:41 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/20 17:29:08 christos Exp $
LIB= pam_afslog
SRCS= pam_afslog.c
@@ -10,6 +10,6 @@
roken ${.CURDIR}/../../../libroken \
com_err ${.CURDIR}/../../../libcom_err \
crypt ${.CURDIR}/../../../libcrypt \
- crypto ${.CURDIR}/../../../libcrypto
+ crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
.include ${.CURDIR}/../mod.mk
Index: src/lib/libpam/modules/pam_krb5/Makefile
diff -u src/lib/libpam/modules/pam_krb5/Makefile:1.8 src/lib/libpam/modules/pam_krb5/Makefile:1.9
--- src/lib/libpam/modules/pam_krb5/Makefile:1.8 Mon Oct 27 03:57:41 2008
+++ src/lib/libpam/modules/pam_krb5/Makefile Mon Jul 20 13:29:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/10/27 07:57:41 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/20 17:29:08 christos Exp $
# Copyright 2001 FreeBSD, Inc.
# All rights reserved.
#
@@ -34,6 +34,6 @@
roken ${.CURDIR}/../../../libroken \
com_err ${.CURDIR}/../../../libcom_err \
crypt ${.CURDIR}/../../../libcrypt \
- crypto ${.CURDIR}/../../../libcrypto
+ crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
.include ${.CURDIR}/../mod.mk
Index: src/lib/libpam/modules/pam_ksu/Makefile
diff -u src/lib/libpam/modules/pam_ksu/Makefile:1.8 src/lib/libpam/modules/pam_ksu/Makefile:1.9
--- src/lib/libpam/modules/pam_ksu/Makefile:1.8 Mon Oct 27 03:57:41 2008
+++ src/lib/libpam/modules/pam_ksu/Makefile Mon Jul 20 13:29:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/10/27 07:57:41 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/20 17:29:08 christos Exp $
# Copyright 2002 FreeBSD, Inc.
# All rights reserved.
#
@@ -34,6 +34,6 @@
roken ${.CURDIR}/../../../libroken \
com_err ${.CURDIR}/../../../libcom_err \
crypt ${.CURDIR}/../../../libcrypt \
- crypto ${.CURDIR}/../../../libcrypto
+ crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
.include ${.CURDIR}/../mod.mk
Index: src/lib/libpam/modules/pam_ssh/Makefile
diff -u src/lib/libpam/modules/pam_ssh/Makefile:1.8 src/lib/libpam/modules/pam_ssh/Makefile:1.9
--- src/lib/libpam/modules/pam_ssh/Makefile:1.8 Tue Jun 9 01:20:16 2009
+++ src/lib/libpam/modules/pam_ssh/Makefile Mon Jul 20 13:29:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/06/09 05:20:16 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/20 17:29:08 christos Exp $
# PAM module for SSH
# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.18 2004/08/06 07:27:04 cperciva Exp $
@@ -16,8 +16,8 @@
CPPFLAGS+= -I${SSHSRC}
-LIBDPLIBS+= ssh ${.CURDIR}/../../../../crypto/external/bsd/openssh/lib \
+LIBDPLIBS+= ssh ${NETBSDSRCDIR}/crypto/external/bsd/openssh/lib \
crypt ${.CURDIR}/../../../libcrypt \
- crypto ${.CURDIR}/../../../libcrypto
+ crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
.include ${.CURDIR}/../mod.mk
CVS commit: src
Module Name:src Committed By: christos Date: Mon Jul 20 17:30:54 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/lib: shlib_version src/crypto/external/bsd/openssh/lib: shlib_version src/crypto/external/bsd/openssl/lib/libcrypto: shlib_version src/crypto/external/bsd/openssl/lib/libssl: shlib_version src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.elf shl.mi src/external/bsd/bind/lib/libbind9: shlib_version src/external/bsd/bind/lib/libdns: shlib_version src/external/bsd/bind/lib/libisc: shlib_version src/external/bsd/bind/lib/libisccc: shlib_version src/external/bsd/bind/lib/libisccfg: shlib_version src/external/bsd/bind/lib/liblwres: shlib_version src/external/bsd/fetch/lib: shlib_version src/external/bsd/openldap/lib/libldap: shlib_version src/external/bsd/openldap/lib/libldap_r: shlib_version src/lib/libgssapi: shlib_version src/lib/libhdb: shlib_version src/lib/libheimntlm: shlib_version src/lib/libhx509: shlib_version src/lib/libkadm5clnt: shlib_version src/lib/libkadm5srv: shlib_version src/lib/libkafs: shlib_version src/lib/libkrb5: shlib_version src/lib/libpam: Makefile.inc src/lib/libradius: shlib_version Log Message: bump libcrypto and friends; OpenSSL abi change: do_cipher last argument changed from u_int to size_t. Affects _LP64 only. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/lib/shlib_version cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/lib/shlib_version cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libssl/shlib_version cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.178 -r1.179 src/distrib/sets/lists/base/shl.elf cvs rdiff -u -r1.481 -r1.482 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/lib/libbind9/shlib_version cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/lib/libdns/shlib_version cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/lib/libisc/shlib_version cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/lib/libisccc/shlib_version cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/lib/libisccfg/shlib_version cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/lib/liblwres/shlib_version cvs rdiff -u -r1.2 -r1.3 src/external/bsd/fetch/lib/shlib_version cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/lib/libldap/shlib_version cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/openldap/lib/libldap_r/shlib_version cvs rdiff -u -r1.10 -r1.11 src/lib/libgssapi/shlib_version cvs rdiff -u -r1.9 -r1.10 src/lib/libhdb/shlib_version cvs rdiff -u -r1.2 -r1.3 src/lib/libheimntlm/shlib_version cvs rdiff -u -r1.3 -r1.4 src/lib/libhx509/shlib_version cvs rdiff -u -r1.9 -r1.10 src/lib/libkadm5clnt/shlib_version cvs rdiff -u -r1.9 -r1.10 src/lib/libkadm5srv/shlib_version cvs rdiff -u -r1.12 -r1.13 src/lib/libkafs/shlib_version cvs rdiff -u -r1.16 -r1.17 src/lib/libkrb5/shlib_version cvs rdiff -u -r1.9 -r1.10 src/lib/libpam/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/lib/libradius/shlib_version 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/lib/shlib_version diff -u src/crypto/external/bsd/netpgp/lib/shlib_version:1.2 src/crypto/external/bsd/netpgp/lib/shlib_version:1.3 --- src/crypto/external/bsd/netpgp/lib/shlib_version:1.2 Wed May 27 00:46:33 2009 +++ src/crypto/external/bsd/netpgp/lib/shlib_version Mon Jul 20 13:30:52 2009 @@ -1,2 +1,2 @@ -major=1 +major=2 minor=0 Index: src/crypto/external/bsd/openssh/lib/shlib_version diff -u src/crypto/external/bsd/openssh/lib/shlib_version:1.1 src/crypto/external/bsd/openssh/lib/shlib_version:1.2 --- src/crypto/external/bsd/openssh/lib/shlib_version:1.1 Sun Jun 7 18:38:48 2009 +++ src/crypto/external/bsd/openssh/lib/shlib_version Mon Jul 20 13:30:52 2009 @@ -1,5 +1,5 @@ -# $NetBSD: shlib_version,v 1.1 2009/06/07 22:38:48 christos Exp $ +# $NetBSD: shlib_version,v 1.2 2009/07/20 17:30:52 christos Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # -major=13 +major=14 minor=0 Index: src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version diff -u src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version:1.2 --- src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version:1.1 Sun Jul 19 19:30:44 2009 +++ src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version Mon Jul 20 13:30:52 2009 @@ -1,7 +1,5 @@ -# $NetBSD: shlib_version,v 1.1 2009/07/19 23:30:44 christos Exp $ +# $NetBSD: shlib_version,v 1.2 2009/07/20 17:30:52 christos Exp $ # Remember to
CVS commit: src/usr.bin
Module Name:src
Committed By: christos
Date: Mon Jul 20 17:34:41 UTC 2009
Modified Files:
src/usr.bin: Makefile
Log Message:
openssl has moved
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/usr.bin/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.bin/Makefile
diff -u src/usr.bin/Makefile:1.176 src/usr.bin/Makefile:1.177
--- src/usr.bin/Makefile:1.176 Sun Jun 7 18:46:43 2009
+++ src/usr.bin/Makefile Mon Jul 20 13:34:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.176 2009/06/07 22:46:43 christos Exp $
+# $NetBSD: Makefile,v 1.177 2009/07/20 17:34:41 christos Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include bsd.own.mk
@@ -48,7 +48,6 @@
.endif
.if (${MKCRYPTO} != no)
-SUBDIR+= openssl
SUBDIR+= bdes
SUBDIR+= nbsvtool
.endif
CVS commit: src/usr.bin/ssh
Module Name:src Committed By: christos Date: Mon Jul 20 17:35:06 UTC 2009 Removed Files: src/usr.bin/ssh: Makefile Makefile.inc src/usr.bin/ssh/scp: Makefile src/usr.bin/ssh/sftp: Makefile src/usr.bin/ssh/sftp-server: Makefile src/usr.bin/ssh/ssh: Makefile src/usr.bin/ssh/ssh-add: Makefile src/usr.bin/ssh/ssh-agent: Makefile src/usr.bin/ssh/ssh-keygen: Makefile src/usr.bin/ssh/ssh-keyscan: Makefile src/usr.bin/ssh/ssh-keysign: Makefile src/usr.bin/ssh/sshd: Makefile Log Message: ssh has moved To generate a diff of this commit: cvs rdiff -u -r1.21 -r0 src/usr.bin/ssh/Makefile cvs rdiff -u -r1.19 -r0 src/usr.bin/ssh/Makefile.inc cvs rdiff -u -r1.4 -r0 src/usr.bin/ssh/scp/Makefile cvs rdiff -u -r1.12 -r0 src/usr.bin/ssh/sftp/Makefile cvs rdiff -u -r1.5 -r0 src/usr.bin/ssh/sftp-server/Makefile cvs rdiff -u -r1.30 -r0 src/usr.bin/ssh/ssh/Makefile cvs rdiff -u -r1.3 -r0 src/usr.bin/ssh/ssh-add/Makefile cvs rdiff -u -r1.3 -r0 src/usr.bin/ssh/ssh-agent/Makefile cvs rdiff -u -r1.4 -r0 src/usr.bin/ssh/ssh-keygen/Makefile cvs rdiff -u -r1.5 -r0 src/usr.bin/ssh/ssh-keyscan/Makefile cvs rdiff -u -r1.7 -r0 src/usr.bin/ssh/ssh-keysign/Makefile cvs rdiff -u -r1.31 -r0 src/usr.bin/ssh/sshd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libssh
Module Name:src Committed By: christos Date: Mon Jul 20 17:37:40 UTC 2009 Removed Files: src/lib/libssh: Makefile shlib_version Log Message: ssh has moved To generate a diff of this commit: cvs rdiff -u -r1.17 -r0 src/lib/libssh/Makefile cvs rdiff -u -r1.14 -r0 src/lib/libssh/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/dist/ssh
Module Name:src Committed By: christos Date: Mon Jul 20 17:39:06 UTC 2009 Removed Files: src/crypto/dist/ssh: HPN-README LICENCE Makefile Makefile.inc OVERVIEW PROTOCOL PROTOCOL.agent README README.smartcard addrmatch.c atomicio.c atomicio.h auth-bsdauth.c auth-chall.c auth-krb5.c auth-options.c auth-options.h auth-pam.c auth-pam.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-kbdint.c auth2-krb5.c auth2-none.c auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c authfile.h bufaux.c bufbn.c buffer.c buffer.h canohost.c canohost.h channels.c channels.h cipher-3des1.c cipher-bf1.c cipher-ctr-mt.c cipher-ctr.c cipher.c cipher.h cleanup.c clientloop.c clientloop.h compat.c compat.h compress.c compress.h crc32.c crc32.h deattack.c deattack.h dh.c dh.h dispatch.c dispatch.h dns.c dns.h fatal.c fmt_scaled.c fmt_scaled.h getpeereid.c getpeereid.h getrrsetbyname.c getrrsetbyname.h groupaccess.c groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c hostfile.h includes.h kex.c kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c key.h log.c log.h mac.c mac.h match.c match.h md-sha256.c misc.c misc.h moduli moduli.5 moduli.c monitor.c monitor.h monitor_fdpass.c monitor_fdpass.h monitor_mm.c monitor_mm.h monitor_wrap.c monitor_wrap.h msg.c msg.h mux.c myproposal.h namespace.h nchan.c nchan.ms nchan2.ms openssh2netbsd packet.c packet.h pathnames.h progressmeter.c progressmeter.h random.c random.h readconf.c readconf.h readpass.c readpassphrase.3 readpassphrase.c readpassphrase.h rsa.c rsa.h scard.c scard.h scp.1 scp.c servconf.c servconf.h serverloop.c serverloop.h session.c session.h sftp-client.c sftp-client.h sftp-common.c sftp-common.h sftp-glob.c sftp-server-main.c sftp-server.8 sftp-server.c sftp.1 sftp.c sftp.h ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-dss.c ssh-gss.h ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh-keysign.c ssh-rsa.c ssh.1 ssh.c ssh.h ssh1.h ssh2.h ssh_config ssh_config.5 sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c strtonum.c ttymodes.c ttymodes.h uidswap.c uidswap.h umac.c umac.h uuencode.c uuencode.h version.h xmalloc.c xmalloc.h src/crypto/dist/ssh/lib: Makefile src/crypto/dist/ssh/scard: Makefile Ssh.bin.uu Ssh.java src/crypto/dist/ssh/scp: Makefile src/crypto/dist/ssh/sftp: Makefile src/crypto/dist/ssh/sftp-server: Makefile src/crypto/dist/ssh/ssh: Makefile src/crypto/dist/ssh/ssh-add: Makefile src/crypto/dist/ssh/ssh-agent: Makefile src/crypto/dist/ssh/ssh-keygen: Makefile src/crypto/dist/ssh/ssh-keyscan: Makefile src/crypto/dist/ssh/sshd: Makefile Log Message: ssh has moved (a long time ago) To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/crypto/dist/ssh/HPN-README \ src/crypto/dist/ssh/fmt_scaled.c src/crypto/dist/ssh/fmt_scaled.h \ src/crypto/dist/ssh/getpeereid.h cvs rdiff -u -r1.4 -r0 src/crypto/dist/ssh/LICENCE \ src/crypto/dist/ssh/fatal.c src/crypto/dist/ssh/gss-serv-krb5.c \ src/crypto/dist/ssh/msg.h src/crypto/dist/ssh/rsa.c \ src/crypto/dist/ssh/scard.h src/crypto/dist/ssh/serverloop.h \ src/crypto/dist/ssh/sshconnect.h src/crypto/dist/ssh/uidswap.c cvs rdiff -u -r1.1.1.1 -r0 src/crypto/dist/ssh/Makefile \ src/crypto/dist/ssh/Makefile.inc src/crypto/dist/ssh/PROTOCOL \ src/crypto/dist/ssh/PROTOCOL.agent cvs rdiff -u -r1.1.1.4 -r0 src/crypto/dist/ssh/OVERVIEW cvs rdiff -u -r1.1.1.5 -r0 src/crypto/dist/ssh/README \ src/crypto/dist/ssh/nchan.ms cvs rdiff -u -r1.3 -r0 src/crypto/dist/ssh/README.smartcard \ src/crypto/dist/ssh/auth-pam.h src/crypto/dist/ssh/auth2-kbdint.c \ src/crypto/dist/ssh/cipher-ctr.c src/crypto/dist/ssh/cipher.h \ src/crypto/dist/ssh/deattack.h src/crypto/dist/ssh/dns.h \ src/crypto/dist/ssh/getpeereid.c src/crypto/dist/ssh/getrrsetbyname.c \ src/crypto/dist/ssh/key.h src/crypto/dist/ssh/match.h \ src/crypto/dist/ssh/md-sha256.c src/crypto/dist/ssh/monitor_fdpass.h \ src/crypto/dist/ssh/mux.c src/crypto/dist/ssh/namespace.h \ src/crypto/dist/ssh/ssh-gss.h src/crypto/dist/ssh/strtonum.c cvs rdiff -u -r1.2 -r0 src/crypto/dist/ssh/addrmatch.c \ src/crypto/dist/ssh/authfd.h src/crypto/dist/ssh/authfile.h \ src/crypto/dist/ssh/cipher-3des1.c src/crypto/dist/ssh/cipher-bf1.c \
CVS commit: src/sys/sys
Module Name:src Committed By: joerg Date: Mon Jul 20 17:46:04 UTC 2009 Modified Files: src/sys/sys: cdefs.h Log Message: Add __constfunc and explain how it differs from __pure. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/sys/cdefs.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/sys/cdefs.h diff -u src/sys/sys/cdefs.h:1.75 src/sys/sys/cdefs.h:1.76 --- src/sys/sys/cdefs.h:1.75 Tue May 12 13:41:44 2009 +++ src/sys/sys/cdefs.h Mon Jul 20 17:46:04 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.75 2009/05/12 13:41:44 reinoud Exp $ */ +/* $NetBSD: cdefs.h,v 1.76 2009/07/20 17:46:04 joerg Exp $ */ /* * Copyright (c) 1991, 1993 @@ -170,6 +170,19 @@ * GCC2 uses a new, peculiar __attribute__((attrs)) style. All of * these work for GNU C++ (modulo a slight glitch in the C++ grammar * in the distribution version of 2.5.5). + * + * GCC defines a pure function as depending only on its arguments and + * global variables. Typical examples are strlen and sqrt. + * + * GCC defines a const function as depending only on its arguments. + * Therefore calling a const function again with identical arguments + * will always produce the same result. + * + * Rounding modes for floating point operations are considered global + * variables and prevent sqrt from being a const function. + * + * Calls to const functions can be optimised away and moved around + * without limitations. */ #if !__GNUC_PREREQ__(2, 0) #define __attribute__(x) @@ -191,6 +204,12 @@ #define __pure #endif +#if __GNUC_PREREQ__(2, 5) +#define __constfunc __attribute__((__const__)) +#else +#define __constfunc +#endif + #if __GNUC_PREREQ__(3, 0) #define __noinline __attribute__((__noinline__)) #else
CVS commit: src/lib/libpam/modules/pam_ssh
Module Name:src
Committed By: christos
Date: Mon Jul 20 18:01:41 UTC 2009
Modified Files:
src/lib/libpam/modules/pam_ssh: Makefile
Log Message:
use new openssh tree
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libpam/modules/pam_ssh/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/libpam/modules/pam_ssh/Makefile
diff -u src/lib/libpam/modules/pam_ssh/Makefile:1.9 src/lib/libpam/modules/pam_ssh/Makefile:1.10
--- src/lib/libpam/modules/pam_ssh/Makefile:1.9 Mon Jul 20 13:29:08 2009
+++ src/lib/libpam/modules/pam_ssh/Makefile Mon Jul 20 14:01:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/07/20 17:29:08 christos Exp $
+# $NetBSD: Makefile,v 1.10 2009/07/20 18:01:41 christos Exp $
# PAM module for SSH
# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.18 2004/08/06 07:27:04 cperciva Exp $
@@ -8,7 +8,7 @@
.include bsd.own.mk
-SSHSRC= ${NETBSDSRCDIR}/crypto/dist/ssh
+SSHSRC= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
LIB= pam_ssh
MAN= pam_ssh.8
CVS commit: src/sys/rump/librump/rumpcrypto
Module Name:src
Committed By: pooka
Date: Mon Jul 20 18:03:26 UTC 2009
Added Files:
src/sys/rump/librump/rumpcrypto: Makefile Makefile.rumpcrypto
Log Message:
add crypto support for rump
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpcrypto/Makefile \
src/sys/rump/librump/rumpcrypto/Makefile.rumpcrypto
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/librump/rumpcrypto/Makefile
diff -u /dev/null src/sys/rump/librump/rumpcrypto/Makefile:1.1
--- /dev/null Mon Jul 20 18:03:26 2009
+++ src/sys/rump/librump/rumpcrypto/Makefile Mon Jul 20 18:03:26 2009
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2009/07/20 18:03:26 pooka Exp $
+#
+
+RUMPTOP=${.CURDIR}/../..
+.include ${RUMPTOP}/librump/rumpcrypto/Makefile.rumpcrypto
Index: src/sys/rump/librump/rumpcrypto/Makefile.rumpcrypto
diff -u /dev/null src/sys/rump/librump/rumpcrypto/Makefile.rumpcrypto:1.1
--- /dev/null Mon Jul 20 18:03:26 2009
+++ src/sys/rump/librump/rumpcrypto/Makefile.rumpcrypto Mon Jul 20 18:03:26 2009
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile.rumpcrypto,v 1.1 2009/07/20 18:03:26 pooka Exp $
+#
+
+.include ${RUMPTOP}/Makefile.rump
+
+LIB= rumpcrypto
+
+.PATH: ${RUMPTOP}/../crypto/arc4 \
+ ${RUMPTOP}/../crypto/blowfish \
+ ${RUMPTOP}/../crypto/cast128 \
+ ${RUMPTOP}/../crypto/des \
+ ${RUMPTOP}/../crypto/rijndael \
+ ${RUMPTOP}/../crypto/skipjack
+
+# arc4
+SRCS+= arc4.c
+
+# blowfish
+SRCS+= bf_ecb.c bf_enc.c bf_cbc.c bf_skey.c
+
+# cast128
+SRCS+= cast128.c
+
+# DES
+SRCS+= des_ecb.c des_setkey.c des_enc.c des_cbc.c
+
+# rijndael
+SRCS+= rijndael-alg-fst.c rijndael-api-fst.c rijndael.c
+
+# skipjack
+SRCS+= skipjack.c
+
+# automatically in sync src/lib
+SHLIB_MAJOR=0
+SHLIB_MINOR=0
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
+CPPFLAGS+= -Wno-pointer-sign
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
CVS commit: src/sys/rump/dev
Module Name:src
Committed By: pooka
Date: Mon Jul 20 18:09:20 UTC 2009
Modified Files:
src/sys/rump/dev: Makefile.rumpdev
Added Files:
src/sys/rump/dev/lib/libcgd: Makefile component.c shlib_version
Log Message:
Add cgd rump kernel component.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/Makefile.rumpdev
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libcgd/Makefile \
src/sys/rump/dev/lib/libcgd/component.c \
src/sys/rump/dev/lib/libcgd/shlib_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/rump/dev/Makefile.rumpdev
diff -u src/sys/rump/dev/Makefile.rumpdev:1.1 src/sys/rump/dev/Makefile.rumpdev:1.2
--- src/sys/rump/dev/Makefile.rumpdev:1.1 Tue Jun 9 16:16:15 2009
+++ src/sys/rump/dev/Makefile.rumpdev Mon Jul 20 18:09:20 2009
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpdev,v 1.1 2009/06/09 16:16:15 pooka Exp $
+# $NetBSD: Makefile.rumpdev,v 1.2 2009/07/20 18:09:20 pooka Exp $
#
-RUMPDEVLIST= disk raidframe
+RUMPDEVLIST= cgd disk raidframe
.for var in ${RUMPDEVLIST}
RUMPDEVLIBS+=lib${var}
Added files:
Index: src/sys/rump/dev/lib/libcgd/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libcgd/Makefile:1.1
--- /dev/null Mon Jul 20 18:09:20 2009
+++ src/sys/rump/dev/lib/libcgd/Makefile Mon Jul 20 18:09:20 2009
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2009/07/20 18:09:20 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../dev
+
+LIB= rumpdev_cgd
+
+SRCS= cgd.c cgd_crypto.c
+
+SRCS+= component.c
+
+CPPFLAGS+= -Wno-pointer-sign
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libcgd/component.c
diff -u /dev/null src/sys/rump/dev/lib/libcgd/component.c:1.1
--- /dev/null Mon Jul 20 18:09:20 2009
+++ src/sys/rump/dev/lib/libcgd/component.c Mon Jul 20 18:09:20 2009
@@ -0,0 +1,61 @@
+/* $NetBSD: component.c,v 1.1 2009/07/20 18:09:20 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee. 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: component.c,v 1.1 2009/07/20 18:09:20 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_dev_private.h
+
+void cgdattach(int);
+
+void
+rump_dev_cgd_init()
+{
+ extern const struct bdevsw cgd_bdevsw;
+ extern const struct cdevsw cgd_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ /* go, mydevfs */
+ bmaj = cmaj = -1;
+
+ if ((error = devsw_attach(cgd0, cgd_bdevsw, bmaj,
+ cgd_cdevsw, cmaj)) != 0)
+ panic(cannot attach cgd: %d, error);
+
+ if ((error = rump_dev_makenodes(S_IFBLK, cgd0, 'a', bmaj, 0, 7)) != 0)
+ panic(cannot create cooked cgd dev nodes: %d, error);
+ if ((error = rump_dev_makenodes(S_IFCHR, rcgd0,'a', cmaj, 0, 7)) != 0)
+ panic(cannot create raw cgd dev nodes: %d, error);
+
+ rump_pdev_add(cgdattach, 4);
+}
Index: src/sys/rump/dev/lib/libcgd/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libcgd/shlib_version:1.1
--- /dev/null Mon Jul 20 18:09:20 2009
+++ src/sys/rump/dev/lib/libcgd/shlib_version Mon Jul 20 18:09:20 2009
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2009/07/20 18:09:20 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/dist/ntp/ntpd
Module Name:src Committed By: christos Date: Mon Jul 20 18:44:09 UTC 2009 Modified Files: src/dist/ntp/ntpd: ntp_crypto.c Log Message: constify for new openssl To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/dist/ntp/ntpd/ntp_crypto.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/ntp/ntpd/ntp_crypto.c diff -u src/dist/ntp/ntpd/ntp_crypto.c:1.15 src/dist/ntp/ntpd/ntp_crypto.c:1.16 --- src/dist/ntp/ntpd/ntp_crypto.c:1.15 Tue May 19 21:37:36 2009 +++ src/dist/ntp/ntpd/ntp_crypto.c Mon Jul 20 14:44:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_crypto.c,v 1.15 2009/05/20 01:37:36 christos Exp $ */ +/* $NetBSD: ntp_crypto.c,v 1.16 2009/07/20 18:44:09 christos Exp $ */ /* * ntp_crypto.c - NTP version 4 public key routines @@ -3024,7 +3024,7 @@ X509_EXTENSION *ext; /* X509v3 extension */ struct cert_info *ret; /* certificate info/value */ BIO *bp; - X509V3_EXT_METHOD *method; + const X509V3_EXT_METHOD *method; char pathbuf[MAXFILENAME]; const u_char *uptr; char *ptr;
CVS commit: src/sys/sys
Module Name:src Committed By: joerg Date: Mon Jul 20 18:45:27 UTC 2009 Modified Files: src/sys/sys: bswap.h endian.h Log Message: Use __constfunc instead of __attribute__((__const__)). To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/sys/bswap.h cvs rdiff -u -r1.26 -r1.27 src/sys/sys/endian.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/sys/bswap.h diff -u src/sys/sys/bswap.h:1.14 src/sys/sys/bswap.h:1.15 --- src/sys/sys/bswap.h:1.14 Fri Jun 19 15:24:17 2009 +++ src/sys/sys/bswap.h Mon Jul 20 18:45:27 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: bswap.h,v 1.14 2009/06/19 15:24:17 christos Exp $ */ +/* $NetBSD: bswap.h,v 1.15 2009/07/20 18:45:27 joerg Exp $ */ /* Written by Manuel Bouyer. Public domain */ @@ -14,13 +14,13 @@ __BEGIN_DECLS /* Always declare the functions in case their address is taken (etc) */ #if defined(_KERNEL) || defined(_STANDALONE) || !defined(__BSWAP_RENAME) -uint16_t bswap16(uint16_t) __attribute__((__const__)); -uint32_t bswap32(uint32_t) __attribute__((__const__)); +uint16_t bswap16(uint16_t) __constfunc; +uint32_t bswap32(uint32_t) __constfunc; #else -uint16_t bswap16(uint16_t) __RENAME(__bswap16) __attribute__((__const__)); -uint32_t bswap32(uint32_t) __RENAME(__bswap32) __attribute__((__const__)); +uint16_t bswap16(uint16_t) __RENAME(__bswap16) __constfunc; +uint32_t bswap32(uint32_t) __RENAME(__bswap32) __constfunc; #endif -uint64_t bswap64(uint64_t) __attribute__((__const__)); +uint64_t bswap64(uint64_t) __constfunc; __END_DECLS #if defined(__GNUC__) defined(__OPTIMIZE__) !defined(__lint__) Index: src/sys/sys/endian.h diff -u src/sys/sys/endian.h:1.26 src/sys/sys/endian.h:1.27 --- src/sys/sys/endian.h:1.26 Fri Jul 20 15:07:15 2007 +++ src/sys/sys/endian.h Mon Jul 20 18:45:27 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: endian.h,v 1.26 2007/07/20 15:07:15 christos Exp $ */ +/* $NetBSD: endian.h,v 1.27 2009/07/20 18:45:27 joerg Exp $ */ /* * Copyright (c) 1987, 1991, 1993 @@ -65,10 +65,10 @@ #endif __BEGIN_DECLS -uint32_t htonl(uint32_t) __attribute__((__const__)); -uint16_t htons(uint16_t) __attribute__((__const__)); -uint32_t ntohl(uint32_t) __attribute__((__const__)); -uint16_t ntohs(uint16_t) __attribute__((__const__)); +uint32_t htonl(uint32_t) __constfunc; +uint16_t htons(uint16_t) __constfunc; +uint32_t ntohl(uint32_t) __constfunc; +uint16_t ntohs(uint16_t) __constfunc; __END_DECLS #endif /* !_LOCORE */
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: dyoung
Date: Mon Jul 20 19:11:30 UTC 2009
Modified Files:
src/sys/arch/x86/include: ipmivar.h
src/sys/arch/x86/x86: ipmi.c
Log Message:
Overhaul synchronization in ipmi(4): synchronize all access to
device registers with a mutex. Convert tsleep/wakeup calls to
cv_wait/cv_signal.
Do not repeatedly malloc/free tiny buffers for sending/receiving
commands, but reserve a command buffer in the softc.
Tickle the watchdog in the sensors-refreshing thread.
I am fairly certain that after the device is attached, every register
access happens in the sensors-refreshing thread. Moreover, no
software interrupt touches any register, now. So I may get rid of
the mutex that protects register accesses, sc_cmd_mtx.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/include/ipmivar.h
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/x86/ipmi.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/x86/include/ipmivar.h
diff -u src/sys/arch/x86/include/ipmivar.h:1.9 src/sys/arch/x86/include/ipmivar.h:1.10
--- src/sys/arch/x86/include/ipmivar.h:1.9 Mon Nov 3 12:25:53 2008
+++ src/sys/arch/x86/include/ipmivar.h Mon Jul 20 19:11:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmivar.h,v 1.9 2008/11/03 12:25:53 cegger Exp $ */
+/* $NetBSD: ipmivar.h,v 1.10 2009/07/20 19:11:30 dyoung Exp $ */
/*
* Copyright (c) 2005 Jordan Hargrave
@@ -28,6 +28,7 @@
*/
#include sys/mutex.h
+#include sys/condvar.h
#include dev/sysmon/sysmonvar.h
@@ -45,13 +46,6 @@
struct ipmi_thread;
struct ipmi_softc;
-struct ipmi_bmc_args{
- int offset;
- uint8_t mask;
- uint8_t value;
- volatile uint8_t *v;
-};
-
struct ipmi_attach_args {
bus_space_tag_t iaa_iot;
bus_space_tag_t iaa_memt;
@@ -92,22 +86,27 @@
struct lwp *sc_kthread;
- struct callout sc_callout;
int sc_max_retries;
- int sc_retries;
- int sc_wakeup;
- kmutex_t sc_lock;
+ kmutex_t sc_poll_mtx;
+ kcondvar_t sc_poll_cv;
+
+ kmutex_t sc_cmd_mtx;
+ kcondvar_t sc_cmd_sleep;
struct ipmi_bmc_args *sc_iowait_args;
struct ipmi_sensor *current_sensor;
- volatile int sc_thread_running;
+ volatile bool sc_thread_running;
+ volatile bool sc_tickle_due;
struct sysmon_wdog sc_wdog;
struct sysmon_envsys *sc_envsys;
envsys_data_t *sc_sensor;
int sc_nsensors; /* total number of sensors */
int sc_nsensors_typ[ENVSYS_NSENSORS]; /* number per type */
+
+ char sc_buf[64];
+ bool sc_buf_rsvd;
};
struct ipmi_thread {
@@ -115,26 +114,37 @@
volatile int running;
};
-#define IPMI_WDOG_USE_NLOG 0x80
-#define IPMI_WDOG_USE_NSTOP 0x40
-#define IPMI_WDOG_USE_USE_MASK 0x07
-#define IPMI_WDOG_USE_USE_FRB2 0x01
-#define IPMI_WDOG_USE_USE_POST 0x02
-#define IPMI_WDOG_USE_USE_OSLOAD 0x03
-#define IPMI_WDOG_USE_USE_OS 0x04
-#define IPMI_WDOG_USE_USE_EOM 0x05
-
-#define IPMI_WDOG_ACT_MASK 0x07
-#define IPMI_WDOG_ACT_DISABLED 0x00
-#define IPMI_WDOG_ACT_RESET 0x01
-#define IPMI_WDOG_ACT_PWROFF 0x02
-#define IPMI_WDOG_ACT_PWRCYCLE 0x03
-
-#define IPMI_WDOG_ACT_PRE_MASK 0x70
-#define IPMI_WDOG_ACT_PRE_DISABLED 0x00
-#define IPMI_WDOG_ACT_PRE_SMI 0x10
-#define IPMI_WDOG_ACT_PRE_NMI 0x20
-#define IPMI_WDOG_ACT_PRE_INTERRUPT 0x30
+#define IPMI_WDOG_USE_NOLOG __BIT(7)
+#define IPMI_WDOG_USE_NOSTOP __BIT(6)
+#define IPMI_WDOG_USE_RSVD1 __BITS(5, 3)
+#define IPMI_WDOG_USE_USE_MASK __BITS(2, 0)
+#define IPMI_WDOG_USE_USE_RSVD __SHIFTIN(0, IPMI_WDOG_USE_USE_MASK);
+#define IPMI_WDOG_USE_USE_FRB2 __SHIFTIN(1, IPMI_WDOG_USE_USE_MASK);
+#define IPMI_WDOG_USE_USE_POST __SHIFTIN(2, IPMI_WDOG_USE_USE_MASK);
+#define IPMI_WDOG_USE_USE_OSLOAD __SHIFTIN(3, IPMI_WDOG_USE_USE_MASK);
+#define IPMI_WDOG_USE_USE_OS __SHIFTIN(4, IPMI_WDOG_USE_USE_MASK);
+#define IPMI_WDOG_USE_USE_OEM __SHIFTIN(5, IPMI_WDOG_USE_USE_MASK);
+
+#define IPMI_WDOG_ACT_PRE_RSVD1 __BIT(7)
+#define IPMI_WDOG_ACT_PRE_MASK __BITS(6, 4)
+#define IPMI_WDOG_ACT_PRE_DISABLED __SHIFTIN(0, IPMI_WDOG_ACT_MASK)
+#define IPMI_WDOG_ACT_PRE_SMI __SHIFTIN(1, IPMI_WDOG_ACT_MASK)
+#define IPMI_WDOG_ACT_PRE_NMI __SHIFTIN(2, IPMI_WDOG_ACT_MASK)
+#define IPMI_WDOG_ACT_PRE_INTERRUPT __SHIFTIN(3, IPMI_WDOG_ACT_MASK)
+#define IPMI_WDOG_ACT_PRE_RSVD0 __BIT(3)
+#define IPMI_WDOG_ACT_MASK __BITS(2, 0)
+#define IPMI_WDOG_ACT_DISABLED __SHIFTIN(0, IPMI_WDOG_ACT_MASK)
+#define IPMI_WDOG_ACT_RESET __SHIFTIN(1, IPMI_WDOG_ACT_MASK)
+#define IPMI_WDOG_ACT_PWROFF __SHIFTIN(2, IPMI_WDOG_ACT_MASK)
+#define IPMI_WDOG_ACT_PWRCYCLE __SHIFTIN(3, IPMI_WDOG_ACT_MASK)
+
+#define IPMI_WDOG_FLAGS_RSVD1 __BITS(7, 6)
+#define IPMI_WDOG_FLAGS_OEM __BIT(5)
+#define IPMI_WDOG_FLAGS_OS __BIT(4)
+#define IPMI_WDOG_FLAGS_OSLOAD __BIT(3)
+#define IPMI_WDOG_FLAGS_POST __BIT(2)
+#define IPMI_WDOG_FLAGS_FRB2 __BIT(1)
+#define IPMI_WDOG_FLAGS_RSVD0 __BIT(0)
struct ipmi_set_watchdog {
uint8_t wdog_use;
Index:
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: dyoung Date: Mon Jul 20 19:25:07 UTC 2009 Modified Files: src/sys/arch/x86/x86: ipmi.c Log Message: In ipmi_match(), initialize the condition variable sc_cmd_sleep. Fixes a bug in previous, exposed by # drvctl -d ipmi0 # drvctl -r -a ipmibus mainbus0 *lockdebug panic here* To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/x86/ipmi.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/x86/x86/ipmi.c diff -u src/sys/arch/x86/x86/ipmi.c:1.39 src/sys/arch/x86/x86/ipmi.c:1.40 --- src/sys/arch/x86/x86/ipmi.c:1.39 Mon Jul 20 19:11:30 2009 +++ src/sys/arch/x86/x86/ipmi.c Mon Jul 20 19:25:07 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ipmi.c,v 1.39 2009/07/20 19:11:30 dyoung Exp $ */ +/* $NetBSD: ipmi.c,v 1.40 2009/07/20 19:25:07 dyoung Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -57,7 +57,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ipmi.c,v 1.39 2009/07/20 19:11:30 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: ipmi.c,v 1.40 2009/07/20 19:25:07 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -1790,6 +1790,7 @@ sc.sc_if-probe(sc); mutex_init(sc.sc_cmd_mtx, MUTEX_DEFAULT, IPL_SOFTCLOCK); + cv_init(sc.sc_cmd_sleep, ipmimatch); mutex_enter(sc.sc_cmd_mtx); /* Identify BMC device early to detect lying bios */ if (ipmi_sendcmd(sc, BMC_SA, 0, APP_NETFN, APP_GET_DEVICE_ID, @@ -1809,6 +1810,7 @@ dbg_dump(1, bmc data, len, cmd); rv = 1; /* GETID worked, we got IPMI */ unmap: + cv_destroy(sc.sc_cmd_sleep); mutex_destroy(sc.sc_cmd_mtx); ipmi_unmap_regs(sc);
CVS commit: src/rescue
Module Name:src Committed By: christos Date: Mon Jul 20 19:59:23 UTC 2009 Modified Files: src/rescue: list.crypto Log Message: use the new ssh To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/rescue/list.crypto Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list.crypto diff -u src/rescue/list.crypto:1.7 src/rescue/list.crypto:1.8 --- src/rescue/list.crypto:1.7 Mon Jun 23 10:53:06 2008 +++ src/rescue/list.crypto Mon Jul 20 15:59:22 2009 @@ -1,10 +1,10 @@ -# $NetBSD: list.crypto,v 1.7 2008/06/23 14:53:06 christos Exp $ +# $NetBSD: list.crypto,v 1.8 2009/07/20 19:59:22 christos Exp $ PROG cgdconfig PROG scp PROG ssh slogin -SPECIAL scp srcdir usr.bin/ssh/scp -SPECIAL ssh srcdir usr.bin/ssh/ssh +SPECIAL scp srcdir crypto/external/bsd/openssh/bin/scp +SPECIAL ssh srcdir crypto/external/bsd/openssh/bin/ssh LIBS -lssh -lcrypto
CVS commit: src/compat/crypto/external/bsd/openssl/lib
Module Name:src
Committed By: christos
Date: Mon Jul 20 20:19:49 UTC 2009
Modified Files:
src/compat/crypto/external/bsd/openssl/lib: Makefile
Log Message:
reference the regular Makefile directly instead of copying it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/crypto/external/bsd/openssl/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/crypto/external/bsd/openssl/lib/Makefile
diff -u src/compat/crypto/external/bsd/openssl/lib/Makefile:1.1 src/compat/crypto/external/bsd/openssl/lib/Makefile:1.2
--- src/compat/crypto/external/bsd/openssl/lib/Makefile:1.1 Sun Jul 19 19:36:49 2009
+++ src/compat/crypto/external/bsd/openssl/lib/Makefile Mon Jul 20 16:19:48 2009
@@ -1,26 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/07/19 23:36:49 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/20 20:19:48 christos Exp $
.include bsd.own.mk
-.if (${MKCRYPTO} != no)
-
-# OpenSSL libraries.
-SUBDIR= libcrypto libdes
-
-.if (${MKCRYPTO_IDEA} != no)
-SUBDIR+= libcrypto_idea
-.endif # MKCRYPTO_IDEA != no
-
-.if (${MKCRYPTO_MDC2} != no)
-SUBDIR+= libcrypto_mdc2
-.endif # MKCRYPTO_MDC2 != no
-
-.if (${MKCRYPTO_RC5} != no)
-SUBDIR+= libcrypto_rc5
-.endif # MKCRYPTO_RC5 != no
-
-SUBDIR+= libssl # depends on libcrypto
-
-.endif # MKCRYPTO != no
-
-.include bsd.subdir.mk
+.include ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/Makefile
CVS commit: src/crypto/external/bsd/openssl/dist/crypto
Module Name:src
Committed By: christos
Date: Mon Jul 20 20:41:06 UTC 2009
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/conf: test.c
src/crypto/external/bsd/openssl/dist/crypto/des: destest.c
src/crypto/external/bsd/openssl/dist/crypto/lhash: lh_test.c
src/crypto/external/bsd/openssl/dist/crypto/md2: md2test.c
src/crypto/external/bsd/openssl/dist/crypto/threads: mttest.c
src/crypto/external/bsd/openssl/dist/crypto/x509v3: tabtest.c
Log Message:
make tests compile!
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/conf/test.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/des/destest.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/lhash/lh_test.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/md2/md2test.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/x509v3/tabtest.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/openssl/dist/crypto/conf/test.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/conf/test.c:1.1.1.1 src/crypto/external/bsd/openssl/dist/crypto/conf/test.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/conf/test.c:1.1.1.1 Sun Jul 19 19:03:31 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/conf/test.c Mon Jul 20 16:41:05 2009
@@ -63,7 +63,7 @@
main()
{
- LHASH *conf;
+ LHASH_OF(CONF_VALUE) *conf;
long eline;
char *s,*s2;
@@ -78,9 +78,9 @@
ERR_print_errors_fp(stderr);
exit(1);
}
- lh_stats(conf,stdout);
- lh_node_stats(conf,stdout);
- lh_node_usage_stats(conf,stdout);
+ lh_stats((_LHASH *)conf,stdout);
+ lh_node_stats((_LHASH *)conf,stdout);
+ lh_node_usage_stats((_LHASH *)conf,stdout);
s=CONF_get_string(conf,NULL,init2);
printf(init2=%s\n,(s == NULL)?NULL:s);
Index: src/crypto/external/bsd/openssl/dist/crypto/des/destest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/des/destest.c:1.2 src/crypto/external/bsd/openssl/dist/crypto/des/destest.c:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/des/destest.c:1.2 Sun Jul 19 19:30:39 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/des/destest.c Mon Jul 20 16:41:05 2009
@@ -327,7 +327,7 @@
static int ede_cfb64_test(unsigned char *cfb_cipher);
int main(int argc, char *argv[])
{
- int i,j,err=0;
+ int j,err=0;
unsigned int i;
DES_cblock in,out,outin,iv3,iv2;
DES_key_schedule ks,ks2,ks3;
@@ -406,8 +406,8 @@
memcpy(in,plain_data[i],8);
memset(out,0,8);
memset(outin,0,8);
- DES_ecb_encrypt(in,out,ks,DES_ENCRYPT);
- DES_ecb_encrypt(out,outin,ks,DES_DECRYPT);
+ DES_ecb_encrypt(in,out,ks,DES_ENCRYPT);
+ DES_ecb_encrypt(out,outin,ks,DES_DECRYPT);
if (memcmp(out,cipher_data[i],8) != 0)
{
@@ -434,8 +434,8 @@
memcpy(in,plain_data[i],8);
memset(out,0,8);
memset(outin,0,8);
- DES_ecb2_encrypt(in,out,ks,ks2,DES_ENCRYPT);
- DES_ecb2_encrypt(out,outin,ks,ks2,DES_DECRYPT);
+ DES_ecb2_encrypt(in,out,ks,ks2,DES_ENCRYPT);
+ DES_ecb2_encrypt(out,outin,ks,ks2,DES_DECRYPT);
if (memcmp(out,cipher_ecb2[i],8) != 0)
{
@@ -462,7 +462,7 @@
memset(cbc_out,0,40);
memset(cbc_in,0,40);
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
- DES_ncbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,ks,
+ DES_ncbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,ks,
iv3,DES_ENCRYPT);
if (memcmp(cbc_out,cbc_ok,32) != 0)
{
@@ -471,7 +471,7 @@
}
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
- DES_ncbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,
+ DES_ncbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,
iv3,DES_DECRYPT);
if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)) != 0)
{
@@ -489,7 +489,7 @@
memset(cbc_out,0,40);
memset(cbc_in,0,40);
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
- DES_xcbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,ks,
+ DES_xcbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,ks,
iv3,cbc2_key,cbc3_key, DES_ENCRYPT);
if (memcmp(cbc_out,xcbc_ok,32) != 0)
{
@@ -497,7 +497,7 @@
err=1;
}
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
- DES_xcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,
+ DES_xcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,
iv3,cbc2_key,cbc3_key, DES_DECRYPT);
if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
{
@@ -528,9 +528,9 @@
/* i=((i+7)/8)*8; */
memcpy(iv3,cbc_iv,sizeof(cbc_iv));
- DES_ede3_cbc_encrypt(cbc_data,cbc_out,16L,ks,ks2,ks3,iv3,
+ DES_ede3_cbc_encrypt(cbc_data,cbc_out,16L,ks,ks2,ks3,iv3,
DES_ENCRYPT);
- DES_ede3_cbc_encrypt((cbc_data[16]),(cbc_out[16]),i-16,ks,ks2,ks3,
+ DES_ede3_cbc_encrypt((cbc_data[16]),(cbc_out[16]),i-16,ks,ks2,ks3,
iv3,DES_ENCRYPT);
if
CVS commit: src/tests/crypto/libcrypto
Module Name:src
Committed By: christos
Date: Mon Jul 20 20:41:52 UTC 2009
Modified Files:
src/tests/crypto/libcrypto: Makefile.inc
Log Message:
fix for new openssl
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/libcrypto/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/libcrypto/Makefile.inc
diff -u src/tests/crypto/libcrypto/Makefile.inc:1.1 src/tests/crypto/libcrypto/Makefile.inc:1.2
--- src/tests/crypto/libcrypto/Makefile.inc:1.1 Fri Feb 13 15:58:14 2009
+++ src/tests/crypto/libcrypto/Makefile.inc Mon Jul 20 16:41:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/02/13 20:58:14 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.2 2009/07/20 20:41:52 christos Exp $
.include bsd.own.mk
@@ -18,8 +18,8 @@
LDADD+= -lcrypto -lcrypt
CPPFLAGS+= -DOPENSSL_FIPS
-CPPFLAGS+= -I${OPENSSLSRC}
-CRYPTODIST= ${NETBSDSRCDIR}/crypto/dist
+CPPFLAGS+= -I${OPENSSLSRC} -I${OPENSSLSRC}/crypto
+CRYPTODIST= ${NETBSDSRCDIR}/crypto
.include ${NETBSDSRCDIR}/crypto/Makefile.openssl
.PATH: ${OPENSSLSRC}/crypto/${HELPER_DIR}
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Mon Jul 20 21:03:43 UTC 2009
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
moduli moved with openssh
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.99 src/usr.sbin/postinstall/postinstall:1.100
--- src/usr.sbin/postinstall/postinstall:1.99 Tue Jun 23 13:58:30 2009
+++ src/usr.sbin/postinstall/postinstall Mon Jul 20 17:03:42 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.99 2009/06/23 17:58:30 tron Exp $
+# $NetBSD: postinstall,v 1.100 2009/07/20 21:03:42 christos Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1192,7 +1192,7 @@
fi
if ! find_file_in_dirlist moduli moduli \
- ${SRC_DIR}/crypto/dist/ssh ${SRC_DIR}/etc ; then
+ ${SRC_DIR}/crypto/external/bsd/openssh/dist ${SRC_DIR}/etc ; then
failed=1
# ${dir} is set by find_file_in_dirlist()
elif ! compare_dir ${op} ${dir} ${DEST_DIR}/etc 444 moduli; then
CVS commit: src/usr.bin/lex
Module Name:src
Committed By: christos
Date: Mon Jul 20 21:13:28 UTC 2009
Modified Files:
src/usr.bin/lex: flex.skl initscan.c
Log Message:
ansi prototypes for yyinput.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/lex/flex.skl
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/lex/initscan.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/lex/flex.skl
diff -u src/usr.bin/lex/flex.skl:1.23 src/usr.bin/lex/flex.skl:1.24
--- src/usr.bin/lex/flex.skl:1.23 Mon Apr 20 12:01:17 2009
+++ src/usr.bin/lex/flex.skl Mon Jul 20 17:13:28 2009
@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $NetBSD: flex.skl,v 1.23 2009/04/20 16:01:17 drochner Exp $
+ * $NetBSD: flex.skl,v 1.24 2009/07/20 21:13:28 christos Exp $
*/
#define FLEX_SCANNER
@@ -989,12 +989,12 @@
%-
#ifndef YY_NO_INPUT
#ifdef __cplusplus
-static int yyinput()
+static int yyinput(void)
#else
-static int input()
+static int input(void)
#endif
%+
-int yyFlexLexer::yyinput()
+int yyFlexLexer::yyinput(void)
%*
{
int c;
Index: src/usr.bin/lex/initscan.c
diff -u src/usr.bin/lex/initscan.c:1.17 src/usr.bin/lex/initscan.c:1.18
--- src/usr.bin/lex/initscan.c:1.17 Tue Dec 2 01:22:14 2003
+++ src/usr.bin/lex/initscan.c Mon Jul 20 17:13:28 2009
@@ -2,7 +2,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $NetBSD: initscan.c,v 1.17 2003/12/02 06:22:14 lukem Exp $
+ * $NetBSD: initscan.c,v 1.18 2009/07/20 21:13:28 christos Exp $
*/
#define FLEX_SCANNER
@@ -1274,7 +1274,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $NetBSD: initscan.c,v 1.17 2003/12/02 06:22:14 lukem Exp $ */
+/* $NetBSD: initscan.c,v 1.18 2009/07/20 21:13:28 christos Exp $ */
#include flexdef.h
#include parse.h
@@ -3141,9 +3141,9 @@
#ifdef __cplusplus
-static int yyinput()
+static int yyinput(void)
#else
-static int input()
+static int input(void)
#endif
{
int c;
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: snj
Date: Tue Jul 21 00:21:21 UTC 2009
Modified Files:
src/sys/kern [netbsd-5-0]: sys_mqueue.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #857):
sys/kern/sys_mqueue.c: revision 1.21 via patch
mq_send/mq_receive: while permission may allow that, return EBADF if sending
to read-only queue, or receiving from write-only queue.
From Stathis Kamperis, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1.2.2 -r1.12.4.1.2.3 src/sys/kern/sys_mqueue.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_mqueue.c
diff -u src/sys/kern/sys_mqueue.c:1.12.4.1.2.2 src/sys/kern/sys_mqueue.c:1.12.4.1.2.3
--- src/sys/kern/sys_mqueue.c:1.12.4.1.2.2 Wed May 27 21:33:50 2009
+++ src/sys/kern/sys_mqueue.c Tue Jul 21 00:21:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_mqueue.c,v 1.12.4.1.2.2 2009/05/27 21:33:50 snj Exp $ */
+/* $NetBSD: sys_mqueue.c,v 1.12.4.1.2.3 2009/07/21 00:21:21 snj Exp $ */
/*
* Copyright (c) 2007, 2008 Mindaugas Rasiukevicius rmind at NetBSD org
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_mqueue.c,v 1.12.4.1.2.2 2009/05/27 21:33:50 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_mqueue.c,v 1.12.4.1.2.3 2009/07/21 00:21:21 snj Exp $);
#include sys/param.h
#include sys/types.h
@@ -482,9 +482,14 @@
/* Get the message queue */
error = mqueue_get(mqdes, fp);
- if (error)
+ if (error) {
return error;
+ }
mq = fp-f_data;
+ if ((fp-f_flag FREAD) == 0) {
+ error = EBADF;
+ goto error;
+ }
/* Check the message size limits */
if (msg_len mq-mq_attrib.mq_msgsize) {
@@ -642,6 +647,10 @@
return error;
}
mq = fp-f_data;
+ if ((fp-f_flag FWRITE) == 0) {
+ error = EBADF;
+ goto error;
+ }
/* Check the message size limit */
if (msg_len = 0 || msg_len mq-mq_attrib.mq_msgsize) {
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: snj
Date: Tue Jul 21 00:23:01 UTC 2009
Modified Files:
src/sys/kern [netbsd-5]: sys_mqueue.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #857):
sys/kern/sys_mqueue.c: revision 1.21 via patch
mq_send/mq_receive: while permission may allow that, return EBADF if sending
to read-only queue, or receiving from write-only queue.
From Stathis Kamperis, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.12.4.3 -r1.12.4.4 src/sys/kern/sys_mqueue.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_mqueue.c
diff -u src/sys/kern/sys_mqueue.c:1.12.4.3 src/sys/kern/sys_mqueue.c:1.12.4.4
--- src/sys/kern/sys_mqueue.c:1.12.4.3 Wed May 27 21:32:05 2009
+++ src/sys/kern/sys_mqueue.c Tue Jul 21 00:23:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_mqueue.c,v 1.12.4.3 2009/05/27 21:32:05 snj Exp $ */
+/* $NetBSD: sys_mqueue.c,v 1.12.4.4 2009/07/21 00:23:01 snj Exp $ */
/*
* Copyright (c) 2007, 2008 Mindaugas Rasiukevicius rmind at NetBSD org
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_mqueue.c,v 1.12.4.3 2009/05/27 21:32:05 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_mqueue.c,v 1.12.4.4 2009/07/21 00:23:01 snj Exp $);
#include sys/param.h
#include sys/types.h
@@ -482,9 +482,14 @@
/* Get the message queue */
error = mqueue_get(mqdes, fp);
- if (error)
+ if (error) {
return error;
+ }
mq = fp-f_data;
+ if ((fp-f_flag FREAD) == 0) {
+ error = EBADF;
+ goto error;
+ }
/* Check the message size limits */
if (msg_len mq-mq_attrib.mq_msgsize) {
@@ -642,6 +647,10 @@
return error;
}
mq = fp-f_data;
+ if ((fp-f_flag FWRITE) == 0) {
+ error = EBADF;
+ goto error;
+ }
/* Check the message size limit */
if (msg_len = 0 || msg_len mq-mq_attrib.mq_msgsize) {
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Tue Jul 21 00:23:02 UTC 2009
Modified Files:
src/compat: build-makefiles
Log Message:
fix the generated from id.
don't generate some subdir makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/build-makefiles
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/build-makefiles
diff -u src/compat/build-makefiles:1.6 src/compat/build-makefiles:1.7
--- src/compat/build-makefiles:1.6 Tue Jul 21 00:12:00 2009
+++ src/compat/build-makefiles Tue Jul 21 00:23:02 2009
@@ -21,8 +21,13 @@
}
for _dir in ${CHECK_SUBDIRS}; do
+
+ # set this to true if the needs to be no master subdir Makefile
+ _need_no_subdir=false
+
if [ ${_dir} = lib/csu ]; then
_subdirs=i386_elf sparc_elf
+ _need_no_subdir=true
else
_subdirs=`cd ${srcdir}/${_dir}; ${MAKE} -V SUBDIR`
fi
@@ -40,7 +45,7 @@
fi
# skip a bunch of non-lib subdirs --
- case $_dir/$_sd in
+ case $_dir in
external/bsd/fetch | \
external/bsd/file | \
external/bsd/iscsi | \
@@ -50,6 +55,7 @@
if [ $_sd != lib ]; then
continue;
fi
+ _need_no_subdir=true
esac
_libdplibs=`cd ${srcdir}/${_dir}/${_sd}; ${MAKE} -V LIBDPLIBS | sed 's,\({NETBSDSRCDIR}\),\1/compat,g'`
@@ -59,7 +65,7 @@
(
echo -n '# $Net'
echo 'BSD$'
- echo '# Generated from: $NetBSD: build-makefiles,v 1.6 2009/07/21 00:12:00 mrg Exp $' | sed -e 's/$//g'
+ echo '# Generated from: $NetBSD: build-makefiles,v 1.7 2009/07/21 00:23:02 mrg Exp $' | sed -e 's/\$//g'
cat 'EOF'
NOLINT= # defined
@@ -125,7 +131,7 @@
) ${rwsrcdir}/compat/${_dir}/${_sd}/Makefile
done
- if [ ${_dir} != lib/csu ]; then
+ if [ ${_need_no_subdir} != true ]; then
(printf '# $'NetBSD'$\n\n'
printf .include bsd.own.mk\n\n
printf _CURDIR:= \${.CURDIR}\n\n
CVS commit: src/etc
Module Name:src
Committed By: mrg
Date: Tue Jul 21 00:28:35 UTC 2009
Modified Files:
src/etc: Makefile
Log Message:
enter the right bin/ssh subdir for configinstall.
HI CHRISTOS!
To generate a diff of this commit:
cvs rdiff -u -r1.367 -r1.368 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.367 src/etc/Makefile:1.368
--- src/etc/Makefile:1.367 Tue Jun 23 17:58:23 2009
+++ src/etc/Makefile Tue Jul 21 00:28:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.367 2009/06/23 17:58:23 tron Exp $
+# $NetBSD: Makefile,v 1.368 2009/07/21 00:28:35 mrg Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -347,7 +347,7 @@
${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.sbin/pf configinstall
.endif
.if (${MKCRYPTO} != no)
- ${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.bin/ssh configinstall
+ ${MAKEDIRTARGET} ${NETBSDSRCDIR}/crypto/external/bsd/openssh/bin/ssh configinstall
.endif
.if (${MKPOSTFIX} != no)
${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/ibm-public/postfix configinstall
CVS commit: [netbsd-5-0] src/sys
Module Name:src
Committed By: snj
Date: Tue Jul 21 00:29:33 UTC 2009
Modified Files:
src/sys/kern [netbsd-5-0]: vfs_subr.c
src/sys/sys [netbsd-5-0]: vnode.h
Log Message:
Pull up following revision(s) (requested by rmind in ticket #863):
sys/sys/vnode.h: revision 1.207
sys/kern/vfs_subr.c: revision 1.379
put a flag bit into v_usecount to prevent vtryget during getcleanvnode.
this fixes the following deadlock.
a thread doing getcleanvnode:
pick a vnode
acqure v_interlock
v_usecount++
call vclean
now, another thread doing cache_lookup:
picks the vnode
vtryget succeed
vn_lock succeed
now in vclean:
set VI_XLOCK (too late to be noticed by the competing thread)
wait on the vnode lock (this might violate locking order)
the use of a flag bit was suggested by Andrew Doran. PR/41374.
To generate a diff of this commit:
cvs rdiff -u -r1.357.4.4 -r1.357.4.4.2.1 src/sys/kern/vfs_subr.c
cvs rdiff -u -r1.197 -r1.197.10.1 src/sys/sys/vnode.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/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.357.4.4 src/sys/kern/vfs_subr.c:1.357.4.4.2.1
--- src/sys/kern/vfs_subr.c:1.357.4.4 Mon Feb 16 03:33:16 2009
+++ src/sys/kern/vfs_subr.c Tue Jul 21 00:29:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.357.4.4 2009/02/16 03:33:16 snj Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.357.4.4.2.1 2009/07/21 00:29:32 snj Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -76,12 +76,22 @@
* change from a non-zero value to zero, again the interlock must be
* held.
*
- * Changing the usecount from a non-zero value to a non-zero value can
- * safely be done using atomic operations, without the interlock held.
+ * There's a flag bit, VC_XLOCK, embedded in v_usecount.
+ * To raise v_usecount, if the VC_XLOCK bit is set in it, the interlock
+ * must be held.
+ * To modify the VC_XLOCK bit, the interlock must be held.
+ * We always keep the usecount (v_usecount VC_MASK) non-zero while the
+ * VC_XLOCK bit is set.
+ *
+ * Unless the VC_XLOCK bit is set, changing the usecount from a non-zero
+ * value to a non-zero value can safely be done using atomic operations,
+ * without the interlock held.
+ * Even if the VC_XLOCK bit is set, decreasing the usecount to a non-zero
+ * value can be done using atomic operations, without the interlock held.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.357.4.4 2009/02/16 03:33:16 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.357.4.4.2.1 2009/07/21 00:29:32 snj Exp $);
#include opt_ddb.h
#include opt_compat_netbsd.h
@@ -366,8 +376,10 @@
* before doing this. If the vnode gains another reference while
* being cleaned out then we lose - retry.
*/
- atomic_inc_uint(vp-v_usecount);
+ atomic_add_int(vp-v_usecount, 1 + VC_XLOCK);
vclean(vp, DOCLOSE);
+ KASSERT(vp-v_usecount = 1 + VC_XLOCK);
+ atomic_add_int(vp-v_usecount, -VC_XLOCK);
if (vp-v_usecount == 1) {
/* We're about to dirty it. */
vp-v_iflag = ~VI_CLEAN;
@@ -1221,7 +1233,7 @@
return false;
}
for (use = vp-v_usecount;; use = next) {
- if (use == 0) {
+ if (use == 0 || __predict_false((use VC_XLOCK) != 0)) {
/* Need interlock held if first reference. */
return false;
}
@@ -1310,9 +1322,10 @@
u_int use, next;
for (use = vp-v_usecount;; use = next) {
- if (use == 1) {
+ if (use == 1) {
return false;
}
+ KASSERT((use VC_MASK) 1);
next = atomic_cas_uint(vp-v_usecount, use, use - 1);
if (__predict_true(next == use)) {
return true;
Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.197 src/sys/sys/vnode.h:1.197.10.1
--- src/sys/sys/vnode.h:1.197 Thu Jul 31 05:38:06 2008
+++ src/sys/sys/vnode.h Tue Jul 21 00:29:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.h,v 1.197 2008/07/31 05:38:06 simonb Exp $ */
+/* $NetBSD: vnode.h,v 1.197.10.1 2009/07/21 00:29:32 snj Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -249,6 +249,12 @@
#define VSIZENOTSET ((voff_t)-1)
/*
+ * v_usecount; see the comment in vfs_subr.c
+ */
+#define VC_XLOCK 0x8000
+#define VC_MASK 0x7fff
+
+/*
* Vnode attributes. A field value of VNOVAL represents a field whose value
* is unavailable (getattr) or which is not to be changed (setattr).
*/
CVS commit: [netbsd-5] src/sys
Module Name:src
Committed By: snj
Date: Tue Jul 21 00:31:58 UTC 2009
Modified Files:
src/sys/kern [netbsd-5]: vfs_subr.c
src/sys/sys [netbsd-5]: vnode.h
Log Message:
Pull up following revision(s) (requested by rmind in ticket #863):
sys/sys/vnode.h: revision 1.207
sys/kern/vfs_subr.c: revision 1.379
put a flag bit into v_usecount to prevent vtryget during getcleanvnode.
this fixes the following deadlock.
a thread doing getcleanvnode:
pick a vnode
acqure v_interlock
v_usecount++
call vclean
now, another thread doing cache_lookup:
picks the vnode
vtryget succeed
vn_lock succeed
now in vclean:
set VI_XLOCK (too late to be noticed by the competing thread)
wait on the vnode lock (this might violate locking order)
the use of a flag bit was suggested by Andrew Doran. PR/41374.
To generate a diff of this commit:
cvs rdiff -u -r1.357.4.4 -r1.357.4.5 src/sys/kern/vfs_subr.c
cvs rdiff -u -r1.197 -r1.197.4.1 src/sys/sys/vnode.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/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.357.4.4 src/sys/kern/vfs_subr.c:1.357.4.5
--- src/sys/kern/vfs_subr.c:1.357.4.4 Mon Feb 16 03:33:16 2009
+++ src/sys/kern/vfs_subr.c Tue Jul 21 00:31:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.357.4.4 2009/02/16 03:33:16 snj Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.357.4.5 2009/07/21 00:31:58 snj Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -76,12 +76,22 @@
* change from a non-zero value to zero, again the interlock must be
* held.
*
- * Changing the usecount from a non-zero value to a non-zero value can
- * safely be done using atomic operations, without the interlock held.
+ * There's a flag bit, VC_XLOCK, embedded in v_usecount.
+ * To raise v_usecount, if the VC_XLOCK bit is set in it, the interlock
+ * must be held.
+ * To modify the VC_XLOCK bit, the interlock must be held.
+ * We always keep the usecount (v_usecount VC_MASK) non-zero while the
+ * VC_XLOCK bit is set.
+ *
+ * Unless the VC_XLOCK bit is set, changing the usecount from a non-zero
+ * value to a non-zero value can safely be done using atomic operations,
+ * without the interlock held.
+ * Even if the VC_XLOCK bit is set, decreasing the usecount to a non-zero
+ * value can be done using atomic operations, without the interlock held.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.357.4.4 2009/02/16 03:33:16 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.357.4.5 2009/07/21 00:31:58 snj Exp $);
#include opt_ddb.h
#include opt_compat_netbsd.h
@@ -366,8 +376,10 @@
* before doing this. If the vnode gains another reference while
* being cleaned out then we lose - retry.
*/
- atomic_inc_uint(vp-v_usecount);
+ atomic_add_int(vp-v_usecount, 1 + VC_XLOCK);
vclean(vp, DOCLOSE);
+ KASSERT(vp-v_usecount = 1 + VC_XLOCK);
+ atomic_add_int(vp-v_usecount, -VC_XLOCK);
if (vp-v_usecount == 1) {
/* We're about to dirty it. */
vp-v_iflag = ~VI_CLEAN;
@@ -1221,7 +1233,7 @@
return false;
}
for (use = vp-v_usecount;; use = next) {
- if (use == 0) {
+ if (use == 0 || __predict_false((use VC_XLOCK) != 0)) {
/* Need interlock held if first reference. */
return false;
}
@@ -1310,9 +1322,10 @@
u_int use, next;
for (use = vp-v_usecount;; use = next) {
- if (use == 1) {
+ if (use == 1) {
return false;
}
+ KASSERT((use VC_MASK) 1);
next = atomic_cas_uint(vp-v_usecount, use, use - 1);
if (__predict_true(next == use)) {
return true;
Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.197 src/sys/sys/vnode.h:1.197.4.1
--- src/sys/sys/vnode.h:1.197 Thu Jul 31 05:38:06 2008
+++ src/sys/sys/vnode.h Tue Jul 21 00:31:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.h,v 1.197 2008/07/31 05:38:06 simonb Exp $ */
+/* $NetBSD: vnode.h,v 1.197.4.1 2009/07/21 00:31:58 snj Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -249,6 +249,12 @@
#define VSIZENOTSET ((voff_t)-1)
/*
+ * v_usecount; see the comment in vfs_subr.c
+ */
+#define VC_XLOCK 0x8000
+#define VC_MASK 0x7fff
+
+/*
* Vnode attributes. A field value of VNOVAL represents a field whose value
* is unavailable (getattr) or which is not to be changed (setattr).
*/
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Tue Jul 21 00:33:28 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
the consumers expect the aiodone workqueue to be mpsafe. make it so.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/rump/librump/rumpkern/rump.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/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.109 src/sys/rump/librump/rumpkern/rump.c:1.110
--- src/sys/rump/librump/rumpkern/rump.c:1.109 Fri May 22 08:34:15 2009
+++ src/sys/rump/librump/rumpkern/rump.c Tue Jul 21 00:33:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.109 2009/05/22 08:34:15 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.110 2009/07/21 00:33:28 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.109 2009/05/22 08:34:15 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.110 2009/07/21 00:33:28 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -256,7 +256,7 @@
/* aidondest */
if (rump_threads) {
if (workqueue_create(uvm.aiodone_queue, aiodoned,
- rump_aiodone_worker, NULL, 0, 0, 0))
+ rump_aiodone_worker, NULL, 0, 0, WQ_MPSAFE))
panic(aiodoned);
}
CVS commit: src/usr.sbin/puffs
Module Name:src
Committed By: pooka
Date: Tue Jul 21 00:37:25 UTC 2009
Modified Files:
src/usr.sbin/puffs: Makefile.inc
src/usr.sbin/puffs/rump_lfs: Makefile rump_lfs.c
Log Message:
Make rump_lfs work again: load fs components dynamically instead
of trying to link them in on the command line and get pounded by
link set failage.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/puffs/rump_lfs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_lfs/rump_lfs.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.sbin/puffs/Makefile.inc
diff -u src/usr.sbin/puffs/Makefile.inc:1.10 src/usr.sbin/puffs/Makefile.inc:1.11
--- src/usr.sbin/puffs/Makefile.inc:1.10 Sun Jan 18 20:42:11 2009
+++ src/usr.sbin/puffs/Makefile.inc Tue Jul 21 00:37:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2009/01/18 20:42:11 he Exp $
+# $NetBSD: Makefile.inc,v 1.11 2009/07/21 00:37:25 pooka Exp $
.include bsd.own.mk
.include bsd.sys.mk
@@ -22,6 +22,7 @@
# on select archs use the kernel module directly, otherwise fallback
# to the rump library
+.ifndef DONOTLINKLIBS
.undef RUMPKMOD
.ifdef RUMPKMOD
OSRELEASE!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
@@ -30,6 +31,7 @@
.else
LDADD+= -lrumpfs_${MOUNTNAME}
.endif
+.endif
.PATH: ${MOUNT} ${MOUNTDIR}/mount_${MOUNTNAME}
.endif # MOUNTNAME
Index: src/usr.sbin/puffs/rump_lfs/Makefile
diff -u src/usr.sbin/puffs/rump_lfs/Makefile:1.4 src/usr.sbin/puffs/rump_lfs/Makefile:1.5
--- src/usr.sbin/puffs/rump_lfs/Makefile:1.4 Sat May 2 01:15:53 2009
+++ src/usr.sbin/puffs/rump_lfs/Makefile Tue Jul 21 00:37:25 2009
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2009/05/02 01:15:53 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/21 00:37:25 pooka Exp $
#
.include bsd.own.mk
MOUNTNAME= lfs
-
-LDADD+= -lrumpfs_ffs
-DPADD+= ${LIBRUMPFS_FFS}
+DONOTLINKLIBS= # FFS and LFS loaded dynamically
ISRUMP= # don't deny it
Index: src/usr.sbin/puffs/rump_lfs/rump_lfs.c
diff -u src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.3 src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.4
--- src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.3 Thu Sep 4 15:34:55 2008
+++ src/usr.sbin/puffs/rump_lfs/rump_lfs.c Tue Jul 21 00:37:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_lfs.c,v 1.3 2008/09/04 15:34:55 pooka Exp $ */
+/* $NetBSD: rump_lfs.c,v 1.4 2009/07/21 00:37:25 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -36,6 +36,7 @@
#include unistd.h
#include rump/p2k.h
+#include rump/ukfs.h
#include mount_lfs.h
@@ -49,6 +50,16 @@
setprogname(argv[0]);
+ /*
+ * Load FFS and LFS already here. we need both and link set
+ * lossage does not allow them to be linked on the command line.
+ */
+ ukfs_init();
+ if (ukfs_modload(/usr/lib/librumpfs_ffs.so) != 1)
+ err(1, modload ffs);
+ if (ukfs_modload(/usr/lib/librumpfs_lfs.so) != 1)
+ err(1, modload lfs);
+
mount_lfs_parseargs(argc, argv, args, mntflags, canon_dev, canon_dir);
rv = p2k_run_fs(MOUNT_LFS, canon_dev, canon_dir, mntflags,
args, sizeof(args), 0);
CVS commit: [netbsd-5-0] src/sys/arch/amd64/amd64
Module Name:src
Committed By: snj
Date: Tue Jul 21 00:37:30 UTC 2009
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-5-0]: trap.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #865):
sys/arch/amd64/amd64/trap.c: revisions 1.56, 1.57
handle protection fault properly.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.6.1 src/sys/arch/amd64/amd64/trap.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/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.52 src/sys/arch/amd64/amd64/trap.c:1.52.6.1
--- src/sys/arch/amd64/amd64/trap.c:1.52 Wed Oct 15 06:51:17 2008
+++ src/sys/arch/amd64/amd64/trap.c Tue Jul 21 00:37:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.52 2008/10/15 06:51:17 wrstuden Exp $ */
+/* $NetBSD: trap.c,v 1.52.6.1 2009/07/21 00:37:29 snj Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.52 2008/10/15 06:51:17 wrstuden Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.52.6.1 2009/07/21 00:37:29 snj Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -325,26 +325,35 @@
case T_STKFLT|T_USER:
case T_ALIGNFLT|T_USER:
#ifdef TRAP_SIGDEBUG
- printf(pid %d (%s): BUS (%x) at rip %lx addr %lx\n,
+ printf(pid %d (%s): BUS/SEGV (%x) at rip %lx addr %lx\n,
p-p_pid, p-p_comm, type, frame-tf_rip, rcr2());
frame_dump(frame);
#endif
KSI_INIT_TRAP(ksi);
- ksi.ksi_signo = SIGBUS;
ksi.ksi_trap = type ~T_USER;
ksi.ksi_addr = (void *)rcr2();
switch (type) {
case T_SEGNPFLT|T_USER:
case T_STKFLT|T_USER:
+ ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_ADRERR;
break;
case T_TSSFLT|T_USER:
+ ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_OBJERR;
break;
case T_ALIGNFLT|T_USER:
+ ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_ADRALN;
break;
+ case T_PROTFLT|T_USER:
+ ksi.ksi_signo = SIGSEGV;
+ ksi.ksi_code = SEGV_ACCERR;
+ break;
default:
+#ifdef DIAGNOSTIC
+ panic(unhandled type %x\n, type);
+#endif
break;
}
goto trapsignal;
@@ -368,6 +377,9 @@
ksi.ksi_code = ILL_COPROC;
break;
default:
+#ifdef DIAGNOSTIC
+ panic(unhandled type %x\n, type);
+#endif
break;
}
goto trapsignal;
@@ -414,6 +426,9 @@
ksi.ksi_code = FPE_FLTDIV;
break;
default:
+#ifdef DIAGNOSTIC
+ panic(unhandled type %x\n, type);
+#endif
break;
}
goto trapsignal;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Tue Jul 21 00:38:26 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.1 Log Message: Tickets 857, 863, and 865. To generate a diff of this commit: cvs rdiff -u -r1.1.2.38 -r1.1.2.39 src/doc/CHANGES-5.0.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.0.1 diff -u src/doc/CHANGES-5.0.1:1.1.2.38 src/doc/CHANGES-5.0.1:1.1.2.39 --- src/doc/CHANGES-5.0.1:1.1.2.38 Sun Jul 19 19:50:36 2009 +++ src/doc/CHANGES-5.0.1 Tue Jul 21 00:38:26 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.1,v 1.1.2.38 2009/07/19 19:50:36 snj Exp $ +# $NetBSD: CHANGES-5.0.1,v 1.1.2.39 2009/07/21 00:38:26 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1 release: @@ -638,3 +638,21 @@ 3) Fix many problems and panic on TBI's cards (includes PR#32009). [msaitoh, ticket #862] +sys/kern/sys_mqueue.c1.21 via patch + + mq_send/mq_receive: while permission may allow that, return EBADF + if sending to read-only queue, or receiving from write-only queue. + [rmind, ticket #857] + +sys/kern/vfs_subr.c1.379 +sys/sys/vnode.h 1.207 + + Put a flag bit into v_usecount to prevent vtryget during + getcleanvnode. Fixes PR/41374. + [rmind, ticket #863] + +sys/arch/amd64/amd64/trap.c 1.56, 1.57 + + Handle protection fault properly. + [rmind, ticket #865] +
CVS commit: [netbsd-5] src/sys/arch/amd64/amd64
Module Name:src
Committed By: snj
Date: Tue Jul 21 00:40:13 UTC 2009
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-5]: trap.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #865):
sys/arch/amd64/amd64/trap.c: revisions 1.56, 1.57
handle protection fault properly.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.4.1 src/sys/arch/amd64/amd64/trap.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/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.52 src/sys/arch/amd64/amd64/trap.c:1.52.4.1
--- src/sys/arch/amd64/amd64/trap.c:1.52 Wed Oct 15 06:51:17 2008
+++ src/sys/arch/amd64/amd64/trap.c Tue Jul 21 00:40:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.52 2008/10/15 06:51:17 wrstuden Exp $ */
+/* $NetBSD: trap.c,v 1.52.4.1 2009/07/21 00:40:13 snj Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.52 2008/10/15 06:51:17 wrstuden Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.52.4.1 2009/07/21 00:40:13 snj Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -325,26 +325,35 @@
case T_STKFLT|T_USER:
case T_ALIGNFLT|T_USER:
#ifdef TRAP_SIGDEBUG
- printf(pid %d (%s): BUS (%x) at rip %lx addr %lx\n,
+ printf(pid %d (%s): BUS/SEGV (%x) at rip %lx addr %lx\n,
p-p_pid, p-p_comm, type, frame-tf_rip, rcr2());
frame_dump(frame);
#endif
KSI_INIT_TRAP(ksi);
- ksi.ksi_signo = SIGBUS;
ksi.ksi_trap = type ~T_USER;
ksi.ksi_addr = (void *)rcr2();
switch (type) {
case T_SEGNPFLT|T_USER:
case T_STKFLT|T_USER:
+ ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_ADRERR;
break;
case T_TSSFLT|T_USER:
+ ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_OBJERR;
break;
case T_ALIGNFLT|T_USER:
+ ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_ADRALN;
break;
+ case T_PROTFLT|T_USER:
+ ksi.ksi_signo = SIGSEGV;
+ ksi.ksi_code = SEGV_ACCERR;
+ break;
default:
+#ifdef DIAGNOSTIC
+ panic(unhandled type %x\n, type);
+#endif
break;
}
goto trapsignal;
@@ -368,6 +377,9 @@
ksi.ksi_code = ILL_COPROC;
break;
default:
+#ifdef DIAGNOSTIC
+ panic(unhandled type %x\n, type);
+#endif
break;
}
goto trapsignal;
@@ -414,6 +426,9 @@
ksi.ksi_code = FPE_FLTDIV;
break;
default:
+#ifdef DIAGNOSTIC
+ panic(unhandled type %x\n, type);
+#endif
break;
}
goto trapsignal;
CVS commit: src/usr.sbin/puffs/rump_lfs
Module Name:src Committed By: pooka Date: Tue Jul 21 00:40:44 UTC 2009 Modified Files: src/usr.sbin/puffs/rump_lfs: rump_lfs.c Log Message: don't need absolute paths for fs component names To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/puffs/rump_lfs/rump_lfs.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.sbin/puffs/rump_lfs/rump_lfs.c diff -u src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.4 src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.5 --- src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.4 Tue Jul 21 00:37:25 2009 +++ src/usr.sbin/puffs/rump_lfs/rump_lfs.c Tue Jul 21 00:40:44 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_lfs.c,v 1.4 2009/07/21 00:37:25 pooka Exp $ */ +/* $NetBSD: rump_lfs.c,v 1.5 2009/07/21 00:40:44 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -55,9 +55,9 @@ * lossage does not allow them to be linked on the command line. */ ukfs_init(); - if (ukfs_modload(/usr/lib/librumpfs_ffs.so) != 1) + if (ukfs_modload(librumpfs_ffs.so) != 1) err(1, modload ffs); - if (ukfs_modload(/usr/lib/librumpfs_lfs.so) != 1) + if (ukfs_modload(librumpfs_lfs.so) != 1) err(1, modload lfs); mount_lfs_parseargs(argc, argv, args, mntflags, canon_dev, canon_dir);
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Tue Jul 21 00:41:04 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 857, 863, and 865. To generate a diff of this commit: cvs rdiff -u -r1.1.2.49 -r1.1.2.50 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.49 src/doc/CHANGES-5.1:1.1.2.50 --- src/doc/CHANGES-5.1:1.1.2.49 Sat Jul 18 21:39:10 2009 +++ src/doc/CHANGES-5.1 Tue Jul 21 00:41:04 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.49 2009/07/18 21:39:10 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.50 2009/07/21 00:41:04 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -1587,3 +1587,21 @@ handling independent of delayed ACK. [is, ticket #859] +sys/kern/sys_mqueue.c1.21 via patch + + mq_send/mq_receive: while permission may allow that, return EBADF + if sending to read-only queue, or receiving from write-only queue. + [rmind, ticket #857] + +sys/kern/vfs_subr.c1.379 +sys/sys/vnode.h 1.207 + + Put a flag bit into v_usecount to prevent vtryget during + getcleanvnode. Fixes PR/41374. + [rmind, ticket #863] + +sys/arch/amd64/amd64/trap.c 1.56, 1.57 + + Handle protection fault properly. + [rmind, ticket #865] +
CVS commit: src/crypto/external/bsd/openssh/bin
Module Name:src
Committed By: mrg
Date: Tue Jul 21 00:47:23 UTC 2009
Modified Files:
src/crypto/external/bsd/openssh/bin: Makefile
Log Message:
set SSHDIST to the new location. HI CHRISTOS!
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/bin/Makefile
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/openssh/bin/Makefile
diff -u src/crypto/external/bsd/openssh/bin/Makefile:1.1 src/crypto/external/bsd/openssh/bin/Makefile:1.2
--- src/crypto/external/bsd/openssh/bin/Makefile:1.1 Sun Jun 7 22:38:45 2009
+++ src/crypto/external/bsd/openssh/bin/Makefile Tue Jul 21 00:47:23 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2009/06/07 22:38:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/21 00:47:23 mrg Exp $
.include bsd.own.mk
-SSHDIST?= ${NETBSDSRCDIR}/crypto/dist/ssh
+SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
SUBDIR= ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
ssh-keysign ssh-keyscan sftp
CVS commit: src/etc
Module Name:src
Committed By: mrg
Date: Tue Jul 21 00:48:30 UTC 2009
Modified Files:
src/etc: Makefile
Log Message:
what was usr.bin/ssh is now openssh/bin, not openssh/bin/ssh.
To generate a diff of this commit:
cvs rdiff -u -r1.368 -r1.369 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.368 src/etc/Makefile:1.369
--- src/etc/Makefile:1.368 Tue Jul 21 00:28:35 2009
+++ src/etc/Makefile Tue Jul 21 00:48:29 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.368 2009/07/21 00:28:35 mrg Exp $
+# $NetBSD: Makefile,v 1.369 2009/07/21 00:48:29 mrg Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -347,7 +347,7 @@
${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.sbin/pf configinstall
.endif
.if (${MKCRYPTO} != no)
- ${MAKEDIRTARGET} ${NETBSDSRCDIR}/crypto/external/bsd/openssh/bin/ssh configinstall
+ ${MAKEDIRTARGET} ${NETBSDSRCDIR}/crypto/external/bsd/openssh/bin configinstall
.endif
.if (${MKPOSTFIX} != no)
${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/ibm-public/postfix configinstall
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: mrg Date: Tue Jul 21 00:49:14 UTC 2009 Modified Files: src/distrib/sets/lists/base: shl.mi Log Message: it's not quite upto libcrypto.so.6.1 yet... To generate a diff of this commit: cvs rdiff -u -r1.482 -r1.483 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/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.482 src/distrib/sets/lists/base/shl.mi:1.483 --- src/distrib/sets/lists/base/shl.mi:1.482 Mon Jul 20 17:30:52 2009 +++ src/distrib/sets/lists/base/shl.mi Tue Jul 21 00:49:13 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.482 2009/07/20 17:30:52 christos Exp $ +# $NetBSD: shl.mi,v 1.483 2009/07/21 00:49:13 mrg Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -63,7 +63,7 @@ ./usr/lib/libc.so.12.169 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.6.1 base-crypto-shlib crypto +./usr/lib/libcrypto.so.6.0 base-crypto-shlib crypto ./usr/lib/libcurses.so.7.0 base-sys-shlib ./usr/lib/libdes.so.8.1base-crypto-shlib crypto ./usr/lib/libdevmapper.so.1.0 base-lvm-shlib lvm
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: mrg Date: Tue Jul 21 00:49:30 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 Log Message: updates for compat builds. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/base/md.sparc64 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.60 src/distrib/sets/lists/base/md.amd64:1.61 --- src/distrib/sets/lists/base/md.amd64:1.60 Mon Jul 20 17:30:52 2009 +++ src/distrib/sets/lists/base/md.amd64 Tue Jul 21 00:49:30 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.60 2009/07/20 17:30:52 christos Exp $ +# $NetBSD: md.amd64,v 1.61 2009/07/21 00:49:30 mrg Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -141,8 +141,8 @@ ./usr/lib/i386/libossaudio.so.1.0 base-compat-shlib compat,pic ./usr/lib/i386/libp2k.so.1 base-compat-shlib compat,pic ./usr/lib/i386/libp2k.so.1.0 base-compat-shlib compat,pic -./usr/lib/i386/libpam.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/libpam.so.2.0 base-compat-shlib compat,pic,pam +./usr/lib/i386/libpam.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/libpam.so.3.0 base-compat-shlib compat,pic,pam ./usr/lib/i386/libpcap.so.3 base-compat-shlib compat,pic ./usr/lib/i386/libpcap.so.3.0 base-compat-shlib compat,pic ./usr/lib/i386/libpci.so.2 base-compat-shlib compat,pic @@ -206,28 +206,28 @@ ./usr/lib/i386/libz.so.1 base-compat-shlib compat,pic ./usr/lib/i386/libz.so.1.0 base-compat-shlib compat,pic ./usr/lib/i386/securitybase-compat-shlib compat -./usr/lib/i386/security/pam_afslog.so.2 base-compat-shlib compat,pic,kerberos,pam -./usr/lib/i386/security/pam_chroot.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_deny.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_echo.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_exec.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_ftpusers.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_group.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_guest.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_krb5.so.2 base-compat-shlib compat,pic,kerberos,pam -./usr/lib/i386/security/pam_ksu.so.2 base-compat-shlib compat,pic,kerberos,pam -./usr/lib/i386/security/pam_lastlog.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_login_access.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_nologin.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_permit.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_radius.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_rhosts.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_rootok.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_securetty.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_self.so.2 base-compat-shlib compat,pic,pam -./usr/lib/i386/security/pam_skey.so.2 base-compat-shlib compat,pic,skey,pam -./usr/lib/i386/security/pam_ssh.so.2 base-compat-shlib compat,pic,crypto,pam -./usr/lib/i386/security/pam_unix.so.2 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam +./usr/lib/i386/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_deny.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_echo.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_exec.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_ftpusers.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_group.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_guest.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_krb5.so.3 base-compat-shlib compat,pic,kerberos,pam +./usr/lib/i386/security/pam_ksu.so.3 base-compat-shlib compat,pic,kerberos,pam +./usr/lib/i386/security/pam_lastlog.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_login_access.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_nologin.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_permit.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_radius.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_rhosts.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_rootok.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_securetty.so.3 base-compat-shlib compat,pic,pam +./usr/lib/i386/security/pam_self.so.3 base-compat-shlib compat,pic,pam
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Tue Jul 21 01:05:35 UTC 2009
Modified Files:
src/compat: build-makefiles
Log Message:
do not need the postfix libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/compat/build-makefiles
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/build-makefiles
diff -u src/compat/build-makefiles:1.7 src/compat/build-makefiles:1.8
--- src/compat/build-makefiles:1.7 Tue Jul 21 00:23:02 2009
+++ src/compat/build-makefiles Tue Jul 21 01:05:35 2009
@@ -7,7 +7,7 @@
rwsrcdir=/home/current/src
MAKE=${MAKE-make}
-CHECK_SUBDIRS=gnu/lib gnu/lib/libgcc4 lib lib/csu lib/i18n_module external/bsd/atf/lib external/bsd/openldap/lib lib/libpam/modules external/bsd/bind/lib external/ibm-public/postfix/lib external/bsd/iscsi crypto/external/bsd/openssl/lib crypto/external/bsd/netpgp crypto/external/bsd/openssh
+CHECK_SUBDIRS=gnu/lib gnu/lib/libgcc4 lib lib/csu lib/i18n_module external/bsd/atf/lib external/bsd/openldap/lib lib/libpam/modules external/bsd/bind/lib external/bsd/iscsi crypto/external/bsd/openssl/lib crypto/external/bsd/netpgp crypto/external/bsd/openssh
# lib/csu is spsecial
# lib/libm needs to be special -- i387
@@ -65,7 +65,7 @@
(
echo -n '# $Net'
echo 'BSD$'
- echo '# Generated from: $NetBSD: build-makefiles,v 1.7 2009/07/21 00:23:02 mrg Exp $' | sed -e 's/\$//g'
+ echo '# Generated from: $NetBSD: build-makefiles,v 1.8 2009/07/21 01:05:35 mrg Exp $' | sed -e 's/\$//g'
cat 'EOF'
NOLINT= # defined
CVS commit: src/compat/external/ibm-public/postfix/lib
Module Name:src Committed By: mrg Date: Tue Jul 21 01:06:03 UTC 2009 Removed Files: src/compat/external/ibm-public/postfix/lib: Makefile Makefile.inc src/compat/external/ibm-public/postfix/lib/dns: Makefile src/compat/external/ibm-public/postfix/lib/global: Makefile src/compat/external/ibm-public/postfix/lib/masterlib: Makefile src/compat/external/ibm-public/postfix/lib/milter: Makefile src/compat/external/ibm-public/postfix/lib/tls: Makefile src/compat/external/ibm-public/postfix/lib/util: Makefile src/compat/external/ibm-public/postfix/lib/xsasl: Makefile Log Message: do not need the postfix libraries here. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/compat/external/ibm-public/postfix/lib/Makefile \ src/compat/external/ibm-public/postfix/lib/Makefile.inc cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/dns/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/global/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/masterlib/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/milter/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/tls/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/util/Makefile cvs rdiff -u -r1.1 -r0 \ src/compat/external/ibm-public/postfix/lib/xsasl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/rev
Module Name:src
Committed By: ahoka
Date: Tue Jul 21 01:12:55 UTC 2009
Modified Files:
src/usr.bin/rev: rev.1 rev.c
Log Message:
Change to support multibyte characters.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/rev/rev.1
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/rev/rev.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/rev/rev.1
diff -u src/usr.bin/rev/rev.1:1.7 src/usr.bin/rev/rev.1:1.8
--- src/usr.bin/rev/rev.1:1.7 Fri Nov 28 20:30:05 2008
+++ src/usr.bin/rev/rev.1 Tue Jul 21 01:12:55 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: rev.1,v 1.7 2008/11/28 20:30:05 reed Exp $
+.\ $NetBSD: rev.1,v 1.8 2009/07/21 01:12:55 ahoka Exp $
.\
.\ Copyright (c) 1985, 1992, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ @(#)rev.1 8.1 (Berkeley) 6/9/93
.\
-.Dd January 21, 2001
+.Dd July 21, 2009
.Dt REV 1
.Os
.Sh NAME
@@ -44,3 +44,7 @@
utility copies the specified files to the standard output, reversing the
order of characters in every line.
If no files are specified, the standard input is read.
+.Sh ENVIRONMENT
+.Bl -tag -width indent
+.It Ev LC_ALL
+.El
Index: src/usr.bin/rev/rev.c
diff -u src/usr.bin/rev/rev.c:1.9 src/usr.bin/rev/rev.c:1.10
--- src/usr.bin/rev/rev.c:1.9 Mon Apr 13 04:36:34 2009
+++ src/usr.bin/rev/rev.c Tue Jul 21 01:12:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rev.c,v 1.9 2009/04/13 04:36:34 lukem Exp $ */
+/* $NetBSD: rev.c,v 1.10 2009/07/21 01:12:55 ahoka Exp $ */
/*-
* Copyright (c) 1987, 1992, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)rev.c 8.3 (Berkeley) 5/4/95;
#else
-__RCSID($NetBSD: rev.c,v 1.9 2009/04/13 04:36:34 lukem Exp $);
+__RCSID($NetBSD: rev.c,v 1.10 2009/07/21 01:12:55 ahoka Exp $);
#endif
#endif /* not lint */
@@ -47,10 +47,11 @@
#include err.h
#include errno.h
+#include locale.h
#include stdio.h
#include stdlib.h
-#include string.h
#include unistd.h
+#include wchar.h
int main __P((int, char **));
void usage __P((void));
@@ -61,11 +62,13 @@
char *argv[];
{
const char *filename;
- char *p, *t;
+ wchar_t *p, *t;
FILE *fp;
size_t len;
int ch, rval;
+ setlocale(LC_ALL, );
+
while ((ch = getopt(argc, argv, )) != -1)
switch(ch) {
case '?':
@@ -89,13 +92,13 @@
}
filename = *argv++;
}
- while ((p = fgetln(fp, len)) != NULL) {
- if (p[len - 1] == '\n')
+ while ((p = fgetwln(fp, len)) != NULL) {
+ if (p[len - 1] == L'\n')
--len;
t = p + len - 1;
for (t = p + len - 1; t = p; --t)
-putchar(*t);
- putchar('\n');
+putwchar(*t);
+ putwchar(L'\n');
}
if (ferror(fp)) {
warn(%s, filename);
CVS commit: src/usr.bin/rev
Module Name:src
Committed By: ahoka
Date: Tue Jul 21 01:25:14 UTC 2009
Modified Files:
src/usr.bin/rev: rev.c
Log Message:
Apply some ANSI and KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/rev/rev.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/rev/rev.c
diff -u src/usr.bin/rev/rev.c:1.10 src/usr.bin/rev/rev.c:1.11
--- src/usr.bin/rev/rev.c:1.10 Tue Jul 21 01:12:55 2009
+++ src/usr.bin/rev/rev.c Tue Jul 21 01:25:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rev.c,v 1.10 2009/07/21 01:12:55 ahoka Exp $ */
+/* $NetBSD: rev.c,v 1.11 2009/07/21 01:25:14 ahoka Exp $ */
/*-
* Copyright (c) 1987, 1992, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)rev.c 8.3 (Berkeley) 5/4/95;
#else
-__RCSID($NetBSD: rev.c,v 1.10 2009/07/21 01:12:55 ahoka Exp $);
+__RCSID($NetBSD: rev.c,v 1.11 2009/07/21 01:25:14 ahoka Exp $);
#endif
#endif /* not lint */
@@ -53,13 +53,11 @@
#include unistd.h
#include wchar.h
-int main __P((int, char **));
-void usage __P((void));
+static void usage(void);
+int main(int, char *[]);
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
const char *filename;
wchar_t *p, *t;
@@ -68,6 +66,7 @@
int ch, rval;
setlocale(LC_ALL, );
+ setprogname(argv[0]);
while ((ch = getopt(argc, argv, )) != -1)
switch(ch) {
@@ -109,9 +108,9 @@
exit(rval);
}
-void
-usage()
+static void
+usage(void)
{
- (void)fprintf(stderr, usage: rev [file ...]\n);
- exit(1);
+ (void)fprintf(stderr, usage: %s [file ...]\n, getprogname());
+ exit(EXIT_FAILURE);
}
CVS commit: src/usr.bin/fold
Module Name:src
Committed By: ahoka
Date: Tue Jul 21 01:35:02 UTC 2009
Modified Files:
src/usr.bin/fold: fold.1 fold.c
Log Message:
Modify to support multibyte characters.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/fold/fold.1
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/fold/fold.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/fold/fold.1
diff -u src/usr.bin/fold/fold.1:1.10 src/usr.bin/fold/fold.1:1.11
--- src/usr.bin/fold/fold.1:1.10 Thu Aug 7 11:13:47 2003
+++ src/usr.bin/fold/fold.1 Tue Jul 21 01:35:02 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: fold.1,v 1.10 2003/08/07 11:13:47 agc Exp $
+.\ $NetBSD: fold.1,v 1.11 2009/07/21 01:35:02 ahoka Exp $
.\
.\ Copyright (c) 1980, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ @(#)fold.1 8.1 (Berkeley) 6/6/93
.\
-.Dd June 6, 1993
+.Dd July 21, 2009
.Dt FOLD 1
.Os
.Sh NAME
@@ -59,17 +59,22 @@
.It Fl w
Specifies a line width to use instead of the default 80 characters.
.El
+.Sh EXIT STATUS
.Pp
The
.Nm
utility exits 0 on success, and \*[Gt]0 if an error occurs.
+.Sh ENVIRONMENT
+.Bl -tag -width indent
+.It Ev LC_CTYPE
+.El
.Sh SEE ALSO
.Xr expand 1
.Sh STANDARDS
The
.Nm
utility conforms to
-.St -p1003.2-92 .
+.St -p1003.1-2008 .
.Sh BUGS
If underlining is present it may be messed up by folding.
.Pp
Index: src/usr.bin/fold/fold.c
diff -u src/usr.bin/fold/fold.c:1.15 src/usr.bin/fold/fold.c:1.16
--- src/usr.bin/fold/fold.c:1.15 Wed Oct 29 01:31:09 2008
+++ src/usr.bin/fold/fold.c Tue Jul 21 01:35:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fold.c,v 1.15 2008/10/29 01:31:09 ahoka Exp $ */
+/* $NetBSD: fold.c,v 1.16 2009/07/21 01:35:02 ahoka Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -42,20 +42,22 @@
#if 0
static char sccsid[] = @(#)fold.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: fold.c,v 1.15 2008/10/29 01:31:09 ahoka Exp $);
+__RCSID($NetBSD: fold.c,v 1.16 2009/07/21 01:35:02 ahoka Exp $);
#endif /* not lint */
+#include limits.h
+#include locale.h
#include stdio.h
#include stdlib.h
-#include string.h
#include unistd.h
+#include wchar.h
#include err.h
#define DEFLINEWIDTH 80
int main(int, char **);
static void fold(int);
-static int new_column_position(int, int);
+static int new_column_position(int, wint_t);
static void usage(void);
int count_bytes = 0;
@@ -68,6 +70,9 @@
int width;
char *p;
+ setlocale(LC_CTYPE, );
+ setprogname(argv[0]);
+
width = -1;
while ((ch = getopt(argc, argv, 0123456789bsw:)) != -1)
switch (ch) {
@@ -125,41 +130,44 @@
static void
fold(int width)
{
- static char *buf = NULL;
- char *nbuf;
+ static wchar_t *buf = NULL;
+ wchar_t *nbuf;
static int buf_max = 0;
- int ch, col;
- int indx;
+ wint_t ch;
+ int col, indx, i;
col = indx = 0;
- while ((ch = getchar()) != EOF) {
- if (ch == '\n') {
- if (indx != 0)
-fwrite (buf, 1, indx, stdout);
- putchar('\n');
+ while ((ch = getwchar()) != WEOF) {
+ if (ch == L'\n') {
+ if (indx != 0) {
+for (i = 0; i indx; i++)
+ putwchar(buf[i]);
+ }
+ putwchar(L'\n');
col = indx = 0;
continue;
}
col = new_column_position (col, ch);
if (col width) {
- int i, last_space;
+ int last_space;
#ifdef __GNUC__
last_space = 0; /* XXX gcc */
#endif
if (split_words) {
for (i = 0, last_space = -1; i indx; i++)
- if (buf[i] == ' ')
+ if (buf[i] == L' ')
last_space = i;
}
if (split_words last_space != -1) {
-fwrite (buf, 1, last_space, stdout);
+for (i = 0; i last_space; i++)
+ putwchar(buf[i]);
/* increase last_space here, so we skip trailing whitespace */
last_space++;
-memmove (buf, buf+last_space, indx-last_space);
+wmemmove (buf, buf+last_space, indx-last_space);
indx -= last_space;
col = 0;
@@ -167,10 +175,11 @@
col = new_column_position (col, buf[i]);
}
} else {
-fwrite (buf, 1, indx, stdout);
+for (i = 0; i indx; i++)
+ putwchar(buf[i]);
col = indx = 0;
}
- putchar('\n');
+ putwchar('\n');
/* calculate the column position for the next line. */
col = new_column_position (col, ch);
@@ -188,34 +197,43 @@
buf[indx++] = ch;
}
- if (indx != 0)
- fwrite (buf, 1, indx, stdout);
+ if (indx != 0) {
+ for (i = 0; i indx; i++)
+ putwchar(buf[i]);
+ }
}
/*
* calculate the column position
*/
static int
-new_column_position (int col, int ch)
+new_column_position (int col, wint_t ch)
{
+ int w;
+
if (!count_bytes) {
switch (ch) {
- case '\b':
+ case L'\b':
if (col 0)
--col;
break;
- case '\r':
+ case L'\r':
col = 0;
break;
- case '\t':
+ case L'\t':
col = (col + 8) ~7;
break;
default:
- ++col;
+ w = wcwidth(ch);
+ if (w 0)
+col += w;
break;
}
} else {
- ++col;
+ char dummy[MB_LEN_MAX];
+
