*** empty log message ***

10 files changed, 409 insertions, 22 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 6b4b5e4..79e36c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,9 +5,12 @@
 # Copyright (c) 2007 James McKenzie <james@fishsoup.dhs.org>,
 # All rights reserved.
 #
-# $Id: Makefile.am,v 1.1 2007/09/08 16:49:37 root Exp $
+# $Id: Makefile.am,v 1.2 2007/09/08 18:21:23 root Exp $
 #
 # $Log: Makefile.am,v $
+# Revision 1.2  2007/09/08 18:21:23  root
+# *** empty log message ***
+#
 # Revision 1.1  2007/09/08 16:49:37  root
 # *** empty log message ***
 #
@@ -22,7 +25,7 @@ noinst_HEADERS=project.h prototypes.h
 
 bin_PROGRAMS = gpt
 
-SRCS=gpt.c version.c
+SRCS=gpt.c version.c util.c guid.c crc.c header.c
 gpt_SOURCES = ${SRCS}
 gpt_LDADD = 
 
diff --git a/src/crc.c b/src/crc.c
new file mode 100644
index 0000000..de1a085
--- /dev/null
+++ b/src/crc.c
@@ -0,0 +1,77 @@
+#include "project.h"
+
+static const uint32_t crc_table[256] = {
+  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+  0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+  0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+  0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+  0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+  0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+  0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+  0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+  0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+  0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+  0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+  0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+  0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+  0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+  0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+  0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+  0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+  0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+  0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+  0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+  0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+  0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+  0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+  0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+  0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+  0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+  0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+  0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+  0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+  0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+  0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+  0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+  0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+  0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+  0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+  0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+  0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+  0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+  0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+  0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+  0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+  0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+  0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+  0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+  0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+  0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+  0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+  0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+  0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+  0x2d02ef8dL
+};
+
+#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
+#define DO2(buf)  DO1(buf); DO1(buf);
+#define DO4(buf)  DO2(buf); DO2(buf);
+#define DO8(buf)  DO4(buf); DO4(buf);
+
+uint32_t crc32(uint32_t crc, const uint8_t *buf, int len)
+{
+    if (!buf) return 0;
+
+    crc = crc ^ 0xffffffffL;
+    while (len >= 8)
+    {
+      DO8(buf);
+      len -= 8;
+    }
+    if (len) do {
+      DO1(buf);
+    } while (--len);
+    return crc ^ 0xffffffffL;
+}
diff --git a/src/gpt.c b/src/gpt.c
index f392710..c0f4bf5 100644
--- a/src/gpt.c
+++ b/src/gpt.c
@@ -6,10 +6,13 @@
  *
  */
 
