Deleted Added
full compact
mbr.c (263918) mbr.c (263926)
1/*-
2 * Copyright (c) 2014 Juniper Networks, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2014 Juniper Networks, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/usr.bin/mkimg/mbr.c 263896 2014-03-29 03:46:36Z marcel $");
28__FBSDID("$FreeBSD: head/usr.bin/mkimg/mbr.c 263926 2014-03-29 23:46:01Z marcel $");
29
30#include <sys/types.h>
31#include <sys/diskmbr.h>
32#include <sys/endian.h>
33#include <sys/errno.h>
34#include <stdlib.h>
35#include <string.h>
36#include <unistd.h>
37
38#include "mkimg.h"
39#include "scheme.h"
40
29
30#include <sys/types.h>
31#include <sys/diskmbr.h>
32#include <sys/endian.h>
33#include <sys/errno.h>
34#include <stdlib.h>
35#include <string.h>
36#include <unistd.h>
37
38#include "mkimg.h"
39#include "scheme.h"
40
41#ifndef DOSPTYP_FAT32
42#define DOSPTYP_FAT32 0x0b
43#endif
44
41static struct mkimg_alias mbr_aliases[] = {
42 { ALIAS_EBR, ALIAS_INT2TYPE(DOSPTYP_EXT) },
43 { ALIAS_FAT32, ALIAS_INT2TYPE(DOSPTYP_FAT32) },
44 { ALIAS_FREEBSD, ALIAS_INT2TYPE(DOSPTYP_386BSD) },
45 { ALIAS_NONE, 0 } /* Keep last! */
46};
47
48static u_int

--- 67 unchanged lines hidden ---
45static struct mkimg_alias mbr_aliases[] = {
46 { ALIAS_EBR, ALIAS_INT2TYPE(DOSPTYP_EXT) },
47 { ALIAS_FAT32, ALIAS_INT2TYPE(DOSPTYP_FAT32) },
48 { ALIAS_FREEBSD, ALIAS_INT2TYPE(DOSPTYP_386BSD) },
49 { ALIAS_NONE, 0 } /* Keep last! */
50};
51
52static u_int

--- 67 unchanged lines hidden ---