Merge branch 'lh/cleanup'
* lh/cleanup: (21 commits) Reset ctx.repo to NULL when the config parser is finished Move cgit_parse_query() from parsing.c to html.c as http_parse_querystring() Move function for configfile parsing into configfile.[ch] Add cache.h Remove global and obsolete cgit_cmd Makefile: copy the QUIET constructs from the Makefile in git.git Move cgit_version from shared.c to cgit.c Makefile: autobuild dependency rules Initial Makefile cleanup Move non-generic functions from shared.c to cgit.c Add ui-shared.h Add separate header-files for each page/view Refactor snapshot support Add command dispatcher Remove obsolete cacheitem parameter to ui-functions Add struct cgit_page to cgit_context Introduce html.h Improve initialization of git directory Move cgit_repo into cgit_context Add all config variables into struct cgit_context ...
这个提交包含在:
95
html.c
95
html.c
@ -6,7 +6,13 @@
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#include "cgit.h"
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
|
||||
int htmlfd = STDOUT_FILENO;
|
||||
|
||||
char *fmt(const char *format, ...)
|
||||
{
|
||||
@ -21,8 +27,10 @@ char *fmt(const char *format, ...)
|
||||
va_start(args, format);
|
||||
len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
|
||||
va_end(args);
|
||||
if (len>sizeof(buf[bufidx]))
|
||||
die("[html.c] string truncated: %s", format);
|
||||
if (len>sizeof(buf[bufidx])) {
|
||||
fprintf(stderr, "[html.c] string truncated: %s\n", format);
|
||||
exit(1);
|
||||
}
|
||||
return buf[bufidx];
|
||||
}
|
||||
|
||||
@ -150,25 +158,10 @@ void html_link_close(void)
|
||||
|
||||
void html_fileperm(unsigned short mode)
|
||||
{
|
||||
htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),
|
||||
htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),
|
||||
(mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
|
||||
}
|
||||
|
||||
void html_filemode(unsigned short mode)
|
||||
{
|
||||
if (S_ISDIR(mode))
|
||||
html("d");
|
||||
else if (S_ISLNK(mode))
|
||||
html("l");
|
||||
else if (S_ISGITLINK(mode))
|
||||
html("m");
|
||||
else
|
||||
html("-");
|
||||
html_fileperm(mode >> 6);
|
||||
html_fileperm(mode >> 3);
|
||||
html_fileperm(mode);
|
||||
}
|
||||
|
||||
int html_include(const char *filename)
|
||||
{
|
||||
FILE *f;
|
||||
@ -182,3 +175,67 @@ int html_include(const char *filename)
|
||||
fclose(f);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int hextoint(char c)
|
||||
{
|
||||
if (c >= 'a' && c <= 'f')
|
||||
return 10 + c - 'a';
|
||||
else if (c >= 'A' && c <= 'F')
|
||||
return 10 + c - 'A';
|
||||
else if (c >= '0' && c <= '9')
|
||||
return c - '0';
|
||||
else
|
||||
return -1;
|
||||
}
|
||||
|
||||
char *convert_query_hexchar(char *txt)
|
||||
{
|
||||
int d1, d2;
|
||||
if (strlen(txt) < 3) {
|
||||
*txt = '\0';
|
||||
return txt-1;
|
||||
}
|
||||
d1 = hextoint(*(txt+1));
|
||||
d2 = hextoint(*(txt+2));
|
||||
if (d1<0 || d2<0) {
|
||||
strcpy(txt, txt+3);
|
||||
return txt-1;
|
||||
} else {
|
||||
*txt = d1 * 16 + d2;
|
||||
strcpy(txt+1, txt+3);
|
||||
return txt;
|
||||
}
|
||||
}
|
||||
|
||||
int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value))
|
||||
{
|
||||
char *t, *value = NULL, c;
|
||||
|
||||
if (!txt)
|
||||
return 0;
|
||||
|
||||
t = txt = strdup(txt);
|
||||
if (t == NULL) {
|
||||
printf("Out of memory\n");
|
||||
exit(1);
|
||||
}
|
||||
while((c=*t) != '\0') {
|
||||
if (c=='=') {
|
||||
*t = '\0';
|
||||
value = t+1;
|
||||
} else if (c=='+') {
|
||||
*t = ' ';
|
||||
} else if (c=='%') {
|
||||
t = convert_query_hexchar(t);
|
||||
} else if (c=='&') {
|
||||
*t = '\0';
|
||||
(*fn)(txt, value);
|
||||
txt = t+1;
|
||||
value = NULL;
|
||||
}
|
||||
t++;
|
||||
}
|
||||
if (t!=txt)
|
||||
(*fn)(txt, value);
|
||||
return 0;
|
||||
}
|
||||
|
在新工单中引用
屏蔽一个用户