Archives
Archives
| From: | "Mike Frysinger (vapier)" <vapier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in sys-fs/e2fsprogs/files: e2fsprogs-1.40.3-fsck-fuse.patch digest-e2fsprogs-1.40.3-r1 |
| Date: | Mon, 24 Dec 2007 12:49:59 |
| Message-Id: | E1J6mkj-0005HO-W0@stork.gentoo.org |
| 1 | vapier 07/12/24 12:49:53 |
| 2 | |
| 3 | Added: e2fsprogs-1.40.3-fsck-fuse.patch |
| 4 | digest-e2fsprogs-1.40.3-r1 |
| 5 | Log: |
| 6 | Add patch from upstream for fuse syntax which has inline # characters #195405 by Thorsten Kampe. |
| 7 | (Portage version: 2.1.4_rc11) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 sys-fs/e2fsprogs/files/e2fsprogs-1.40.3-fsck-fuse.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/files/e2fsprogs-1.40.3-fsck-fuse.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/files/e2fsprogs-1.40.3-fsck-fuse.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: e2fsprogs-1.40.3-fsck-fuse.patch |
| 16 | =================================================================== |
| 17 | http://bugs.gentoo.org/195405 |
| 18 | |
| 19 | commit 5221837e62641958f237e7fb5dee999cbfc850c9 |
| 20 | Author: Theodore Ts'o <tytso@×××.edu> |
| 21 | Date: Sun Dec 16 15:41:15 2007 -0500 |
| 22 | |
| 23 | fsck: '#' is only a comment character at the beginning of an fstab line |
| 24 | |
| 25 | Fuse and ssh fstab lines such as: |
| 26 | |
| 27 | wdfs#https://dav.hoster.com/foo/bar /mnt/hoster fuse user,noauto 0 0 |
| 28 | |
| 29 | will cause fsck to issue warnings about invalid fstab lines, because |
| 30 | fsck was previously treating '#' as a comment when it appeared |
| 31 | anywhere in an fstab line, not just at the beginning of the line. |
| 32 | |
| 33 | Addresses-Gentoo-bug: #195405 |
| 34 | Addresses-Sourceforge-bug: #1826147 |
| 35 | |
| 36 | Signed-off-by: "Theodore Ts'o" <tytso@×××.edu> |
| 37 | |
| 38 | diff --git a/misc/fsck.c b/misc/fsck.c |
| 39 | index 108adf6..5cf1a1c 100644 |
| 40 | --- a/misc/fsck.c |
| 41 | +++ b/misc/fsck.c |
| 42 | @@ -275,20 +275,17 @@ static int parse_fstab_line(char *line, struct fs_info **ret_fs) |
| 43 | |
| 44 | *ret_fs = 0; |
| 45 | strip_line(line); |
| 46 | - if ((cp = strchr(line, '#'))) |
| 47 | - *cp = 0; /* Ignore everything after the comment char */ |
| 48 | cp = line; |
| 49 | |
| 50 | device = parse_word(&cp); |
| 51 | + if (!device || *device == '#') |
| 52 | + return 0; /* Ignore blank lines and comments */ |
| 53 | mntpnt = parse_word(&cp); |
| 54 | type = parse_word(&cp); |
| 55 | opts = parse_word(&cp); |
| 56 | freq = parse_word(&cp); |
| 57 | passno = parse_word(&cp); |
| 58 | |
| 59 | - if (!device) |
| 60 | - return 0; /* Allow blank lines */ |
| 61 | - |
| 62 | if (!mntpnt || !type) |
| 63 | return -1; |
| 64 | |
| 65 | |
| 66 | |
| 67 | |
| 68 | 1.1 sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.3-r1 |
| 69 | |
| 70 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.3-r1?rev=1.1&view=markup |
| 71 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.3-r1?rev=1.1&content-type=text/plain |
| 72 | |
| 73 | Index: digest-e2fsprogs-1.40.3-r1 |
| 74 | =================================================================== |
| 75 | MD5 ad7ff4da7e200b9b25df58dc39989053 e2fsprogs-1.40.3.tar.gz 4064408 |
| 76 | RMD160 a49813cfaa5dc972c64119628a016b5857b7a74d e2fsprogs-1.40.3.tar.gz 4064408 |
| 77 | SHA256 1d4bc00e2759b29ca3051da1154bcc53d817a4190b2a7130b3241f50ee6cb00f e2fsprogs-1.40.3.tar.gz 4064408 |
| 78 | |
| 79 | |
| 80 | |
| 81 | -- |
| 82 | gentoo-commits@g.o mailing list |