[Parted-commits] GNU Parted Official Repository: Changes to 'master'
Jim Meyering
meyering at alioth.debian.org
Thu Dec 17 11:49:38 UTC 2009
dist-check.mk | 57 +++++++++++++++++++++++++++++++++----------------
gnulib | 2 -
libparted/labels/dos.c | 1
libparted/labels/gpt.c | 4 +--
libparted/labels/mac.c | 10 ++++++--
libparted/labels/sun.c | 2 -
6 files changed, 50 insertions(+), 26 deletions(-)
New commits:
commit 4e02413718bee3813222b868e13c30ccc96ed764
Author: Jim Meyering <meyering at redhat.com>
Date: Wed Dec 16 18:20:23 2009 +0100
libparted: plug a leak in mac_write
* libparted/labels/mac.c (mac_write): Free mac_driverdata.
diff --git a/libparted/labels/mac.c b/libparted/labels/mac.c
index e90ab07..4f988a8 100644
--- a/libparted/labels/mac.c
+++ b/libparted/labels/mac.c
@@ -1163,7 +1163,9 @@ mac_write (PedDisk* disk)
mac_disk_data->part_map_entry_count))
goto error_free_part_map;
free (part_map);
- return write_block_zero (disk, mac_driverdata);
+ int write_ok = write_block_zero (disk, mac_driverdata);
+ free (mac_driverdata);
+ return write_ok;
error_free_part_map:
free (part_map);
commit 7f5d6cfd525c520404c51770965328ece8da0a17
Author: Jim Meyering <meyering at redhat.com>
Date: Wed Dec 16 18:02:58 2009 +0100
maint: use "int", not "bool" for value returned by ped_device_write
* libparted/labels/gpt.c (gpt_write): Correct type of local.
* libparted/labels/mac.c (mac_clobber): Likewise.
* libparted/labels/sun.c (sun_write): Likewise.
diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
index 1aaef8a..4ae7b59 100644
--- a/libparted/labels/gpt.c
+++ b/libparted/labels/gpt.c
@@ -1213,7 +1213,7 @@ gpt_write (const PedDisk *disk)
if ((pth_raw = pth_get_raw (disk->dev, gpt)) == NULL)
goto error_free_ptes;
pth_free (gpt);
- bool write_ok = ped_device_write (disk->dev, pth_raw, 1, 1);
+ int write_ok = ped_device_write (disk->dev, pth_raw, 1, 1);
free (pth_raw);
if (!write_ok)
goto error_free_ptes;
diff --git a/libparted/labels/mac.c b/libparted/labels/mac.c
index 27756ba..e90ab07 100644
--- a/libparted/labels/mac.c
+++ b/libparted/labels/mac.c
@@ -394,7 +394,7 @@ mac_clobber (PedDevice* dev)
}
memset (buf, 0, dev->sector_size);
- bool ok = ped_device_write (dev, buf, 0, 1);
+ int ok = ped_device_write (dev, buf, 0, 1);
free (buf);
if (!ok)
return 0;
diff --git a/libparted/labels/sun.c b/libparted/labels/sun.c
index 1622433..af6e1ef 100644
--- a/libparted/labels/sun.c
+++ b/libparted/labels/sun.c
@@ -522,7 +522,7 @@ sun_write (const PedDisk* disk)
verify (sizeof *label == 512);
memcpy (s0, label, sizeof *label);
- bool write_ok = ped_device_write (disk->dev, s0, 0, 1);
+ int write_ok = ped_device_write (disk->dev, s0, 0, 1);
free (s0);
if (write_ok)
commit 75720971bef62ba24a285165554631e80a23f3b6
Author: Jim Meyering <meyering at redhat.com>
Date: Wed Dec 16 18:00:38 2009 +0100
libparted: plug a leak in mac's write_block_zero
* libparted/labels/mac.c (write_block_zero): Don't leak a
1-sector-sized buffer.
diff --git a/libparted/labels/mac.c b/libparted/labels/mac.c
index d441140..27756ba 100644
--- a/libparted/labels/mac.c
+++ b/libparted/labels/mac.c
@@ -1095,7 +1095,9 @@ write_block_zero (PedDisk* disk, MacDiskData* mac_driverdata)
memcpy(&raw_disk->driverlist[0], &mac_driverdata->driverlist[0],
sizeof(raw_disk->driverlist));
- return ped_device_write (dev, raw_disk, 0, 1);
+ int write_ok = ped_device_write (dev, raw_disk, 0, 1);
+ free (s0);
+ return write_ok;
}
static int
commit 86892b5bd6b7fb938376c42db419dc69a55baa11
Author: Jim Meyering <meyering at redhat.com>
Date: Wed Dec 16 17:55:07 2009 +0100
dos: remove unreachable code
* libparted/labels/dos.c (msdos_partition_new): Remove dead code.
diff --git a/libparted/labels/dos.c b/libparted/labels/dos.c
index ea8fc0b..2566435 100644
--- a/libparted/labels/dos.c
+++ b/libparted/labels/dos.c
@@ -1257,7 +1257,6 @@ msdos_partition_new (const PedDisk* disk, PedPartitionType part_type,
}
return part;
- free (dos_data);
error_free_part:
free (part);
error:
commit f8edf1dc1442027b7ec57916ea7c535ba563ae0d
Author: Jim Meyering <meyering at redhat.com>
Date: Wed Dec 16 17:51:23 2009 +0100
libparted: plug a leak in gpt_probe
* libparted/labels/gpt.c (gpt_probe): Avoid a leak when dev->length
is one sector or smaller.
diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
index 15da1a0..1aaef8a 100644
--- a/libparted/labels/gpt.c
+++ b/libparted/labels/gpt.c
@@ -444,7 +444,6 @@ static int
gpt_probe (const PedDevice *dev)
{
GuidPartitionTableHeader_t *gpt = NULL;
- uint8_t *pth_raw = ped_malloc (pth_get_size (dev));
int gpt_sig_found = 0;
PED_ASSERT (dev != NULL, return 0);
@@ -452,6 +451,7 @@ gpt_probe (const PedDevice *dev)
if (dev->length <= 1)
return 0;
+ void *pth_raw = ped_malloc (pth_get_size (dev));
if (ped_device_read (dev, pth_raw, 1, GPT_HEADER_SECTORS)
|| ped_device_read (dev, pth_raw, dev->length - 1, GPT_HEADER_SECTORS))
{
commit b3f0addf8c4fff140458ce0afbfc561c88cef98a
Author: Jim Meyering <meyering at redhat.com>
Date: Mon Dec 14 11:33:43 2009 +0100
maint: improve dist-check.mk rules
* dist-check.mk (null_AM_MAKEFLAGS): Remove LIBTOOL. Adding it was
erroneous, since it is required when building from a distribution
tarball of a libtool-using project. Reported by Ralf Wildenhues.
(my-distcheck): Reorganize to use a subshell and set -e, so that
failures propagate "out". Without this change, setting LIBTOOL=false
would cause a failure that would then be ignored, probably due to a
problem in $(install-transform-check).
diff --git a/dist-check.mk b/dist-check.mk
index d63b5b6..310f0d0 100644
--- a/dist-check.mk
+++ b/dist-check.mk
@@ -141,7 +141,6 @@ null_AM_MAKEFLAGS ?= \
AUTOMAKE=false \
AUTOHEADER=false \
GPERF=false \
- LIBTOOL=false \
MAKEINFO=false
ALL_RECURSIVE_TARGETS += my-distcheck
@@ -151,14 +150,15 @@ my-distcheck: $(DIST_ARCHIVES) $(local-check)
-rm -rf $(t)
mkdir -p $(t)
$(amtar_extract_) $(preferred_tarball_) -C $(t)
- cd $(t)/$(distdir) \
- && ./configure --quiet --enable-gcc-warnings --disable-nls \
- && $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
- && $(MAKE) dvi \
- && $(install-transform-check) \
- && $(my-instcheck) \
- && $(coreutils-path-check) \
- && $(MAKE) distclean
+ (set -e; cd $(t)/$(distdir); \
+ ./configure --quiet --enable-gcc-warnings --disable-nls; \
+ $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)'; \
+ $(MAKE) dvi; \
+ $(install-transform-check); \
+ $(my-instcheck); \
+ $(coreutils-path-check); \
+ $(MAKE) distclean \
+ )
(cd $(t) && mv $(distdir) $(distdir).old \
&& $(amtar_extract_) - ) < $(preferred_tarball_)
diff -ur $(t)/$(distdir).old $(t)/$(distdir)
commit a31e237a15425b3345d40d2a22218ab1b8a1eeb3
Author: Jim Meyering <meyering at redhat.com>
Date: Mon Dec 14 11:01:10 2009 +0100
maint: dist-check.mk adapt to parted-specific details
* dist-check.mk (built_programs): Use parted/, not src/.
(install-transform-check): Search sbin/, not /bin.
Expect man pages to be in man8/*.8.
diff --git a/dist-check.mk b/dist-check.mk
index dc2093b..d63b5b6 100644
--- a/dist-check.mk
+++ b/dist-check.mk
@@ -11,7 +11,7 @@ pfx=$(t)/i
built_programs = \
$$(echo 'spy:;@echo $$(PROGRAMS)' \
- | MAKEFLAGS= $(MAKE) -s -C src -f Makefile -f - spy \
+ | MAKEFLAGS= $(MAKE) -s -C parted -f Makefile -f - spy \
| fmt -1 | sed 's,$(EXEEXT)$$,,' | sort -u)
# More than once, tainted build and source directory names would
@@ -85,8 +85,8 @@ define my-instcheck
&& { fail=0; \
for i in $(built_programs); do \
test "$$i" = ginstall && i=install; \
- for j in "$(pfx)/bin/$$i" \
- "$(pfx)/share/man/man1/$$i.1"; do \
+ for j in "$(pfx)/sbin/$$i" \
+ "$(pfx)/share/man/man8/$$i.8"; do \
case $$j in *'[.1') continue;; esac; \
test -f "$$j" && : \
|| { echo "$$j not installed"; fail=1; }; \
commit 2c8eb579ac40050c6c9e442fc9ee0990f05c604b
Author: Jim Meyering <meyering at redhat.com>
Date: Sun Dec 13 19:35:43 2009 +0100
maint: sync dist-check.mk from coreutils
* dist-check.mk: Sync from coreutils.
* gnulib: Update to latest.
diff --git a/dist-check.mk b/dist-check.mk
index c8ae32c..dc2093b 100644
--- a/dist-check.mk
+++ b/dist-check.mk
@@ -9,7 +9,10 @@ tmpdir = $(abs_top_builddir)/tests/torture
t=$(tmpdir)/$(PACKAGE)/test
pfx=$(t)/i
-built_programs = $$(cd src && MAKEFLAGS= $(MAKE) -s built_programs.list)
+built_programs = \
+ $$(echo 'spy:;@echo $$(PROGRAMS)' \
+ | MAKEFLAGS= $(MAKE) -s -C src -f Makefile -f - spy \
+ | fmt -1 | sed 's,$(EXEEXT)$$,,' | sort -u)
# More than once, tainted build and source directory names would
# have caused at least one "make check" test to apply "chmod 700"
@@ -19,6 +22,23 @@ t_prefix = $(tp)/a
t_taint = '$(t_prefix) b'
fake_home = $(tp)/home
+# When extracting from a distribution tarball, extract using the fastest
+# method possible. With dist-xz, that means using the *.xz file.
+ifneq ('', $(filter *.xz, $(DIST_ARCHIVES)))
+ tar_decompress_opt_ = J
+ suffix_ = xz
+else
+ ifneq ('', $(filter *.gz, $(DIST_ARCHIVES)))
+ tar_decompress_opt_ = z
+ suffix_ = gz
+ else
+ tar_decompress_opt_ = j
+ suffix_ = bz2
+ endif
+endif
+amtar_extract_ = $(AMTAR) -$(tar_decompress_opt_)xf
+preferred_tarball_ = $(distdir).tar.$(suffix_)
+
# Ensure that tests run from tainted build and src dir names work,
# and don't affect anything in $HOME. Create witness files in $HOME,
# record their attributes, and build/test. Then ensure that the
@@ -31,7 +51,7 @@ taint-distcheck: $(DIST_ARCHIVES)
test -d $(t_taint) && chmod -R 700 $(t_taint) || :
-rm -rf $(t_taint) $(fake_home)
mkdir -p $(t_prefix) $(t_taint) $(fake_home)
- GZIP=$(GZIP_ENV) $(AMTAR) -C $(t_taint) -zxf $(distdir).tar.gz
+ $(amtar_extract_) $(preferred_tarball_) -C $(t_taint)
mkfifo $(fake_home)/fifo
touch $(fake_home)/f
mkdir -p $(fake_home)/d/e
@@ -57,7 +77,7 @@ define install-transform-check
endef
# Install, then verify that all binaries and man pages are in place.
-# Note that neither the binary, ginstall, nor the ].1 man page is installed.
+# Note that neither the binary, ginstall, nor the [.1 man page is installed.
define my-instcheck
echo running my-instcheck; \
$(MAKE) prefix=$(pfx) install \
@@ -114,7 +134,7 @@ define coreutils-path-check
endef
# Use this to make sure we don't run these programs when building
-# from a virgin tgz file, below.
+# from a virgin compressed tarball file, below.
null_AM_MAKEFLAGS ?= \
ACLOCAL=false \
AUTOCONF=false \
@@ -130,7 +150,7 @@ my-distcheck: $(DIST_ARCHIVES) $(local-check)
$(MAKE) check
-rm -rf $(t)
mkdir -p $(t)
- GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
+ $(amtar_extract_) $(preferred_tarball_) -C $(t)
cd $(t)/$(distdir) \
&& ./configure --quiet --enable-gcc-warnings --disable-nls \
&& $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
@@ -140,10 +160,11 @@ my-distcheck: $(DIST_ARCHIVES) $(local-check)
&& $(coreutils-path-check) \
&& $(MAKE) distclean
(cd $(t) && mv $(distdir) $(distdir).old \
- && $(AMTAR) -zxf - ) < $(distdir).tar.gz
+ && $(amtar_extract_) - ) < $(preferred_tarball_)
diff -ur $(t)/$(distdir).old $(t)/$(distdir)
-rm -rf $(t)
rmdir $(tmpdir)/$(PACKAGE) $(tmpdir)
@echo "========================"; \
- echo "$(distdir).tar.gz is ready for distribution"; \
+ echo "ready for distribution:"; \
+ for i in $(DIST_ARCHIVES); do echo " $$i"; done; \
echo "========================"
diff --git a/gnulib b/gnulib
index 5016c20..213efc0 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 5016c2066bfca00f5a24e0d2abaca25f0fce75fb
+Subproject commit 213efc094dda6b1b26b4e47b3282633f53ba5d55
More information about the Parted-commits
mailing list