author | Lars Hjemli <hjemli@gmail.com> | 2010-09-01 12:32:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-09-01 12:32:57 (UTC) |
commit | bf8293d3196d49d6c4a48b254a04415183ca2762 (patch) (unidiff) | |
tree | 0188fd70e48112094ec4ee412320a099a1829a31 | |
parent | 6940b23b9e4698ba466a4616e4de77b986560ad3 (diff) | |
parent | ba1769cb6438f3a08da8cf1308eb8efad3ce573b (diff) | |
download | cgit-bf8293d3196d49d6c4a48b254a04415183ca2762.zip cgit-bf8293d3196d49d6c4a48b254a04415183ca2762.tar.gz cgit-bf8293d3196d49d6c4a48b254a04415183ca2762.tar.bz2 |
Merge branch 'stable'
-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 1b25dca..6e3412c 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -63,64 +63,65 @@ static const struct cgit_snapshot_format *get_format(const char *filename) | |||
63 | return fmt; | 63 | return fmt; |
64 | } | 64 | } |
65 | return NULL; | 65 | return NULL; |
66 | } | 66 | } |
67 | 67 | ||
68 | static int make_snapshot(const struct cgit_snapshot_format *format, | 68 | static int make_snapshot(const struct cgit_snapshot_format *format, |
69 | const char *hex, const char *prefix, | 69 | const char *hex, const char *prefix, |
70 | const char *filename) | 70 | const char *filename) |
71 | { | 71 | { |
72 | struct archiver_args args; | 72 | struct archiver_args args; |
73 | struct commit *commit; | 73 | struct commit *commit; |
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 | ctx.page.mimetype = xstrdup(format->mimetype); | 96 | ctx.page.mimetype = xstrdup(format->mimetype); |
96 | ctx.page.filename = xstrdup(filename); | 97 | ctx.page.filename = xstrdup(filename); |
97 | cgit_print_http_headers(&ctx); | 98 | cgit_print_http_headers(&ctx); |
98 | format->write_func(&args); | 99 | format->write_func(&args); |
99 | return 0; | 100 | return 0; |
100 | } | 101 | } |
101 | 102 | ||
102 | /* Try to guess the requested revision from the requested snapshot name. | 103 | /* Try to guess the requested revision from the requested snapshot name. |
103 | * 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 |
104 | * "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. |
105 | * 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 |
106 | * repo_basename(), we strip the basename and any following '-' and '_' | 107 | * repo_basename(), we strip the basename and any following '-' and '_' |
107 | * 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 |
108 | * 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- |
109 | * 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 |
110 | * us something valid. | 111 | * us something valid. |
111 | */ | 112 | */ |
112 | static const char *get_ref_from_filename(const char *url, const char *filename, | 113 | static const char *get_ref_from_filename(const char *url, const char *filename, |
113 | const struct cgit_snapshot_format *format) | 114 | const struct cgit_snapshot_format *format) |
114 | { | 115 | { |
115 | const char *reponame; | 116 | const char *reponame; |
116 | unsigned char sha1[20]; | 117 | unsigned char sha1[20]; |
117 | char *snapshot; | 118 | char *snapshot; |
118 | 119 | ||
119 | snapshot = xstrdup(filename); | 120 | snapshot = xstrdup(filename); |
120 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; | 121 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; |
121 | fprintf(stderr, "snapshot=%s\n", snapshot); | 122 | fprintf(stderr, "snapshot=%s\n", snapshot); |
122 | 123 | ||
123 | if (get_sha1(snapshot, sha1) == 0) | 124 | if (get_sha1(snapshot, sha1) == 0) |
124 | return snapshot; | 125 | return snapshot; |
125 | 126 | ||
126 | reponame = cgit_repobasename(url); | 127 | reponame = cgit_repobasename(url); |