[Ocfs2-tools-commits] manish commits r755 - in trunk: . ocfs2console/blkid

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-03-28 17:16:21 -0600 (Mon, 28 Mar 2005)
New Revision: 755

Modified:
   trunk/CREDITS
   trunk/ocfs2console/blkid/ChangeLog
   trunk/ocfs2console/blkid/cache.c
   trunk/ocfs2console/blkid/getsize.c
   trunk/ocfs2console/blkid/probe.c
   trunk/ocfs2console/blkid/version.c
Log:
Update to blkid 1.37


Modified: trunk/CREDITS
===================================================================
--- trunk/CREDITS	2005-03-28 23:16:06 UTC (rev 754)
+++ trunk/CREDITS	2005-03-28 23:16:21 UTC (rev 755)
@@ -30,7 +30,7 @@
 	Written by Manish Singh.
 
 ocfs2console/blkid:
-	From e2fsprogs 1.36, by Theodore Ts'o and Andreas Dilger.
+	From e2fsprogs 1.37, by Theodore Ts'o and Andreas Dilger.
 
 ocfs2console/ocfs2interface/ipwidget.py:
 	From anaconda 10.1.1.13, by Jonathan Blandford and Michael Fulbright

Modified: trunk/ocfs2console/blkid/ChangeLog
===================================================================
--- trunk/ocfs2console/blkid/ChangeLog	2005-03-28 23:16:06 UTC (rev 754)
+++ trunk/ocfs2console/blkid/ChangeLog	2005-03-28 23:16:21 UTC (rev 755)
@@ -1,3 +1,18 @@
+2005-03-21  Theodore Ts'o  <tytso at mit.edu>
+
+	* Release of E2fsprogs 1.37
+
+2005-03-21  Theodore Ts'o  <tytso at mit.edu>
+
+	* cache.c (blkid_get_cache): Ignore the BLKID_FILE environment
+		variable if blkid_get_cache() is called from a setuid
+		program.
+
+2005-03-16  Theodore Ts'o  <tytso at mit.edu>
+
+	* getsize.c (blkid_get_dev_size): Fix compilation problem on
+		Darwin systems.
+
 2006-02-05  Theodore Ts'o  <tytso at mit.edu>
 
 	* Release of E2fsprogs 1.36

Modified: trunk/ocfs2console/blkid/cache.c
===================================================================
--- trunk/ocfs2console/blkid/cache.c	2005-03-28 23:16:06 UTC (rev 754)
+++ trunk/ocfs2console/blkid/cache.c	2005-03-28 23:16:21 UTC (rev 755)
@@ -41,7 +41,7 @@
 
 	if (filename && !strlen(filename))
 		filename = 0;
-	if (!filename)
+	if (!filename && (getuid() == geteuid()))
 		filename = getenv("BLKID_FILE");
 	if (!filename)
 		filename = BLKID_CACHE_FILE;

Modified: trunk/ocfs2console/blkid/getsize.c
===================================================================
--- trunk/ocfs2console/blkid/getsize.c	2005-03-28 23:16:06 UTC (rev 754)
+++ trunk/ocfs2console/blkid/getsize.c	2005-03-28 23:16:21 UTC (rev 755)
@@ -92,7 +92,7 @@
 #ifdef DKIOCGETBLOCKCOUNT	/* For Apple Darwin */
 	if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0) {
 		if ((sizeof(blkid_loff_t) < sizeof(unsigned long long))
-		    && ((size64 / (blocksize / 512)) > 0xFFFFFFFF))
+		    && (size64 << 9 > 0xFFFFFFFF))
 			return 0; /* EFBIG */
 		return (blkid_loff_t) size64 << 9;
 	}

Modified: trunk/ocfs2console/blkid/probe.c
===================================================================
--- trunk/ocfs2console/blkid/probe.c	2005-03-28 23:16:06 UTC (rev 754)
+++ trunk/ocfs2console/blkid/probe.c	2005-03-28 23:16:21 UTC (rev 755)
@@ -127,6 +127,7 @@
 		      struct blkid_magic *id, unsigned char *buf)
 {
 	struct ext2_super_block *es;
+	const char *sec_type = 0, *label = 0;
 
 	es = (struct ext2_super_block *)buf;
 
@@ -320,6 +321,7 @@
 		       unsigned char *buf __BLKID_ATTR((unused)))
 {
 	struct swap_id_block *sws;
+	const char *label = 0;
 
 	probe_swap0(fd, cache, dev, id, buf);
 	/*

Modified: trunk/ocfs2console/blkid/version.c
===================================================================
--- trunk/ocfs2console/blkid/version.c	2005-03-28 23:16:06 UTC (rev 754)
+++ trunk/ocfs2console/blkid/version.c	2005-03-28 23:16:21 UTC (rev 755)
@@ -18,8 +18,8 @@
 
 #include "blkid.h"
 
-#define E2FSPROGS_VERSION "1.36"
-#define E2FSPROGS_DATE "05-Feb-2005"
+#define E2FSPROGS_VERSION "1.37"
+#define E2FSPROGS_DATE "21-Mar-2005"
 
 static const char *lib_version = E2FSPROGS_VERSION;
 static const char *lib_date = E2FSPROGS_DATE;