author | Lars Hjemli <hjemli@gmail.com> | 2010-09-01 12:13:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-09-01 12:32:19 (UTC) |
commit | ba1769cb6438f3a08da8cf1308eb8efad3ce573b (patch) (unidiff) | |
tree | 42c7906f29b7decabc650f53cbc12e8547c442d3 | |
parent | 48434780ca62fde84337ea1e797f642de5ca50d5 (diff) | |
download | cgit-ba1769cb6438f3a08da8cf1308eb8efad3ce573b.zip cgit-ba1769cb6438f3a08da8cf1308eb8efad3ce573b.tar.gz cgit-ba1769cb6438f3a08da8cf1308eb8efad3ce573b.tar.bz2 |
ui-snapshot: actually compress zip archives
Since cgit linked with git-1.6.0 all zip archives has been uncompressed.
This patch fixes the issue by specifying Z_DEFAULT_COMPRESSION.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-snapshot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index 4136b3e..dbb5564 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -41,96 +41,97 @@ const struct cgit_snapshot_format cgit_snapshot_formats[] = { | |||
41 | { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 }, | 41 | { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 }, |
42 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, | 42 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, |
43 | {} | 43 | {} |
44 | }; | 44 | }; |
45 | 45 | ||
46 | static const struct cgit_snapshot_format *get_format(const char *filename) | 46 | static const struct cgit_snapshot_format *get_format(const char *filename) |
47 | { | 47 | { |
48 | const struct cgit_snapshot_format *fmt; | 48 | const struct cgit_snapshot_format *fmt; |
49 | int fl, sl; | 49 | int fl, sl; |
50 | 50 | ||
51 | fl = strlen(filename); | 51 | fl = strlen(filename); |
52 | for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { | 52 | for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { |
53 | sl = strlen(fmt->suffix); | 53 | sl = strlen(fmt->suffix); |
54 | if (sl >= fl) | 54 | if (sl >= fl) |
55 | continue; | 55 | continue; |
56 | if (!strcmp(fmt->suffix, filename + fl - sl)) | 56 | if (!strcmp(fmt->suffix, filename + fl - sl)) |
57 | return fmt; | 57 | return fmt; |
58 | } | 58 | } |
59 | return NULL; | 59 | return NULL; |
60 | } | 60 | } |
61 | 61 | ||
62 | static int make_snapshot(const struct cgit_snapshot_format *format, | 62 | static int make_snapshot(const struct cgit_snapshot_format *format, |
63 | const char *hex, const char *prefix, | 63 | const char *hex, const char *prefix, |
64 | const char *filename) | 64 | const char *filename) |
65 | { | 65 | { |
66 | struct archiver_args args; | 66 | struct archiver_args args; |
67 | struct commit *commit; | 67 | struct commit *commit; |
68 | unsigned char sha1[20]; | 68 | unsigned char sha1[20]; |
69 | 69 | ||
70 | if(get_sha1(hex, sha1)) { | 70 | if(get_sha1(hex, sha1)) { |
71 | cgit_print_error(fmt("Bad object id: %s", hex)); | 71 | cgit_print_error(fmt("Bad object id: %s", hex)); |
72 | return 1; | 72 | return 1; |
73 | } | 73 | } |
74 | commit = lookup_commit_reference(sha1); | 74 | commit = lookup_commit_reference(sha1); |
75 | if(!commit) { | 75 | if(!commit) { |
76 | cgit_print_error(fmt("Not a commit reference: %s", hex)); | 76 | cgit_print_error(fmt("Not a commit reference: %s", hex)); |
77 | return 1; | 77 | return 1; |
78 | } | 78 | } |
79 | memset(&args, 0, sizeof(args)); | 79 | memset(&args, 0, sizeof(args)); |
80 | if (prefix) { | 80 | if (prefix) { |
81 | args.base = fmt("%s/", prefix); | 81 | args.base = fmt("%s/", prefix); |
82 | args.baselen = strlen(prefix) + 1; | 82 | args.baselen = strlen(prefix) + 1; |
83 | } else { | 83 | } else { |
84 | args.base = ""; | 84 | args.base = ""; |
85 | args.baselen = 0; | 85 | args.baselen = 0; |
86 | } | 86 | } |
87 | args.tree = commit->tree; | 87 | args.tree = commit->tree; |
88 | args.time = commit->date; | 88 | args.time = commit->date; |
89 | args.compression_level = Z_DEFAULT_COMPRESSION; | ||
89 | ctx.page.mimetype = xstrdup(format->mimetype); | 90 | ctx.page.mimetype = xstrdup(format->mimetype); |
90 | ctx.page.filename = xstrdup(filename); | 91 | ctx.page.filename = xstrdup(filename); |
91 | cgit_print_http_headers(&ctx); | 92 | cgit_print_http_headers(&ctx); |
92 | format->write_func(&args); | 93 | format->write_func(&args); |
93 | return 0; | 94 | return 0; |
94 | } | 95 | } |
95 | 96 | ||
96 | /* Try to guess the requested revision from the requested snapshot name. | 97 | /* Try to guess the requested revision from the requested snapshot name. |
97 | * First the format extension is stripped, e.g. "cgit-0.7.2.tar.gz" become | 98 | * First the format extension is stripped, e.g. "cgit-0.7.2.tar.gz" become |
98 | * "cgit-0.7.2". If this is a valid commit object name we've got a winner. | 99 | * "cgit-0.7.2". If this is a valid commit object name we've got a winner. |
99 | * Otherwise, if the snapshot name has a prefix matching the result from | 100 | * Otherwise, if the snapshot name has a prefix matching the result from |
100 | * repo_basename(), we strip the basename and any following '-' and '_' | 101 | * repo_basename(), we strip the basename and any following '-' and '_' |
101 | * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once | 102 | * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once |
102 | * more. If this still isn't a valid commit object name, we check if pre- | 103 | * more. If this still isn't a valid commit object name, we check if pre- |
103 | * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives | 104 | * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives |
104 | * us something valid. | 105 | * us something valid. |
105 | */ | 106 | */ |
106 | static const char *get_ref_from_filename(const char *url, const char *filename, | 107 | static const char *get_ref_from_filename(const char *url, const char *filename, |
107 | const struct cgit_snapshot_format *format) | 108 | const struct cgit_snapshot_format *format) |
108 | { | 109 | { |
109 | const char *reponame; | 110 | const char *reponame; |
110 | unsigned char sha1[20]; | 111 | unsigned char sha1[20]; |
111 | char *snapshot; | 112 | char *snapshot; |
112 | 113 | ||
113 | snapshot = xstrdup(filename); | 114 | snapshot = xstrdup(filename); |
114 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; | 115 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; |
115 | fprintf(stderr, "snapshot=%s\n", snapshot); | 116 | fprintf(stderr, "snapshot=%s\n", snapshot); |
116 | 117 | ||
117 | if (get_sha1(snapshot, sha1) == 0) | 118 | if (get_sha1(snapshot, sha1) == 0) |
118 | return snapshot; | 119 | return snapshot; |
119 | 120 | ||
120 | reponame = cgit_repobasename(url); | 121 | reponame = cgit_repobasename(url); |
121 | fprintf(stderr, "reponame=%s\n", reponame); | 122 | fprintf(stderr, "reponame=%s\n", reponame); |
122 | if (prefixcmp(snapshot, reponame) == 0) { | 123 | if (prefixcmp(snapshot, reponame) == 0) { |
123 | snapshot += strlen(reponame); | 124 | snapshot += strlen(reponame); |
124 | while (snapshot && (*snapshot == '-' || *snapshot == '_')) | 125 | while (snapshot && (*snapshot == '-' || *snapshot == '_')) |
125 | snapshot++; | 126 | snapshot++; |
126 | } | 127 | } |
127 | 128 | ||
128 | if (get_sha1(snapshot, sha1) == 0) | 129 | if (get_sha1(snapshot, sha1) == 0) |
129 | return snapshot; | 130 | return snapshot; |
130 | 131 | ||
131 | snapshot = fmt("v%s", snapshot); | 132 | snapshot = fmt("v%s", snapshot); |
132 | if (get_sha1(snapshot, sha1) == 0) | 133 | if (get_sha1(snapshot, sha1) == 0) |
133 | return snapshot; | 134 | return snapshot; |
134 | 135 | ||
135 | return NULL; | 136 | return NULL; |
136 | } | 137 | } |