Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/e2fsprogs/files: 0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch
Date: Fri, 03 Jul 2009 19:35:22
Message-Id: E1MMoXY-0007sN-VI@stork.gentoo.org
1 vapier 09/07/03 19:35:20
2
3 Added:
4 0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch
5 Log:
6 Apply resize2fs fix from upstream #276352 by Matthias Schwarzott, fix findfs building #275923 by Bernhard Hartleb, and tweak tex font handling #261411.
7 (Portage version: 2.2_rc33/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sys-fs/e2fsprogs/files/0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/files/0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/files/0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch?rev=1.1&content-type=text/plain
14
15 Index: 0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch
16 ===================================================================
17 https://bugs.gentoo.org/276352
18
19 From 3a4d9869d47c462c84688b0f8b15df5ab6f93381 Mon Sep 17 00:00:00 2001
20 From: Theodore Ts'o <tytso@×××.edu>
21 Date: Thu, 2 Jul 2009 13:54:22 -0400
22 Subject: [PATCH] resize2fs: Fix error message so the mountpoint is printed correctly
23
24 The resize2fs program was freeing the mountpoint information too
25 early, so garbage was getting printed instead of the correct
26 information in an error message.
27
28 Addresses-Debian-Bug: #535452
29
30 Signed-off-by: "Theodore Ts'o" <tytso@×××.edu>
31 ---
32 resize/main.c | 5 ++---
33 1 files changed, 2 insertions(+), 3 deletions(-)
34
35 diff --git a/resize/main.c b/resize/main.c
36 index 9b03ba9..2dae161 100644
37 --- a/resize/main.c
38 +++ b/resize/main.c
39 @@ -250,10 +250,8 @@ int main (int argc, char ** argv)
40 device_name);
41 exit(1);
42 }
43 - if (!(mount_flags & EXT2_MF_MOUNTED) || (mtpt[len-1] == 0)) {
44 - free(mtpt);
45 + if (!(mount_flags & EXT2_MF_MOUNTED) || (mtpt[len-1] == 0))
46 break;
47 - }
48 free(mtpt);
49 len = 2 * len;
50 }
51 @@ -453,6 +451,7 @@ int main (int argc, char ** argv)
52 ((flags & RESIZE_PERCENT_COMPLETE) ?
53 resize_progress_func : 0));
54 }
55 + free(mtpt);
56 if (retval) {
57 com_err(program_name, retval, _("while trying to resize %s"),
58 device_name);
59 --
60 1.6.3.3