aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames <james>2009-05-06 01:31:37 +0000
committerjames <james>2009-05-06 01:31:37 +0000
commit6a02c68be3c41cea2d20c556073aacd5f46835ed (patch)
tree46d380ea553924b0716c5487a5de19f71819a58b
parent14480f6f380fc43e47716d5f5da4fa7e591c8ab5 (diff)
downloadgpt-6a02c68be3c41cea2d20c556073aacd5f46835ed.tar.gz
gpt-6a02c68be3c41cea2d20c556073aacd5f46835ed.tar.bz2
gpt-6a02c68be3c41cea2d20c556073aacd5f46835ed.zip
*** empty log message ***
-rw-r--r--Makefile.am7
-rw-r--r--src/Makefile.am7
-rw-r--r--src/gpt.c6
-rw-r--r--src/guid.c6
-rw-r--r--src/version.c9
-rw-r--r--version-files19
-rw-r--r--version-md5sums1
-rw-r--r--version-micro2
8 files changed, 43 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index aae0f00..e684c7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,12 @@
# Copyright (c) 2007 James McKenzie <james@fishsoup.dhs.org>,
# All rights reserved.
#
-# $Id: Makefile.am,v 1.2 2009/05/06 01:05:01 james Exp $
+# $Id: Makefile.am,v 1.3 2009/05/06 01:40:51 james Exp $
#
# $Log: Makefile.am,v $
+# Revision 1.3 2009/05/06 01:40:51 james
+# *** empty log message ***
+#
# Revision 1.2 2009/05/06 01:05:01 james
# *** empty log message ***
#
@@ -18,5 +21,5 @@
#
SUBDIRS=src
-EXTRA_DIST=version-files version-major version-minor version-micro version-md5sums version-stamps
+EXTRA_DIST=version-files version-major version-minor version-micro version-md5sums
diff --git a/src/Makefile.am b/src/Makefile.am
index c2ecba7..ec51868 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.7 2009/05/06 01:35:00 james Exp $
+# $Id: Makefile.am,v 1.8 2009/05/06 01:40:51 james Exp $
#
# $Log: Makefile.am,v $
+# Revision 1.8 2009/05/06 01:40:51 james
+# *** empty log message ***
+#
# Revision 1.7 2009/05/06 01:35:00 james
# *** empty log message ***
#
@@ -33,7 +36,7 @@
CPROTO=cproto
INCLUDES =
-noinst_HEADERS=project.h prototypes.h
+noinst_HEADERS = disk.h gpt.h guid.h project.h prototypes.h
bin_PROGRAMS = gpt
diff --git a/src/gpt.c b/src/gpt.c
index 20bb552..73bf825 100644
--- a/src/gpt.c
+++ b/src/gpt.c
@@ -6,10 +6,13 @@
*
*/
-static char rcsid[] = "$Id: gpt.c,v 1.15 2009/05/06 01:12:55 james Exp $";
+static char rcsid[] = "$Id: gpt.c,v 1.16 2009/05/06 01:35:00 james Exp $";
/*
* $Log: gpt.c,v $
+ * Revision 1.16 2009/05/06 01:35:00 james
+ * *** empty log message ***
+ *
* Revision 1.15 2009/05/06 01:12:55 james
* *** empty log message ***
*
@@ -61,6 +64,7 @@ static char rcsid[] = "$Id: gpt.c,v 1.15 2009/05/06 01:12:55 james Exp $";
void
usage (void)
{
+ fprintf(stderr,"gpt %s\n",get_version());
fprintf (stderr,
"Usage:\n"
"gpt -h show help\n"
diff --git a/src/guid.c b/src/guid.c
index 7dfa817..f7b86b4 100644
--- a/src/guid.c
+++ b/src/guid.c
@@ -124,13 +124,13 @@ a_to_guid (char *a, GUID * g)
for (i = 0; i < 4; ++i)
{
- g->d[3-i] = (digit[(i << 1)] << 4) | digit[(i << 1) + 1];
+ g->d[3 - i] = (digit[(i << 1)] << 4) | digit[(i << 1) + 1];
}
for (i = 0; i < 2; ++i)
{
- g->d[5-i] = (digit[((i+4) << 1)] << 4) | digit[((i+4) << 1) + 1];
- g->d[7-i] = (digit[((i+6) << 1)] << 4) | digit[((i+6) << 1) + 1];
+ g->d[5 - i] = (digit[((i + 4) << 1)] << 4) | digit[((i + 4) << 1) + 1];
+ g->d[7 - i] = (digit[((i + 6) << 1)] << 4) | digit[((i + 6) << 1) + 1];
}
for (i = 8; i < 16; ++i)
diff --git a/src/version.c b/src/version.c
index e784248..57b5875 100644
--- a/src/version.c
+++ b/src/version.c
@@ -6,10 +6,13 @@
*
*/
-static char rcsid[] = "$Id: version.c,v 1.2 2007/09/09 22:29:50 root Exp $";
+static char rcsid[] = "$Id: version.c,v 1.3 2009/05/06 01:35:00 james Exp $";
/*
* $Log: version.c,v $
+ * Revision 1.3 2009/05/06 01:35:00 james
+ * *** empty log message ***
+ *
* Revision 1.2 2007/09/09 22:29:50 root
* *** empty log message ***
*
@@ -21,8 +24,8 @@ static char rcsid[] = "$Id: version.c,v 1.2 2007/09/09 22:29:50 root Exp $";
#include "version.h"
-static char *
-GetVersion (void)
+char *
+get_version (void)
{
return VERSION;
}
diff --git a/version-files b/version-files
index 8954ead..57db44c 100644
--- a/version-files
+++ b/version-files
@@ -1,3 +1,18 @@
-src/version.c
-src/project.h
+src/crc.c
+src/disk.c
+src/disk.h
+src/entry.c
src/gpt.c
+src/gpt.h
+src/guid.c
+src/guid.h
+src/header.c
+src/modify.c
+src/new.c
+src/pmbr.c
+src/project.h
+src/prototypes.h
+src/show.c
+src/sync.c
+src/util.c
+src/version.c
diff --git a/version-md5sums b/version-md5sums
index 0789c5e..ca8437f 100644
--- a/version-md5sums
+++ b/version-md5sums
@@ -1,3 +1,4 @@
745c00d2207e046f159b63dffbfbe491 1.0.1
95b82ac0870dc040a8a810114160e7c7 1.0.2
5354ab7faedaed53200e62f9e7afd371 1.0.3
+9d1eae74ea64fd014fdd10eac7b92792 1.0.4
diff --git a/version-micro b/version-micro
index 00750ed..b8626c4 100644
--- a/version-micro
+++ b/version-micro
@@ -1 +1 @@
-3
+4