-static char rcsid[] = "$Id: gpt.c,v 1.1 2007/09/08 16:49:37 root Exp $";
+static char rcsid[] = "$Id: gpt.c,v 1.2 2007/09/08 18:21:23 root Exp $";
 
 /*
  * $Log: gpt.c,v $
+ * Revision 1.2  2007/09/08 18:21:23  root
+ * *** empty log message ***
+ *
  * Revision 1.1  2007/09/08 16:49:37  root
  * *** empty log message ***
  *
@@ -23,5 +26,34 @@ static char rcsid[] = "$Id: gpt.c,v 1.1 2007/09/08 16:49:37 root Exp $";
 int
 main (int argc, char *argv[])
 {
+int fd;
+char buf[512];
+GPT_entry *e;
+GPT_header *h;
+int i,j;
+
+fd=open("/dev/sda",O_RDONLY);
+
+
+read(fd,buf,512);
+read(fd,buf,512);
+
+h=(GPT_header *) buf;
+
+header_print(h);
+
+
+
+for (i=0;i<2;++i) {
+read(fd,buf,512);
+//hexdump(stderr,buf,0,512);
+for (j=0;j<4;++j) {
+e=(GPT_entry *) buf;
+e+=j;
+printf("%d,%d: %s\n",i,j,guid_to_a(e->type));
+}
+}
+
+
   return 0;
 }
diff --git a/src/gpt.h b/src/gpt.h
index 80742ea..5f1857c 100644
--- a/src/gpt.h
+++ b/src/gpt.h
@@ -1,15 +1,12 @@
-#define PACKED __attribute__((packed))
 
-#define TYPE_EMPTY  "00000000-0000-0000-0000-000000000000"
-#define TYPE_SYSTEM "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
-
-typedef PACKED struct
-{
-  uint8_t d[16];
-} GUID;
+#define GUID_TYPE_EMPTY MAKE_GUID(0,0,0,0,0)
+#define GUID_TYPE_SYSTEM MAKE_GUID(C12A7328,F81F,11D2,BA4B,00A0C93EC93B)
+#define GUID_TYPE_LINUX_EXT3 MAKE_GUID(EBD0A0A2,B9E5,4433,87C0,68B6B72699C7)
+#define GUID_TYPE_LINUX_SWAP MAKE_GUID(0657FD6D,A4AB,43C4,84E5,0933C84B4F4F)
+#define GUID_TYPE_APPLE_HFS MAKE_GUID(48465300,0000,11AA,AA11,00306543ECAC)
 
 #define GPT_ENTRY_FLAG_SYSTEM 1
-typedef PACKED struct
+typedef struct
 {
   GUID type;
   GUID label;
@@ -17,12 +14,12 @@ typedef PACKED struct
   uint64_t end;
   uint64_t flags;
   uint8_t name[72];
-} GPT_entry;
+} PACKED GPT_entry;
 
 #define GPT_HEADER_SIGNATURE "EFI PART"
 #define GPT_HEADER_REVISION_EFI10 0x00010000
 
-typedef PACKED struct
+typedef struct
 {
   uint8_t signature[8];
   uint32_t revision;
@@ -38,7 +35,7 @@ typedef PACKED struct
   uint32_t n_partition_entries;
   uint32_t partition_entry_size;
   uint32_t partition_entry_crc;
-} GPT_header;
+} PACKED GPT_header;
 
 
 
@@ -46,14 +43,14 @@ typedef PACKED struct
 #define MBR_PARTITION_TYPE_EFI 0xee
 #define MBR_PARTITION_BOOTABLE 0x80
 
-typedef PACKED struct
+typedef struct
 {
   uint8_t head;
   uint8_t sector;
   uint8_t track;
-} CHS;
+} PACKED CHS;
 
-typedef PACKED struct
+typedef struct
 {
   uint8_t bootable;
   CHS chs_start;
@@ -61,13 +58,13 @@ typedef PACKED struct
   CHS chs_end;
   uint32_t start;
   uint32_t size;
-} MBR_entry;
+} PACKED MBR_entry;
 
-typedef PACKED struct
+typedef struct
 {
   uint8_t boot_code[440];
   uint8_t uid[4];
   uint8_t reserved[2];
   MBR_entry entry[4];
   uint8_t signature[2];
-} MBR;
+} PACKED MBR;
diff --git a/src/guid.c b/src/guid.c
new file mode 100644
index 0000000..d9d5dcb
--- /dev/null
+++ b/src/guid.c
@@ -0,0 +1,122 @@
+#include "project.h"
+
+
+static struct known_struct
+{
+  GUID g;
+  char *name;
+} known_guids[] =
+{
+  { GUID_TYPE_EMPTY, "empty"},
+  { GUID_TYPE_SYSTEM, "EFI SYSTEM"},
+{GUID_TYPE_LINUX_EXT3,"linux-ext3"},
+{GUID_TYPE_LINUX_SWAP,"linux-swap"}, 
+{GUID_TYPE_APPLE_HFS,"apple-hfs"},
+  { {0}, NULL}
+};
+
+
+int guid_cmp(GUID *a,GUID *b)
+{
+return memcmp(a,b,sizeof(GUID));
+}
+
+#define GUIDTOARETSIZE 80
+char *
+guid_to_a (GUID g)
+{
+  char *ret = malloc (GUIDTOARETSIZE);
+  struct known_struct *ptr = known_guids;
+
+  snprintf (ret, GUIDTOARETSIZE,
+            "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X",
+            g.d[3], g.d[2], g.d[1], g.d[0], g.d[5], g.d[4], g.d[7], g.d[6],
+            g.d[8], g.d[9], g.d[10], g.d[11], g.d[12], g.d[13], g.d[14],
+            g.d[15]);
+
+  while (ptr->name)
+    {
+      if (!guid_cmp (&g, &ptr->g))
+        {
+          strcat (ret, " (");
+          strcat (ret, ptr->name);
+          strcat (ret, ")");
+        }
+      ptr++;
+    }
+
+  return ret;
+}
+
+int
+a_to_guid (char *a,GUID *g)
+{
+  struct known_struct *ptr = known_guids;
+  int  digit[32],ndigits=0,i;
+
+  while (ptr->name)
+    {
+      if (!strcmp (a, ptr->name))
+        memcpy(g,&ptr->g,sizeof(GUID));
+	return 0;
+    }
+
+ while ((*a) && (ndigits!=32)) {
+  switch (*a) {
+	case ' ':
+	case '\t':
+	case '\n':
+	case '\r':
+	case '-':
+		break;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+		digit[ndigits++]=(*a)-'0';
+		break;
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+		digit[ndigits++]=((*a)-'A')+0xA;
+		break;
+
+	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+		digit[ndigits++]=((*a)-'a')+0xa;
+		break;
+	defalt:
+	return -1;
+	}
+	}
+
+for (i=0;i<16;++i) {
+	g->d[i]=(digit[(i<<1)] << 4) | digit[(i<<1)+1];
+}
+
+  return 0;
+}
+ 
+
+GUID random_guid(void)
+{
+GUID ret;
+
+int fd=open("/dev/random",O_RDONLY);
+read(fd,&ret,sizeof(ret));
+close(fd);
+return ret;
+}
diff --git a/src/guid.h b/src/guid.h
new file mode 100644
index 0000000..f92607d
--- /dev/null
+++ b/src/guid.h
@@ -0,0 +1,40 @@
+
+#define GUID_16(a) \
+	(((a) >> 8) & 0xff), \
+	(((a)) & 0xff),
+
+#define GUID_48(a) \
+	(((a) >> 40) & 0xff), \
+	(((a) >> 32) & 0xff), \
+	(((a) >> 24) & 0xff), \
+	(((a) >> 16) & 0xff), \
+	(((a) >> 8) & 0xff), \
+	(((a)) & 0xff),
+
+#define GUID_FLIP_32(a) \
+	(((a)) & 0xff), \
+	(((a) >> 8) & 0xff), \
+	(((a) >> 16) & 0xff), \
+	(((a) >> 24) & 0xff),
+
+#define GUID_FLIP_16(a) \
+	(((a)) & 0xff), \
+	(((a) >> 8) & 0xff),
+
+#define MAKE_GUID(a,b,c,d,e)  \
+	{{ \
+	GUID_FLIP_32(0x ## a) \
+	GUID_FLIP_16(0x ## b) \
+	GUID_FLIP_16(0x ## c) \
+	GUID_16(0x ## d) \
+	GUID_48(0x ## e ## ULL) \
+	}}
+
+typedef struct
+{
+  uint8_t d[16];
+} PACKED GUID;
+
+
+
+
diff --git a/src/header.c b/src/header.c
new file mode 100644
index 0000000..d577837
--- /dev/null
+++ b/src/header.c
@@ -0,0 +1,36 @@
+#include "project.h"
+
+void header_print(uint8_t *buf)
+{
+GPT_header *h=(GPT_header *)  buf;
+
+
+printf ("Signature %c%c%c%c%c%c%c%c\n",
+	h->signature[0],
+	h->signature[1],
+	h->signature[2],
+	h->signature[3],
+	h->signature[4],
+	h->signature[5],
+	h->signature[6],
+	h->signature[7]);
+
+printf("rev=0x%08x header_size=%d header_crc=0x%08x\n",
+	h->revision,h->header_size,h->header_crc);
+printf("my_lba=%lld alternate_lba=%lld first_lba=%lld last_lba=%lld\n",
+		(long long) h->my_lba, (long long) h->alternate_lba,
+		(long long) h->first_usable_lba,(long long) h->last_usable_lba);
+
+printf("guid=%s\n",guid_to_a(h->disk_guid));
+printf("partition_entry_lba=%lld n_entries=%d ent_size=%d ents_crc=%08x\n",
+	(long long) h->partition_entry_lba, h->n_partition_entries,
+	h->partition_entry_size,h->partition_entry_crc);
+
+printf("%x\n",crc32(0,buf,92));
+h->header_crc=0;
+printf("%x\n",crc32(0,buf,92));
+h->partition_entry_crc=0;
+printf("%x\n",crc32(0,buf,92));
+
+}
+
diff --git a/src/project.h b/src/project.h
index 4a1063e..d3e7562 100644
--- a/src/project.h
+++ b/src/project.h
@@ -7,11 +7,14 @@
  */
 
 /*
- * $Id: project.h,v 1.1 2007/09/08 16:49:37 root Exp $
+ * $Id: project.h,v 1.2 2007/09/08 18:21:24 root Exp $
  */
 
 /*
  * $Log: project.h,v $
+ * Revision 1.2  2007/09/08 18:21:24  root
+ * *** empty log message ***
+ *
  * Revision 1.1  2007/09/08 16:49:37  root
  * *** empty log message ***
  *
@@ -60,6 +63,14 @@
 #include <sys/int_types.h>
 #endif
 
+#include <sys/types.h>
+#include <fcntl.h>
+
+#define PACKED __attribute__((packed))
+
+#include "guid.h"
+#include "gpt.h"
+
 #include "prototypes.h"
 
 #endif /* __PROJECT_H__ */
