| g_label_msdosfs.c (162834) | g_label_msdosfs.c (188492) |
|---|---|
| 1/*- 2 * Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org> 3 * Copyright (c) 2006 Tobias Reifenberger 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 12 unchanged lines hidden (view full) --- 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * SUCH DAMAGE. 26 */ 27 28#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org> 3 * Copyright (c) 2006 Tobias Reifenberger 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 12 unchanged lines hidden (view full) --- 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * SUCH DAMAGE. 26 */ 27 28#include <sys/cdefs.h> |
| 29__FBSDID("$FreeBSD: head/sys/geom/label/g_label_msdosfs.c 162834 2006-09-30 08:16:49Z pjd $"); | 29__FBSDID("$FreeBSD: head/sys/geom/label/g_label_msdosfs.c 188492 2009-02-11 18:13:20Z lulf $"); |
| 30 31#include <sys/param.h> 32#include <sys/systm.h> 33#include <sys/kernel.h> 34#include <sys/malloc.h> 35 36#include <geom/geom.h> 37#include <geom/label/g_label.h> --- 143 unchanged lines hidden (view full) --- 181 /* 182 * The name of the entry is the volume label if 183 * ATTR_VOLUME_ID is set. 184 */ 185 if (pfat_entry->DIR_Attr & 186 FAT_DES_ATTR_VOLUME_ID) { 187 strlcpy(label, pfat_entry->DIR_Name, 188 MIN(size, | 30 31#include <sys/param.h> 32#include <sys/systm.h> 33#include <sys/kernel.h> 34#include <sys/malloc.h> 35 36#include <geom/geom.h> 37#include <geom/label/g_label.h> --- 143 unchanged lines hidden (view full) --- 181 /* 182 * The name of the entry is the volume label if 183 * ATTR_VOLUME_ID is set. 184 */ 185 if (pfat_entry->DIR_Attr & 186 FAT_DES_ATTR_VOLUME_ID) { 187 strlcpy(label, pfat_entry->DIR_Name, 188 MIN(size, |
| 189 sizeof(pfat_bsbpb->BS_VolLab) + 1)); | 189 sizeof(pfat_entry->DIR_Name) + 1)); |
| 190 goto endofchecks; 191 } 192 } while((uint8_t *)(++pfat_entry) < 193 (uint8_t *)(sector + fat_BytesPerSector)); 194 g_free(sector); 195 } 196 } else { 197 G_LABEL_DEBUG(1, "MSDOSFS: %s: no FAT volume detected.", --- 25 unchanged lines hidden --- | 190 goto endofchecks; 191 } 192 } while((uint8_t *)(++pfat_entry) < 193 (uint8_t *)(sector + fat_BytesPerSector)); 194 g_free(sector); 195 } 196 } else { 197 G_LABEL_DEBUG(1, "MSDOSFS: %s: no FAT volume detected.", --- 25 unchanged lines hidden --- |