Bring in a regression for the previous fix from OpenBSD

This commit is contained in:
christos 2014-07-10 21:00:52 +00:00
parent d319c4685e
commit ffdedd8608

View File

@ -1,4 +1,4 @@
/* $NetBSD: fat.c,v 1.27 2014/07/07 18:46:45 christos Exp $ */ /* $NetBSD: fat.c,v 1.28 2014/07/10 21:00:52 christos Exp $ */
/* /*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank * Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@ -28,7 +28,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: fat.c,v 1.27 2014/07/07 18:46:45 christos Exp $"); __RCSID("$NetBSD: fat.c,v 1.28 2014/07/10 21:00:52 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <stdlib.h> #include <stdlib.h>
@ -555,13 +555,13 @@ writefat(int fs, struct bootblock *boot, struct fatEntry *fat, int correct_fat)
if (fat[cl].next == CLUST_FREE) if (fat[cl].next == CLUST_FREE)
boot->NumFree++; boot->NumFree++;
*p++ = (u_char)fat[cl].next; *p++ = (u_char)fat[cl].next;
*p++ = (u_char)((fat[cl].next >> 8) & 0xf); *p = (u_char)((fat[cl].next >> 8) & 0xf);
cl++; cl++;
if (cl >= boot->NumClusters) if (cl >= boot->NumClusters)
break; break;
if (fat[cl].next == CLUST_FREE) if (fat[cl].next == CLUST_FREE)
boot->NumFree++; boot->NumFree++;
*p |= (u_char)(fat[cl + 1].next << 4); *p++ |= (u_char)(fat[cl + 1].next << 4);
*p++ = (u_char)(fat[cl + 1].next >> 4); *p++ = (u_char)(fat[cl + 1].next >> 4);
break; break;
} }