diff --git a/src/prototypes.h b/src/prototypes.h
index e69de29..a3f15d4 100644
--- a/src/prototypes.h
+++ b/src/prototypes.h
@@ -0,0 +1,14 @@
+/* gpt.c */
+int main(int argc, char *argv[]);
+/* version.c */
+/* util.c */
+void hexdump(FILE *f, uint8_t *data, int s, int l);
+/* guid.c */
+int guid_cmp(GUID *a, GUID *b);
+char *guid_to_a(GUID g);
+int a_to_guid(char *a, GUID *g);
+GUID random_guid(void);
+/* crc.c */
+uint32_t crc32(uint32_t crc, const uint8_t *buf, int len);
+/* header.c */
+void header_print(uint8_t *buf);
diff --git a/src/util.c b/src/util.c
new file mode 100644
index 0000000..32071fd
--- /dev/null
+++ b/src/util.c
@@ -0,0 +1,55 @@
+#include "project.h"
+
+void
+hexdump (FILE * f, uint8_t * data, int s, int l)
+{
+  int e = s + l - 1;
+  int b = s & ~15;
+  int a = (e | 15) + 1;
+  int i, j;
+
+  for (i = b; i < a; i += 16)
+    {
+      fprintf (f, "      %04x: ", i);
+      for (j = i; j < (i + 16); ++j)
+        {
+          if (j == (i + 8))
+            fprintf (f, " ");
+
+          if ((j >= s) && (j <= e))
+            {
+              fprintf (f, "%02x ", data[j]);
+            }
+          else
+            {
+              fprintf (f, "   ");
+            }
+        }
+
+      for (j = i; j < (i + 16); ++j)
+        {
+
+          if (j == (i + 8))
+            fprintf (f, " ");
+
+
+          if ((j >= s) && (j <= e))
+            {
+              uint8_t c = data[j];
+              if ((c < ' ') || (c > 126))
+                c = '.';
+              fprintf (f, "%c", c);
+            }
+          else
+            {
+              fprintf (f, " ");
+            }
+        }
+
+
+      fprintf (f, "\n");
+    }
+
+}
+
+