author | Lars Hjemli <hjemli@gmail.com> | 2007-09-03 21:00:06 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-09-03 21:00:06 (UTC) |
commit | ff13396926f3352d9e29c0663154918297dc5af7 (patch) (unidiff) | |
tree | 71979efc1ad17ab15a365f86ecb49dd128c65772 /html.c | |
parent | 4e7e8bf9616661bec0c9b9d9c50aca03e600f32b (diff) | |
parent | e651cb0d2dc2dbd458c51cdba8ae56e8629348cc (diff) | |
download | cgit-ff13396926f3352d9e29c0663154918297dc5af7.zip cgit-ff13396926f3352d9e29c0663154918297dc5af7.tar.gz cgit-ff13396926f3352d9e29c0663154918297dc5af7.tar.bz2 |
Merge branch 'jo/dirlink'
* jo/dirlink:
Rename dirlink to gitlink.
Conflicts:
ui-tree.c
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | html.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -145,33 +145,33 @@ void html_link_close(void) | |||
145 | { | 145 | { |
146 | html("</a>"); | 146 | html("</a>"); |
147 | } | 147 | } |
148 | 148 | ||
149 | void html_fileperm(unsigned short mode) | 149 | void html_fileperm(unsigned short mode) |
150 | { | 150 | { |
151 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), | 151 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), |
152 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); | 152 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); |
153 | } | 153 | } |
154 | 154 | ||
155 | void html_filemode(unsigned short mode) | 155 | void html_filemode(unsigned short mode) |
156 | { | 156 | { |
157 | if (S_ISDIR(mode)) | 157 | if (S_ISDIR(mode)) |
158 | html("d"); | 158 | html("d"); |
159 | else if (S_ISLNK(mode)) | 159 | else if (S_ISLNK(mode)) |
160 | html("l"); | 160 | html("l"); |
161 | else if (S_ISDIRLNK(mode)) | 161 | else if (S_ISGITLINK(mode)) |
162 | html("m"); | 162 | html("m"); |
163 | else | 163 | else |
164 | html("-"); | 164 | html("-"); |
165 | html_fileperm(mode >> 6); | 165 | html_fileperm(mode >> 6); |
166 | html_fileperm(mode >> 3); | 166 | html_fileperm(mode >> 3); |
167 | html_fileperm(mode); | 167 | html_fileperm(mode); |
168 | } | 168 | } |
169 | 169 | ||
170 | int html_include(const char *filename) | 170 | int html_include(const char *filename) |
171 | { | 171 | { |
172 | FILE *f; | 172 | FILE *f; |
173 | char buf[4096]; | 173 | char buf[4096]; |
174 | size_t len; | 174 | size_t len; |
175 | 175 | ||
176 | if (!(f = fopen(filename, "r"))) | 176 | if (!(f = fopen(filename, "r"))) |
177 | return -1; | 177 | return -1; |