summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-snapshot.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 6e3412c..07cc944 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -74,103 +74,101 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
74 unsigned char sha1[20]; 74 unsigned char sha1[20];
75 75
76 if(get_sha1(hex, sha1)) { 76 if(get_sha1(hex, sha1)) {
77 cgit_print_error(fmt("Bad object id: %s", hex)); 77 cgit_print_error(fmt("Bad object id: %s", hex));
78 return 1; 78 return 1;
79 } 79 }
80 commit = lookup_commit_reference(sha1); 80 commit = lookup_commit_reference(sha1);
81 if(!commit) { 81 if(!commit) {
82 cgit_print_error(fmt("Not a commit reference: %s", hex)); 82 cgit_print_error(fmt("Not a commit reference: %s", hex));
83 return 1; 83 return 1;
84 } 84 }
85 memset(&args, 0, sizeof(args)); 85 memset(&args, 0, sizeof(args));
86 if (prefix) { 86 if (prefix) {
87 args.base = fmt("%s/", prefix); 87 args.base = fmt("%s/", prefix);
88 args.baselen = strlen(prefix) + 1; 88 args.baselen = strlen(prefix) + 1;
89 } else { 89 } else {
90 args.base = ""; 90 args.base = "";
91 args.baselen = 0; 91 args.baselen = 0;
92 } 92 }
93 args.tree = commit->tree; 93 args.tree = commit->tree;
94 args.time = commit->date; 94 args.time = commit->date;
95 args.compression_level = Z_DEFAULT_COMPRESSION; 95 args.compression_level = Z_DEFAULT_COMPRESSION;
96 ctx.page.mimetype = xstrdup(format->mimetype); 96 ctx.page.mimetype = xstrdup(format->mimetype);
97 ctx.page.filename = xstrdup(filename); 97 ctx.page.filename = xstrdup(filename);
98 cgit_print_http_headers(&ctx); 98 cgit_print_http_headers(&ctx);
99 format->write_func(&args); 99 format->write_func(&args);
100 return 0; 100 return 0;
101} 101}
102 102
103/* Try to guess the requested revision from the requested snapshot name. 103/* Try to guess the requested revision from the requested snapshot name.
104 * First the format extension is stripped, e.g. "cgit-0.7.2.tar.gz" become 104 * First the format extension is stripped, e.g. "cgit-0.7.2.tar.gz" become
105 * "cgit-0.7.2". If this is a valid commit object name we've got a winner. 105 * "cgit-0.7.2". If this is a valid commit object name we've got a winner.
106 * Otherwise, if the snapshot name has a prefix matching the result from 106 * Otherwise, if the snapshot name has a prefix matching the result from
107 * repo_basename(), we strip the basename and any following '-' and '_' 107 * repo_basename(), we strip the basename and any following '-' and '_'
108 * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once 108 * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once
109 * more. If this still isn't a valid commit object name, we check if pre- 109 * more. If this still isn't a valid commit object name, we check if pre-
110 * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives 110 * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives
111 * us something valid. 111 * us something valid.
112 */ 112 */
113static const char *get_ref_from_filename(const char *url, const char *filename, 113static const char *get_ref_from_filename(const char *url, const char *filename,
114 const struct cgit_snapshot_format *format) 114 const struct cgit_snapshot_format *format)
115{ 115{
116 const char *reponame; 116 const char *reponame;
117 unsigned char sha1[20]; 117 unsigned char sha1[20];
118 char *snapshot; 118 char *snapshot;
119 119
120 snapshot = xstrdup(filename); 120 snapshot = xstrdup(filename);
121 snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; 121 snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0';
122 fprintf(stderr, "snapshot=%s\n", snapshot);
123 122
124 if (get_sha1(snapshot, sha1) == 0) 123 if (get_sha1(snapshot, sha1) == 0)
125 return snapshot; 124 return snapshot;
126 125
127 reponame = cgit_repobasename(url); 126 reponame = cgit_repobasename(url);
128 fprintf(stderr, "reponame=%s\n", reponame);
129 if (prefixcmp(snapshot, reponame) == 0) { 127 if (prefixcmp(snapshot, reponame) == 0) {
130 snapshot += strlen(reponame); 128 snapshot += strlen(reponame);
131 while (snapshot && (*snapshot == '-' || *snapshot == '_')) 129 while (snapshot && (*snapshot == '-' || *snapshot == '_'))
132 snapshot++; 130 snapshot++;
133 } 131 }
134 132
135 if (get_sha1(snapshot, sha1) == 0) 133 if (get_sha1(snapshot, sha1) == 0)
136 return snapshot; 134 return snapshot;
137 135
138 snapshot = fmt("v%s", snapshot); 136 snapshot = fmt("v%s", snapshot);
139 if (get_sha1(snapshot, sha1) == 0) 137 if (get_sha1(snapshot, sha1) == 0)
140 return snapshot; 138 return snapshot;
141 139
142 return NULL; 140 return NULL;
143} 141}
144 142
145void show_error(char *msg) 143void show_error(char *msg)
146{ 144{
147 ctx.page.mimetype = "text/html"; 145 ctx.page.mimetype = "text/html";
148 cgit_print_http_headers(&ctx); 146 cgit_print_http_headers(&ctx);
149 cgit_print_docstart(&ctx); 147 cgit_print_docstart(&ctx);
150 cgit_print_pageheader(&ctx); 148 cgit_print_pageheader(&ctx);
151 cgit_print_error(msg); 149 cgit_print_error(msg);
152 cgit_print_docend(); 150 cgit_print_docend();
153} 151}
154 152
155void cgit_print_snapshot(const char *head, const char *hex, 153void cgit_print_snapshot(const char *head, const char *hex,
156 const char *filename, int snapshots, int dwim) 154 const char *filename, int snapshots, int dwim)
157{ 155{
158 const struct cgit_snapshot_format* f; 156 const struct cgit_snapshot_format* f;
159 char *prefix = NULL; 157 char *prefix = NULL;
160 158
161 if (!filename) { 159 if (!filename) {
162 show_error("No snapshot name specified"); 160 show_error("No snapshot name specified");
163 return; 161 return;
164 } 162 }
165 163
166 f = get_format(filename); 164 f = get_format(filename);
167 if (!f) { 165 if (!f) {
168 show_error(xstrdup(fmt("Unsupported snapshot format: %s", 166 show_error(xstrdup(fmt("Unsupported snapshot format: %s",
169 filename))); 167 filename)));
170 return; 168 return;
171 } 169 }
172 170
173 if (!hex && dwim) { 171 if (!hex && dwim) {
174 hex = get_ref_from_filename(ctx.repo->url, filename, f); 172 hex = get_ref_from_filename(ctx.repo->url, filename, f);
175 if (hex == NULL) { 173 if (hex == NULL) {
176 html_status(404, "Not found", 0); 174 html_status(404, "Not found", 0);