@@ -3,6 +3,7 @@ CFLAGS = -g -O0 -Wall -I./ CC = gcc OBJS = main.o clog.o hash.o db.o TEST_OBJS = test.o hash.o +DEPLOY_OBJS = *.ct clog.db clog.cgi SRCS = $(OBJS:.o=.c) clog: $(OBJS) @@ -17,6 +18,9 @@ dep: clean: rm -f $(OBJS) clog core *~ +deploy: + cp -t /Library/WebServer/CGI-Executables $(DEPLOY_OBJS) + test.o: test.c main.o: main.c clog.h clog.o: clog.c db.h Makefile @@ -18,6 +18,7 @@ <link rel="alternate" href="http://timothylive.net/clog/{=id=}" /> <link rel="edit" href="http://timothylive.net/clog/edit/{=id=}.atom" /> <updated>{=c_time=}</updated> + <content type="html"><![CDATA[{=content=}]]></content> </entry> {=loop_end=} </feed> atom.ct @@ -224,10 +224,10 @@ int generate_entries(int window, int id, const char *template_file) { pfptr = print_comment_count; } else if (strcmp(results[col], "c_time") == 0) { - pfptr = print_rfc_date; + pfptr = print_date; } else if (strcmp(results[col], "u_time") == 0) { - pfptr = print_rfc_date; + pfptr = print_date; } hash_add(entries[index], results[col], results[row * c + col], pfptr); } @@ -236,6 +236,7 @@ int generate_entries(int window, int id, const char *template_file) { print_template(template_file, entries, r); /* + * TODO: fix this :( for (i = 0; i < r; i++) { hash_free(entries[r]); } @@ -303,7 +304,7 @@ int generate_comments(int entry_id, const char *template_file) { pfptr = print_comment_count; } else if (strcmp(results[col], "c_time") == 0) { - pfptr = print_rfc_date; + pfptr = print_date; } hash_add(comments[index], results[col], results[row * c + col], pfptr); } @@ -369,17 +370,18 @@ int error_log(const char *fmt, ...) { return (ret); } -void print_rfc_date(char *time) { +void print_date(char *time) { if (time != NULL) { char date[50]; - rfc_date(date, strtol(time, NULL, 10)); + //const char *format = "%a, %d %b %Y %H:%M:%S %z"; + const char *format = "%Y-%m-%dT%H:%M:%SZ"; + format_date(date, strtol(time, NULL, 10), format); printf("%s", date); } } -void rfc_date(char *d_str, time_t time) { +void format_date(char *d_str, time_t time, const char *format) { struct tm *date; - const char *format = "%a, %d %b %Y %H:%M:%S %z"; date = localtime((const time_t *)&time); (void)strftime(d_str, 32, format, date); clog.c @@ -73,10 +73,10 @@ int remove_entry(int); */ void htmlize_print(char *str); void print_comment_count(char *count); -void print_rfc_date(char *time); +void print_date(char *time); int error_log(const char *fmt, ...); -void rfc_date(char *d_str, time_t time); +void format_date(char *d_str, time_t time, const char *format); #endif clog.h d414c2b61ccc2659c4e82e8e3fc3976a5f9ebb34 Timothy Kim highwind@terra.local http://github.com/highwind/clog/commit/5128acc3c8fcbf9c2ddf37bd4acd87f5d5b8564a 5128acc3c8fcbf9c2ddf37bd4acd87f5d5b8564a 2009-10-28T21:11:59-07:00 2009-10-28T21:11:59-07:00 atom feed added content and fixed time format 3c321a3961648e98df1ab43322bdc0ef35de336b Timothy Kim highwind@terra.local