CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: christos
Date: Sun Dec 13 18:38:23 UTC 2015
Modified Files:
src/sys/arch/hppa/stand/xxboot: iplsum.c
Log Message:
PR/50532: David Binderman: Add missing fclose.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/xxboot/iplsum.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/hppa/stand/xxboot/iplsum.c
diff -u src/sys/arch/hppa/stand/xxboot/iplsum.c:1.1 src/sys/arch/hppa/stand/xxboot/iplsum.c:1.2
--- src/sys/arch/hppa/stand/xxboot/iplsum.c:1.1 Mon Feb 24 02:23:43 2014
+++ src/sys/arch/hppa/stand/xxboot/iplsum.c Sun Dec 13 13:38:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iplsum.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: iplsum.c,v 1.2 2015/12/13 18:38:23 christos Exp $ */
/*
* Calculate 32bit checksum of IPL and store in a certain location
@@ -54,9 +54,11 @@ main(int argc, char *argv[])
return 1;
}
if ((len = fread(bootblk, 1, sizeof bootblk, fp)) <= IPLOFF) {
+ fclose(fp);
fprintf(stderr, "%s: too short\n", argv[1]);
return 1;
} else if (len > BOOTSIZE) {
+ fclose(fp);
fprintf(stderr, "%s: too long (%d vs %d)\n", argv[1], len, BOOTSIZE);
return 1;
}
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: dholland
Date: Sun Aug 23 04:56:20 UTC 2015
Modified Files:
src/sys/arch/hppa/stand/xxboot: readufs.h
Log Message:
Sync lfs changes with the x68k version of this code.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/stand/xxboot/readufs.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/arch/hppa/stand/xxboot/readufs.h
diff -u src/sys/arch/hppa/stand/xxboot/readufs.h:1.2 src/sys/arch/hppa/stand/xxboot/readufs.h:1.3
--- src/sys/arch/hppa/stand/xxboot/readufs.h:1.2 Thu Aug 20 07:50:08 2015
+++ src/sys/arch/hppa/stand/xxboot/readufs.h Sun Aug 23 04:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs.h,v 1.2 2015/08/20 07:50:08 christos Exp $ */
+/* $NetBSD: readufs.h,v 1.3 2015/08/23 04:56:20 dholland Exp $ */
/* from Id: readufs.h,v 1.10 2003/12/16 13:54:11 itohy Exp */
/*
@@ -24,7 +24,6 @@ union ufs_dinode {
#endif
#ifdef USE_LFS
struct lfs32_dinode dil32;
- struct lfs64_dinode dil64;
#endif
};
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: christos
Date: Thu Aug 20 07:50:08 UTC 2015
Modified Files:
src/sys/arch/hppa/stand/xxboot: readufs.h readufs_lfs.c
Log Message:
minimal changes to get this to compile.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/xxboot/readufs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/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/hppa/stand/xxboot/readufs.h
diff -u src/sys/arch/hppa/stand/xxboot/readufs.h:1.1 src/sys/arch/hppa/stand/xxboot/readufs.h:1.2
--- src/sys/arch/hppa/stand/xxboot/readufs.h:1.1 Mon Feb 24 02:23:43 2014
+++ src/sys/arch/hppa/stand/xxboot/readufs.h Thu Aug 20 03:50:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: readufs.h,v 1.2 2015/08/20 07:50:08 christos Exp $ */
/* from Id: readufs.h,v 1.10 2003/12/16 13:54:11 itohy Exp */
/*
@@ -23,8 +23,8 @@ union ufs_dinode {
struct ufs2_dinode di2;
#endif
#ifdef USE_LFS
- struct ulfs1_dinode dil1;
- struct ulfs2_dinode dil2;
+ struct lfs32_dinode dil32;
+ struct lfs64_dinode dil64;
#endif
};
Index: src/sys/arch/hppa/stand/xxboot/readufs_lfs.c
diff -u src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.2 src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.3
--- src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.2 Tue Jul 28 12:50:12 2015
+++ src/sys/arch/hppa/stand/xxboot/readufs_lfs.c Thu Aug 20 03:50:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_lfs.c,v 1.2 2015/07/28 16:50:12 christos Exp $ */
+/* $NetBSD: readufs_lfs.c,v 1.3 2015/08/20 07:50:08 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 ulfs1_dinode ifile_dinode;
+static struct lfs32_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 ulfs1_dinode *di, *diend;
+ struct lfs32_dinode *di, *diend;
int i;
/* Get fs block which contains the specified inode. */
@@ -173,7 +173,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
i = ino % fsi_lfs.ifpb;
daddr = (fsi_lfs.version == 1) ?
((IFILE_V1 *) buf + i)-if_daddr
- : ((IFILE *) buf + i)-if_daddr;
+ : ((IFILE32 *) buf + i)-if_daddr;
}
#ifdef DEBUG_WITH_STDIO
printf(LFS(%d): daddr: %d\n, ino, (int) daddr);
@@ -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 ulfs1_dinode *) buf;
+ di = (struct lfs32_dinode *) buf;
diend = di + fsi_lfs.inopb;
for ( ; di diend; di++)
@@ -210,7 +210,7 @@ found:
#endif
#endif
- dibuf-dil1 = *di;
+ dibuf-dil32 = *di;
return 0;
}
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: christos
Date: Tue Jul 28 16:50:12 UTC 2015
Modified Files:
src/sys/arch/hppa/stand/xxboot: readufs_lfs.c
Log Message:
fix build.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/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/hppa/stand/xxboot/readufs_lfs.c
diff -u src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.1 src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.2
--- src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.1 Mon Feb 24 02:23:43 2014
+++ src/sys/arch/hppa/stand/xxboot/readufs_lfs.c Tue Jul 28 12:50:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_lfs.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: readufs_lfs.c,v 1.2 2015/07/28 16:50:12 christos Exp $ */
/* from Id: readufs_lfs.c,v 1.8 2003/12/16 13:54:11 itohy Exp */
/*
@@ -104,7 +104,7 @@ try_lfs(void)
if (sblk2.dlfs_magic == LFS_MAGIC) {
if (fsi_lfs.version == 1) {
-if (sblk.dlfs_otstamp sblk2.dlfs_otstamp)
+if (sblk.dlfs_inopf sblk2.dlfs_inopf)
s = sblk2;
} else {
if (sblk.dlfs_serial sblk2.dlfs_serial)
