← Back to branch summary

~ubuntu-branches/ubuntu/quantal/libarchive/quantal

« back to all changes in this revision

Viewing changes to debian/patches/0004-Patch-from-upstream-rev-2520.patch

  • Committer: Bazaar Package Importer
  • Author(s): Andres Mejia
  • Date: 2011-09-18 10:25:34 UTC
  • mfrom: (8.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110918102534-kmke53ir9v21ooxu
Tags: 2.8.5-3
http://bugs.debian.org/641978
* Fix upgrade breakage because of manpages being moved from libarchive1 to
  libarchive-dev. (Closes: #641978)
* Make short descriptions for packages unique.
* Explicitly set config options to be used during builds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0004-Patch-from-upstream-rev-2520.patch
 
1
From: Andreas Henriksson <andreas@fatal.se>
 
2
Date: Thu, 1 Jul 2010 18:13:46 +0200
 
3
Subject: Patch from upstream (rev 2520)
 
4
 
 
5
Fix version/dot stripping code in joliet extension of iso9660.
 
6
---
 
7
 libarchive/archive_read_support_format_iso9660.c |    4 ++--
 
8
 1 files changed, 2 insertions(+), 2 deletions(-)
 
9
 
 
10
diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
 
11
index 595c333..d6c46e5 100644
 
12
--- a/libarchive/archive_read_support_format_iso9660.c
 
13
+++ b/libarchive/archive_read_support_format_iso9660.c
 
14
@@ -1683,13 +1683,13 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
 
15
                 *       *, /, :, ;, ? and \.
 
16
                 */
 
17
                /* Chop off trailing ';1' from files. */
 
18
-               if (*(wp-2) == ';' && *(wp-1) == '1') {
 
19
+               if (*(wp-2) == L';' && *(wp-1) == L'1') {
 
20
                        wp-=2;
 
21
                        *wp = L'\0';
 
22
                }
 
23
 
 
24
                /* Chop off trailing '.' from filenames. */
 
25
-               if (*(wp-1) == '.')
 
26
+               if (*(wp-1) == L'.')
 
27
                        *(--wp) = L'\0';
 
28
 
 
29
                /* store the result in the file name field. */
 
30
--