← Back to branch summary

~ubuntu-branches/ubuntu/hardy/zlib/hardy

« back to all changes in this revision

Viewing changes to debian/patches/017_minizip_argfile

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2004-12-10 13:00:13 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20041210130013-hxwqux7r0avd4gta
Tags: 1:1.2.2-4ubuntu1
Resynchronise with Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/017_minizip_argfile
1
 
Don't skip fully specified paths...
2
 
 
3
 
--- zlib-1.2.1/contrib/minizip/minizip.c.orig   2004-02-07 18:33:31.000000000 +0000
4
 
+++ zlib-1.2.1/contrib/minizip/minizip.c        2004-02-07 18:45:39.000000000 +0000
5
 
@@ -309,7 +309,12 @@
6
 
 
7
 
         for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);i++)
8
 
         {
9
 
-            if (((*(argv[i]))!='-') && ((*(argv[i]))!='/'))
10
 
+            if (!((((*(argv[i]))=='-') || ((*(argv[i]))=='/')) &&
11
 
+                  ((argv[i][1]=='o') || (argv[i][1]=='O') ||
12
 
+                   (argv[i][1]=='a') || (argv[i][1]=='A') ||
13
 
+                   (argv[i][1]=='p') || (argv[i][1]=='P') ||
14
 
+                   ((argv[i][1]>='0') || (argv[i][1]<='9'))) &&
15
 
+                  (strlen(argv[i]) == 2)))
16
 
             {
17
 
                 FILE * fin;
18
 
                 int size_read;