CVS commit: src/sys/arch/x68k/stand/boot_ufs
Module Name:src
Committed By: christos
Date: Sat Jun 15 01:39:56 UTC 2013
Modified Files:
src/sys/arch/x68k/stand/boot_ufs: Makefile
Log Message:
revert previous
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x68k/stand/boot_ufs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/boot_ufs/Makefile
diff -u src/sys/arch/x68k/stand/boot_ufs/Makefile:1.27 src/sys/arch/x68k/stand/boot_ufs/Makefile:1.28
--- src/sys/arch/x68k/stand/boot_ufs/Makefile:1.27 Fri Jun 14 21:37:10 2013
+++ src/sys/arch/x68k/stand/boot_ufs/Makefile Fri Jun 14 21:39:56 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/06/15 01:37:10 christos Exp $
+# $NetBSD: Makefile,v 1.28 2013/06/15 01:39:56 christos Exp $
NOMAN= # defined
@@ -38,7 +38,7 @@ vers.c: ${VERSIONFILE}
${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
CFLAGS= -Os -fomit-frame-pointer
-#CFLAGS+= -m68020-60
+CFLAGS+= -m68020-60
CFLAGS+= -W -Wall -Wstrict-prototypes -Wmissing-prototypes
CPPFLAGS+= -DTEXTADDR="0x$(TEXT)" -DBOOT_TEXTADDR="0x$(BOOT_TEXT)"
CPPFLAGS+= -DBOOT=\"$(BOOT)\" -DBOOT_VERS=\"$(VERSION)\"
CVS commit: src/sys/arch/x68k/stand/boot_ufs
Module Name:src
Committed By: christos
Date: Sat Jun 15 01:37:10 UTC 2013
Modified Files:
src/sys/arch/x68k/stand/boot_ufs: Makefile readufs.h readufs_lfs.c
Log Message:
adjust to the lfs splitadjust to the lfs splitadjust to the lfs splitadjust to
the lfs splitadjust to the lfs splitadjust to the lfs splitadjust to the lfs
splitadjust to the lfs splitadjust to the lfs split
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x68k/stand/boot_ufs/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x68k/stand/boot_ufs/readufs.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/stand/boot_ufs/readufs_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/sys/arch/x68k/stand/boot_ufs/Makefile
diff -u src/sys/arch/x68k/stand/boot_ufs/Makefile:1.26 src/sys/arch/x68k/stand/boot_ufs/Makefile:1.27
--- src/sys/arch/x68k/stand/boot_ufs/Makefile:1.26 Tue Oct 11 09:07:06 2011
+++ src/sys/arch/x68k/stand/boot_ufs/Makefile Fri Jun 14 21:37:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2011/10/11 13:07:06 tsutsui Exp $
+# $NetBSD: Makefile,v 1.27 2013/06/15 01:37:10 christos Exp $
NOMAN= # defined
@@ -38,7 +38,7 @@ vers.c: ${VERSIONFILE}
${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
CFLAGS= -Os -fomit-frame-pointer
-CFLAGS+= -m68020-60
+#CFLAGS+= -m68020-60
CFLAGS+= -W -Wall -Wstrict-prototypes -Wmissing-prototypes
CPPFLAGS+= -DTEXTADDR="0x$(TEXT)" -DBOOT_TEXTADDR="0x$(BOOT_TEXT)"
CPPFLAGS+= -DBOOT=\"$(BOOT)\" -DBOOT_VERS=\"$(VERSION)\"
Index: src/sys/arch/x68k/stand/boot_ufs/readufs.h
diff -u src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.10 src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.11
--- src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.10 Sun Feb 20 21:31:58 2011
+++ src/sys/arch/x68k/stand/boot_ufs/readufs.h Fri Jun 14 21:37:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs.h,v 1.10 2011/02/21 02:31:58 itohy Exp $ */
+/* $NetBSD: readufs.h,v 1.11 2013/06/15 01:37:10 christos Exp $ */
/* from Id: readufs.h,v 1.9 2003/10/15 14:16:58 itohy Exp */
/*
@@ -8,6 +8,9 @@
#include
#include
+#ifdef USE_LFS
+#include
+#endif
#include
#include
@@ -21,6 +24,10 @@ union ufs_dinode {
#ifdef USE_UFS2
struct ufs2_dinode di2;
#endif
+#ifdef USE_LFS
+ struct ulfs1_dinode dil1;
+ struct ulfs2_dinode dil2;
+#endif
};
/* For more compact code and independence on 64-bit types and ops */
Index: src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
diff -u src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.12 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.13
--- src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.12 Sun Feb 20 21:31:58 2011
+++ src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c Fri Jun 14 21:37:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_lfs.c,v 1.12 2011/02/21 02:31:58 itohy Exp $ */
+/* $NetBSD: readufs_lfs.c,v 1.13 2013/06/15 01:37:10 christos Exp $ */
/* from Id: readufs_lfs.c,v 1.7 2003/10/15 14:16:58 itohy Exp */
/*
@@ -22,7 +22,7 @@
static int get_lfs_inode(ino32_t ino, union ufs_dinode *dibuf);
-static struct ufs1_dinode ifile_dinode;
+static struct ulfs1_dinode ifile_dinode;
#define fsi (*ufsinfo)
#define fsi_lfs fsi.fs_u.u_lfs
@@ -160,7 +160,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
struct ufs_info *ufsinfo = &ufs_info;
daddr_t daddr;
char *buf = alloca(fsi.bsize);
- struct ufs1_dinode *di, *diend;
+ struct ulfs1_dinode *di, *diend;
int i;
/* Get fs block which contains the specified inode. */
@@ -196,7 +196,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
);
/* Search for the inode. */
- di = (struct ufs1_dinode *) buf;
+ di = (struct ulfs1_dinode *) buf;
diend = di + fsi_lfs.inopb;
for ( ; di < diend; di++)
@@ -220,7 +220,7 @@ found:
#endif
#endif
- dibuf->di1 = *di;
+ dibuf->dil1 = *di;
return 0;
}
CVS commit: src/sbin/dump
Module Name:src
Committed By: christos
Date: Sat Jun 15 01:27:19 UTC 2013
Modified Files:
src/sbin/dump: dump.h dumprmt.c itime.c main.c optr.c rcache.c tape.c
traverse.c unctime.c
Log Message:
handle new lfs split
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sbin/dump/dump.h
cvs rdiff -u -r1.36 -r1.37 src/sbin/dump/dumprmt.c
cvs rdiff -u -r1.19 -r1.20 src/sbin/dump/itime.c
cvs rdiff -u -r1.69 -r1.70 src/sbin/dump/main.c
cvs rdiff -u -r1.40 -r1.41 src/sbin/dump/optr.c
cvs rdiff -u -r1.23 -r1.24 src/sbin/dump/rcache.c
cvs rdiff -u -r1.52 -r1.53 src/sbin/dump/tape.c
cvs rdiff -u -r1.49 -r1.50 src/sbin/dump/traverse.c
cvs rdiff -u -r1.16 -r1.17 src/sbin/dump/unctime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dump/dump.h
diff -u src/sbin/dump/dump.h:1.50 src/sbin/dump/dump.h:1.51
--- src/sbin/dump/dump.h:1.50 Tue Jan 22 04:39:11 2013
+++ src/sbin/dump/dump.h Fri Jun 14 21:27:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dump.h,v 1.50 2013/01/22 09:39:11 dholland Exp $ */
+/* $NetBSD: dump.h,v 1.51 2013/06/15 01:27:19 christos Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -32,10 +32,19 @@
*/
#include
+#ifdef DUMP_LFS
+#include
+#endif
+#include
+#include
union dinode {
struct ufs1_dinode dp1;
struct ufs2_dinode dp2;
+#ifdef DUMP_LFS
+ struct ulfs1_dinode dlp1;
+ struct ulfs2_dinode dlp2;
+#endif
};
#define DIP(dp, field) \
(is_ufs2 ? (dp)->dp2.di_##field : (dp)->dp1.di_##field)
Index: src/sbin/dump/dumprmt.c
diff -u src/sbin/dump/dumprmt.c:1.36 src/sbin/dump/dumprmt.c:1.37
--- src/sbin/dump/dumprmt.c:1.36 Sun Jan 13 17:54:24 2013
+++ src/sbin/dump/dumprmt.c Fri Jun 14 21:27:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dumprmt.c,v 1.36 2013/01/13 22:54:24 dholland Exp $ */
+/* $NetBSD: dumprmt.c,v 1.37 2013/06/15 01:27:19 christos Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dumprmt.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: dumprmt.c,v 1.36 2013/01/13 22:54:24 dholland Exp $");
+__RCSID("$NetBSD: dumprmt.c,v 1.37 2013/06/15 01:27:19 christos Exp $");
#endif
#endif /* not lint */
@@ -43,15 +43,12 @@ __RCSID("$NetBSD: dumprmt.c,v 1.36 2013/
#include
#include
#include
-#include
#include
#include
#include
#include
-#include
-
#include
#include
#include
Index: src/sbin/dump/itime.c
diff -u src/sbin/dump/itime.c:1.19 src/sbin/dump/itime.c:1.20
--- src/sbin/dump/itime.c:1.19 Sun Jan 13 17:53:01 2013
+++ src/sbin/dump/itime.c Fri Jun 14 21:27:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: itime.c,v 1.19 2013/01/13 22:53:01 dholland Exp $ */
+/* $NetBSD: itime.c,v 1.20 2013/06/15 01:27:19 christos Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -34,16 +34,13 @@
#if 0
static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93";
#else
-__RCSID("$NetBSD: itime.c,v 1.19 2013/01/13 22:53:01 dholland Exp $");
+__RCSID("$NetBSD: itime.c,v 1.20 2013/06/15 01:27:19 christos Exp $");
#endif
#endif /* not lint */
#include
#include
#include
-#include
-
-#include
#include
#include
Index: src/sbin/dump/main.c
diff -u src/sbin/dump/main.c:1.69 src/sbin/dump/main.c:1.70
--- src/sbin/dump/main.c:1.69 Sat Apr 7 12:44:10 2012
+++ src/sbin/dump/main.c Fri Jun 14 21:27:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.69 2012/04/07 16:44:10 christos Exp $ */
+/* $NetBSD: main.c,v 1.70 2013/06/15 01:27:19 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: main.c,v 1.69 2012/04/07 16:44:10 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.70 2013/06/15 01:27:19 christos Exp $");
#endif
#endif /* not lint */
@@ -48,12 +48,9 @@ __RCSID("$NetBSD: main.c,v 1.69 2012/04/
#include
#include
-#include
#include
#include
-#include
-
#include
#include
#include
Index: src/sbin/dump/optr.c
diff -u src/sbin/dump/optr.c:1.40 src/sbin/dump/optr.c:1.41
--- src/sbin/dump/optr.c:1.40 Sun Jan 13 18:07:16 2013
+++ src/sbin/dump/optr.c Fri Jun 14 21:27:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: optr.c,v 1.40 2013/01/13 23:07:16 dholland Exp $ */
+/* $NetBSD: optr.c,v 1.41 2013/06/15 01:27:19 christos Exp $ */
/*-
* Copyright (c) 1980, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94";
#else
-__RCSID("$NetBSD: optr.c,v 1.40 2013/01/13 23:07:16 dholland Exp $");
+__RCSID("$NetBSD: optr.c,v 1.41 2013/06/15 01:27:19 christos Exp $");
#endif
#endif /* not lint */
@@ -58,8 +58,6 @@ __RCSID("$NetBSD: optr.c,v 1.40 2013/01/
#include
#include
-#include
-
#include "dump.h"
#include "pathnames.h"
Index: src/sbin/dump/rcache.c
diff -u src/sbin/dump/rcache.c:1.23 src/sbin/dump/rcache.c:1.24
--- src/sbin/dump/rcache.c:1.23 Wed Jan 27 07:20:25 2010
+++ src/sbin
CVS commit: src/sbin/dump_lfs
Module Name:src
Committed By: christos
Date: Sat Jun 15 01:26:48 UTC 2013
Modified Files:
src/sbin/dump_lfs: Makefile lfs_inode.c
Log Message:
fix compilation
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sbin/dump_lfs/Makefile
cvs rdiff -u -r1.17 -r1.18 src/sbin/dump_lfs/lfs_inode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dump_lfs/Makefile
diff -u src/sbin/dump_lfs/Makefile:1.14 src/sbin/dump_lfs/Makefile:1.15
--- src/sbin/dump_lfs/Makefile:1.14 Sat Apr 7 00:52:20 2012
+++ src/sbin/dump_lfs/Makefile Fri Jun 14 21:26:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/04/07 04:52:20 christos Exp $
+# $NetBSD: Makefile,v 1.15 2013/06/15 01:26:48 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# lfs_inode.c LFS filestore-specific routines
@@ -27,7 +27,6 @@ LDADD+= -lutil
COPTS.lfs_inode.c+= -fno-tree-ter
.endif
-.PATH: ${NETBSDSRCDIR}/sbin/dump ${NETBSDSRCDIR}/sys/ufs/lfs \
- ${NETBSDSRCDIR}/sys/ufs/ffs
+.PATH: ${NETBSDSRCDIR}/sbin/dump ${NETBSDSRCDIR}/sys/ufs/lfs
.include
Index: src/sbin/dump_lfs/lfs_inode.c
diff -u src/sbin/dump_lfs/lfs_inode.c:1.17 src/sbin/dump_lfs/lfs_inode.c:1.18
--- src/sbin/dump_lfs/lfs_inode.c:1.17 Sat Jun 8 19:37:37 2013
+++ src/sbin/dump_lfs/lfs_inode.c Fri Jun 14 21:26:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_inode.c,v 1.17 2013/06/08 23:37:37 dholland Exp $ */
+/* $NetBSD: lfs_inode.c,v 1.18 2013/06/15 01:26:48 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,18 +39,14 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: lfs_inode.c,v 1.17 2013/06/08 23:37:37 dholland Exp $");
+__RCSID("$NetBSD: lfs_inode.c,v 1.18 2013/06/15 01:26:48 christos Exp $");
#endif
#endif /* not lint */
#include
#include
#include
-#include
#include
-#include
-
-#include
#include
#include
@@ -61,6 +57,7 @@ __RCSID("$NetBSD: lfs_inode.c,v 1.17 201
#include
#include "dump.h"
+#undef di_inumber
#define MAXIFPB(MAXBSIZE / sizeof(IFILE))
@@ -308,7 +305,7 @@ lfs_ifind(struct lfs *fs, ino_t ino, str
{
int cnt;
- for(cnt=0;cntlfs_ifile) {
/* Load the ifile inode if not already */
- if(ifile_dinode.di_inumber == 0) {
+ if(ifile_dinode.dlp1.di_inumber == 0) {
blkno = sblock->lfs_idaddr;
bread(fsbtodb(sblock, blkno), (char *)inoblock,
(int)sblock->lfs_bsize);
dp = lfs_ifind(sblock, inum, inoblock);
- ifile_dinode = *dp; /* Structure copy */
+ ifile_dinode.dlp1 = *dp; /* Structure copy */
}
- return (union dinode *)&ifile_dinode;
+ return &ifile_dinode;
}
curino = inum;
blkno = lfs_ientry(inum)->if_daddr;
if(blkno == LFS_UNUSED_DADDR)
- return (union dinode *)&empty_dinode;
+ return &empty_dinode;
if(blkno != inoblkno) {
bread(fsbtodb(sblock, blkno), (char *)inoblock,
@@ -350,8 +347,7 @@ getino(ino_t inum)
ffs_dinode_swap(&inoblock[i], &inoblock[i]);
#endif
}
- /* XXX XXX: this cast is horribly unsafe */
- return (union dinode *)lfs_ifind(sblock, inum, inoblock);
+ return (void *)lfs_ifind(sblock, inum, inoblock);
}
/*
CVS commit: src/sys/arch/hp700/stand/xxboot
Module Name:src
Committed By: christos
Date: Sat Jun 15 00:42:16 UTC 2013
Modified Files:
src/sys/arch/hp700/stand/xxboot: readufs.h readufs_lfs.c
Log Message:
make this compile again after the lfs changes
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hp700/stand/xxboot/readufs.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp700/stand/xxboot/readufs_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/sys/arch/hp700/stand/xxboot/readufs.h
diff -u src/sys/arch/hp700/stand/xxboot/readufs.h:1.6 src/sys/arch/hp700/stand/xxboot/readufs.h:1.7
--- src/sys/arch/hp700/stand/xxboot/readufs.h:1.6 Fri Feb 24 13:45:20 2012
+++ src/sys/arch/hp700/stand/xxboot/readufs.h Fri Jun 14 20:42:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs.h,v 1.6 2012/02/24 18:45:20 skrll Exp $ */
+/* $NetBSD: readufs.h,v 1.7 2013/06/15 00:42:16 christos Exp $ */
/* from Id: readufs.h,v 1.10 2003/12/16 13:54:11 itohy Exp */
/*
@@ -10,6 +10,7 @@
#include
#include
#include
+#include
/*
* UFS1 / UFS2
@@ -21,6 +22,10 @@ union ufs_dinode {
#ifdef USE_UFS2
struct ufs2_dinode di2;
#endif
+#ifdef USE_LFS
+ struct ulfs1_dinode dil1;
+ struct ulfs2_dinode dil2;
+#endif
};
/* For more compact code and independence on 64-bit types and ops */
Index: src/sys/arch/hp700/stand/xxboot/readufs_lfs.c
diff -u src/sys/arch/hp700/stand/xxboot/readufs_lfs.c:1.7 src/sys/arch/hp700/stand/xxboot/readufs_lfs.c:1.8
--- src/sys/arch/hp700/stand/xxboot/readufs_lfs.c:1.7 Sun Feb 20 21:31:57 2011
+++ src/sys/arch/hp700/stand/xxboot/readufs_lfs.c Fri Jun 14 20:42:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_lfs.c,v 1.7 2011/02/21 02:31:57 itohy Exp $ */
+/* $NetBSD: readufs_lfs.c,v 1.8 2013/06/15 00:42:16 christos Exp $ */
/* from Id: readufs_lfs.c,v 1.8 2003/12/16 13:54:11 itohy Exp */
/*
@@ -20,7 +20,7 @@
#error LFS currently requires USE_UFS1
#endif
-static struct ufs1_dinode ifile_dinode;
+static struct ulfs1_dinode ifile_dinode;
#define fsi (*ufsinfo)
#define fsi_lfs fsi.fs_u.u_lfs
@@ -156,7 +156,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
struct ufs_info *ufsinfo = &ufs_info;
daddr_t daddr;
char *buf = alloca(fsi.bsize);
- struct ufs1_dinode *di, *diend;
+ struct ulfs1_dinode *di, *diend;
int i;
/* Get fs block which contains the specified inode. */
@@ -186,7 +186,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
RAW_READ(buf, daddr << fsi.fsbtodb, fsi_lfs.ibsize);
/* Search for the inode. */
- di = (struct ufs1_dinode *) buf;
+ di = (struct ulfs1_dinode *) buf;
diend = di + fsi_lfs.inopb;
for ( ; di < diend; di++)
@@ -210,7 +210,7 @@ found:
#endif
#endif
- dibuf->di1 = *di;
+ dibuf->dil1 = *di;
return 0;
}
CVS commit: src/sys/arch/hp700/stand/xxboot
Module Name:src
Committed By: christos
Date: Sat Jun 15 00:41:56 UTC 2013
Modified Files:
src/sys/arch/hp700/stand/xxboot: main.c
Log Message:
make loadadr uintptr_t since we are casting it to pointers.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp700/stand/xxboot/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/stand/xxboot/main.c
diff -u src/sys/arch/hp700/stand/xxboot/main.c:1.10 src/sys/arch/hp700/stand/xxboot/main.c:1.11
--- src/sys/arch/hp700/stand/xxboot/main.c:1.10 Fri Feb 24 13:45:20 2012
+++ src/sys/arch/hp700/stand/xxboot/main.c Fri Jun 14 20:41:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.10 2012/02/24 18:45:20 skrll Exp $ */
+/* $NetBSD: main.c,v 1.11 2013/06/15 00:41:56 christos Exp $ */
/*
* Copyright (c) 2003 ITOH Yasufumi.
@@ -41,9 +41,9 @@
static char *hexstr(char *, unsigned);
void ipl_main(unsigned /*interactive*/, unsigned /*sptop*/, unsigned /*psw*/);
-void load_file(const char *, unsigned /*loadadr*/, unsigned /*interactive*/,
+void load_file(const char *, uintptr_t /*loadadr*/, unsigned /*interactive*/,
int /*part*/);
-void load_file_ino(ino32_t, const char *, unsigned /*loadadr*/,
+void load_file_ino(ino32_t, const char *, uintptr_t /*loadadr*/,
unsigned /*interactive*/, int /*part*/);
struct loadinfo {
@@ -184,7 +184,7 @@ ipl_main(unsigned interactive, unsigned
int part = 0; /* default partition "a" */
unsigned secsz, partoff, partsz;
int c, c1;
- unsigned loadadr;
+ uintptr_t loadadr;
#if 0
print(hexstr(buf, interactive));
@@ -294,7 +294,7 @@ ipl_main(unsigned interactive, unsigned
}
void
-load_file(const char *path, unsigned loadadr, unsigned interactive, int part)
+load_file(const char *path, uintptr_t loadadr, unsigned interactive, int part)
{
/* look-up the file */
@@ -305,7 +305,7 @@ load_file(const char *path, unsigned loa
}
void
-load_file_ino(ino32_t ino, const char *fn, unsigned loadadr, unsigned interactive, int part)
+load_file_ino(ino32_t ino, const char *fn, uintptr_t loadadr, unsigned interactive, int part)
/* fn: for message only */
{
union ufs_dinode dinode;
CVS commit: src/sys/arch/hp700/stand/xxboot
Module Name:src
Committed By: christos
Date: Sat Jun 15 00:40:12 UTC 2013
Modified Files:
src/sys/arch/hp700/stand/xxboot: Makefile
Log Message:
since when -m belongs in cppflags?
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp700/stand/xxboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/stand/xxboot/Makefile
diff -u src/sys/arch/hp700/stand/xxboot/Makefile:1.15 src/sys/arch/hp700/stand/xxboot/Makefile:1.16
--- src/sys/arch/hp700/stand/xxboot/Makefile:1.15 Mon Jun 20 04:46:28 2011
+++ src/sys/arch/hp700/stand/xxboot/Makefile Fri Jun 14 20:40:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/06/20 08:46:28 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2013/06/15 00:40:12 christos Exp $
PROG= xxboot
NOMAN= # defined
@@ -6,7 +6,7 @@ SRCS= start.S main.c readufs.c readufs_f
.PATH: ${.CURDIR}/../common
-CPPFLAGS+= -mpa-risc-1-0 -I${.CURDIR}/../../../.. -I. -D_STANDALONE
+CPPFLAGS+= -I${.CURDIR}/../../../.. -I. -D_STANDALONE
# configuration for readufs module
CPPFLAGS+= -DUSE_LFS -DUSE_FFS -DUSE_UFS1 -DUSE_UFS2
# IODC can handle only 2GB, so this is enough
@@ -14,7 +14,7 @@ CPPFLAGS+= -D__daddr_t=int32_t
# ANSI C feature prevents from being relocatable
#CPPFLAGS+= -traditional # would be best
CPPFLAGS+= -Dconst=
-COPTS+= -funsigned-char -mdisable-fpregs
+COPTS+= -funsigned-char -mdisable-fpregs -mpa-risk-1-0
.include
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: rkujawa
Date: Fri Jun 14 20:02:44 UTC 2013
Modified Files:
src/sys/arch/evbarm/conf: std.armadaxp
Log Message:
Use VBAR register on Armada XP.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.armadaxp
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/evbarm/conf/std.armadaxp
diff -u src/sys/arch/evbarm/conf/std.armadaxp:1.1 src/sys/arch/evbarm/conf/std.armadaxp:1.2
--- src/sys/arch/evbarm/conf/std.armadaxp:1.1 Wed May 29 22:52:19 2013
+++ src/sys/arch/evbarm/conf/std.armadaxp Fri Jun 14 20:02:44 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.armadaxp,v 1.1 2013/05/29 22:52:19 rkujawa Exp $
+# $NetBSD: std.armadaxp,v 1.2 2013/06/14 20:02:44 rkujawa Exp $
#
# standard NetBSD/evbarm for ARMADAXP options
@@ -28,6 +28,7 @@ makeoptions BOARDTYPE="armadaxp"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.armadaxp"
options EVBARM_BOARDTYPE="Armada XP"
+options ARM_HAS_VBAR
options ARM_INTR_IMPL=""
options COM_REGMAP
options COM_16750
CVS commit: src/etc/rc.d
Module Name:src
Committed By: christos
Date: Fri Jun 14 16:37:55 UTC 2013
Modified Files:
src/etc/rc.d: ipsec
Log Message:
if ipsec_flags is given, treat it as an interface name and change @LOCAL_ADDR@
to the IP address for it. This makes dynamic addresses work during autoconf.
Also while here in restart, re-use start and stop instead of duplicating them.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/etc/rc.d/ipsec
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ipsec
diff -u src/etc/rc.d/ipsec:1.11 src/etc/rc.d/ipsec:1.12
--- src/etc/rc.d/ipsec:1.11 Sat Nov 22 15:23:33 2008
+++ src/etc/rc.d/ipsec Fri Jun 14 12:37:55 2013
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ipsec,v 1.11 2008/11/22 20:23:33 tsutsui Exp $
+# $NetBSD: ipsec,v 1.12 2013/06/14 16:37:55 christos Exp $
#
# PROVIDE: ipsec
@@ -29,10 +29,23 @@ ipsec_prestart()
return 0
}
+ipsec_getip() {
+ ifconfig $1 | while read what address rest; do
+ case "$what" in
+ inet) echo "$address";;
+ esac
+ done
+}
+
ipsec_start()
{
echo "Installing ipsec manual keys/policies."
- /sbin/setkey -f /etc/ipsec.conf
+ if [ -n "$ipsec_flags" ]; then
+ sed -e "s/@LOCAL_ADDR@/$(ipsec_getip "$ipsec_flags")/" \
+ < /etc/ipsec.conf | /sbin/setkey -f -
+ else
+ /sbin/setkey -f /etc/ipsec.conf
+ fi
}
ipsec_stop()
@@ -50,9 +63,8 @@ ipsec_stop()
ipsec_reload()
{
echo "Reloading ipsec manual keys/policies."
- /sbin/setkey -F
- /sbin/setkey -FP
- /sbin/setkey -f /etc/ipsec.conf
+ ipsec_stop
+ ipsec_start
}
load_rc_config $name
CVS commit: src/crypto/dist/ipsec-tools/src/setkey
Module Name:src
Committed By: christos
Date: Fri Jun 14 16:29:14 UTC 2013
Modified Files:
src/crypto/dist/ipsec-tools/src/setkey: setkey.c
Log Message:
Accept - as stdin
Be nice and let the user know which file it could not open.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/crypto/dist/ipsec-tools/src/setkey/setkey.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/dist/ipsec-tools/src/setkey/setkey.c
diff -u src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.15 src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.16
--- src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.15 Fri May 27 14:00:21 2011
+++ src/crypto/dist/ipsec-tools/src/setkey/setkey.c Fri Jun 14 12:29:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: setkey.c,v 1.15 2011/05/27 18:00:21 drochner Exp $ */
+/* $NetBSD: setkey.c,v 1.16 2013/06/14 16:29:14 christos Exp $ */
/* $KAME: setkey.c,v 1.36 2003/09/24 23:52:51 itojun Exp $ */
@@ -165,8 +165,10 @@ main(argc, argv)
break;
case 'f':
f_mode = MODE_SCRIPT;
- if ((fp = fopen(optarg, "r")) == NULL) {
-err(1, "fopen");
+ if (strcmp(optarg, "-") == 0)
+fp = stdin;
+ else if ((fp = fopen(optarg, "r")) == NULL) {
+err(1, "Can't open `%s'", optarg);
/*NOTREACHED*/
}
break;
CVS commit: src/sbin/mknod
Module Name:src
Committed By: tsutsui
Date: Fri Jun 14 16:28:20 UTC 2013
Modified Files:
src/sbin/mknod: mknod.c pack_dev.c pack_dev.h
Log Message:
Remove old workaround for Cygwin.
http://mail-index.netbsd.org/source-changes/2003/05/08/0042.html
16bit dev_t for !__CYGWIN_USE_BIG_TYPES__ was removed in Cygwin 1.7.2
http://cygwin.com/cgi-bin/cvsweb.cgi/src/winsup/cygwin/include/cygwin/types.h?cvsroot=src#rev1.32
and __dev32_t has been removed since 1.7.19.
http://cygwin.com/cgi-bin/cvsweb.cgi/src/winsup/cygwin/include/cygwin/types.h?cvsroot=src#rev1.36
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sbin/mknod/mknod.c
cvs rdiff -u -r1.11 -r1.12 src/sbin/mknod/pack_dev.c
cvs rdiff -u -r1.7 -r1.8 src/sbin/mknod/pack_dev.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mknod/mknod.c
diff -u src/sbin/mknod/mknod.c:1.40 src/sbin/mknod/mknod.c:1.41
--- src/sbin/mknod/mknod.c:1.40 Sat Aug 27 18:37:41 2011
+++ src/sbin/mknod/mknod.c Fri Jun 14 16:28:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mknod.c,v 1.40 2011/08/27 18:37:41 joerg Exp $ */
+/* $NetBSD: mknod.c,v 1.41 2013/06/14 16:28:20 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1998\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: mknod.c,v 1.40 2011/08/27 18:37:41 joerg Exp $");
+__RCSID("$NetBSD: mknod.c,v 1.41 2013/06/14 16:28:20 tsutsui Exp $");
#endif /* not lint */
#include
@@ -61,7 +61,7 @@ __RCSID("$NetBSD: mknod.c,v 1.40 2011/08
#include "pack_dev.h"
static int gid_name(const char *, gid_t *);
-static portdev_t callPack(pack_t *, int, u_long *);
+static dev_t callPack(pack_t *, int, u_long *);
__dead static void usage(void);
@@ -81,7 +81,7 @@ main(int argc, char **argv)
{
char *name, *p;
mode_t mode;
- portdev_t dev;
+ dev_t dev;
pack_t *pack;
u_long numbers[MAXARGS];
int n, ch, fifo, hasformat;
@@ -317,10 +317,10 @@ gid_name(const char *name, gid_t *gid)
return 0;
}
-static portdev_t
+static dev_t
callPack(pack_t *f, int n, u_long *numbers)
{
- portdev_t d;
+ dev_t d;
const char *error = NULL;
d = (*f)(n, numbers, &error);
Index: src/sbin/mknod/pack_dev.c
diff -u src/sbin/mknod/pack_dev.c:1.11 src/sbin/mknod/pack_dev.c:1.12
--- src/sbin/mknod/pack_dev.c:1.11 Sat Aug 27 18:37:41 2011
+++ src/sbin/mknod/pack_dev.c Fri Jun 14 16:28:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pack_dev.c,v 1.11 2011/08/27 18:37:41 joerg Exp $ */
+/* $NetBSD: pack_dev.c,v 1.12 2013/06/14 16:28:20 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: pack_dev.c,v 1.11 2011/08/27 18:37:41 joerg Exp $");
+__RCSID("$NetBSD: pack_dev.c,v 1.12 2013/06/14 16:28:20 tsutsui Exp $");
#endif /* not lint */
#include
@@ -63,10 +63,10 @@ static const char iMinorError[] = "inval
static const char tooManyFields[] = "too many fields for format";
/* exported */
-portdev_t
+dev_t
pack_native(int n, u_long numbers[], const char **error)
{
- portdev_t dev = 0;
+ dev_t dev = 0;
if (n == 2) {
dev = makedev(numbers[0], numbers[1]);
@@ -80,10 +80,10 @@ pack_native(int n, u_long numbers[], con
}
-static portdev_t
+static dev_t
pack_netbsd(int n, u_long numbers[], const char **error)
{
- portdev_t dev = 0;
+ dev_t dev = 0;
if (n == 2) {
dev = makedev_netbsd(numbers[0], numbers[1]);
@@ -99,13 +99,13 @@ pack_netbsd(int n, u_long numbers[], con
#define major_freebsd(x) ((int32_t)(((x) & 0xff00) >> 8))
#define minor_freebsd(x) ((int32_t)(((x) & 0x00ff) >> 0))
-#define makedev_freebsd(x,y) ((portdev_t)x) << 8) & 0xff00) | \
+#define makedev_freebsd(x,y) ((dev_t)x) << 8) & 0xff00) | \
(((y) << 0) & 0x00ff)))
-static portdev_t
+static dev_t
pack_freebsd(int n, u_long numbers[], const char **error)
{
- portdev_t dev = 0;
+ dev_t dev = 0;
if (n == 2) {
dev = makedev_freebsd(numbers[0], numbers[1]);
@@ -121,13 +121,13 @@ pack_freebsd(int n, u_long numbers[], co
#define major_8_8(x) ((int32_t)(((x) & 0xff00) >> 8))
#define minor_8_8(x) ((int32_t)(((x) & 0x00ff) >> 0))
-#define makedev_8_8(x,y) ((portdev_t)x) << 8) & 0xff00) | \
+#define makedev_8_8(x,y) ((dev_t)x) << 8) & 0xff00) | \
(((y) << 0) & 0x00ff)))
-static portdev_t
+static dev_t
pack_8_8(int n, u_long numbers[], const char **error)
{
- portdev_t dev = 0;
+ dev_t dev = 0;
if (n == 2) {
dev = makedev_8_8(numbers[0], numbers[1]);
@@ -143,13 +143,13 @@ pack_8_8(int n, u_long numbers[], const
#define major_12_20(x) ((int32_t)(((x) & 0xfff0) >> 20))
#define minor_12_20(x) ((int32_t)(((x) & 0x000f) >> 0))
-#define makedev_12_20(x,y) ((portdev_t)x) << 20) & 0xfff0) | \
+#define makedev_12_20(x,y) ((dev_t)x
CVS commit: src
Module Name:src
Committed By: tsutsui
Date: Fri Jun 14 16:10:02 UTC 2013
Modified Files:
src/share/mk: bsd.hostprog.mk
src/tools: Makefile.host
src/tools/texinfo: Makefile
Log Message:
Invoke tools/binstall/mkmanifest for Cygwin via ${HOST_SH}.
Fixes builds using source sets that drop executable bits.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.30 -r1.31 src/tools/Makefile.host
cvs rdiff -u -r1.10 -r1.11 src/tools/texinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.70 src/share/mk/bsd.hostprog.mk:1.71
--- src/share/mk/bsd.hostprog.mk:1.70 Thu Apr 11 01:27:47 2013
+++ src/share/mk/bsd.hostprog.mk Fri Jun 14 16:10:02 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostprog.mk,v 1.70 2013/04/11 01:27:47 christos Exp $
+# $NetBSD: bsd.hostprog.mk,v 1.71 2013/06/14 16:10:02 tsutsui Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.include
@@ -117,7 +117,7 @@ ${HOSTPROG}: ${OBJS} ${DPADD}
${_MKTARGET_LINK}
${HOST_LINK.c} ${HOST_LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD}
.if !empty(.MAKE.OS:M*CYGWIN*)
- ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${HOSTPROG}
+ ${HOST_SH} ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${HOSTPROG}
.endif
Index: src/tools/Makefile.host
diff -u src/tools/Makefile.host:1.30 src/tools/Makefile.host:1.31
--- src/tools/Makefile.host:1.30 Sun Feb 17 00:32:42 2013
+++ src/tools/Makefile.host Fri Jun 14 16:10:02 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.host,v 1.30 2013/02/17 00:32:42 christos Exp $
+# $NetBSD: Makefile.host,v 1.31 2013/06/14 16:10:02 tsutsui Exp $
NOINFO= # defined
NOLINT= # defined
@@ -61,7 +61,7 @@ ${HOST_INSTALLPROG}:: ${HOSTPROG}
mkdir -p ${HOST_BINDIR}
${HOST_INSTALL_FILE} -m ${BINMODE} ${HOSTPROG}${HOSTEXEEXT} ${.TARGET}
.if !empty(.MAKE.OS:M*CYGWIN*)
- ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${.TARGET}
+ ${HOST_SH} ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${.TARGET}
.endif
.if ${MKUPDATE} == "no"
Index: src/tools/texinfo/Makefile
diff -u src/tools/texinfo/Makefile:1.10 src/tools/texinfo/Makefile:1.11
--- src/tools/texinfo/Makefile:1.10 Sun Feb 17 01:47:59 2013
+++ src/tools/texinfo/Makefile Fri Jun 14 16:10:02 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/02/17 01:47:59 christos Exp $
+# $NetBSD: Makefile,v 1.11 2013/06/14 16:10:02 tsutsui Exp $
MODULE= texinfo
@@ -9,5 +9,5 @@ CONFIGURE_ARGS= --program-prefix=${_TOOL
.if !empty(.MAKE.OS:M*CYGWIN*) && target(install)
.END: install-texinfo
install-texinfo:
- ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${TOOLDIR}/bin/${_TOOL_PREFIX}install-info.exe
+ ${HOST_SH} ${NETBSDSRCDIR}/tools/binstall/mkmanifest ${TOOLDIR}/bin/${_TOOL_PREFIX}install-info.exe
.endif
