X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ftools.c;h=d85e47ed7328b2bc55084ab6f18332abe80c1015;hb=fc6832083dc3c224c955853a827a9151b19c2d12;hp=149f48d3fe0c4a123b8f9eb7e26ef6760f7bab56;hpb=0da9ad1ea67516356d0fdc1f5ae3e06cee96f373;p=citadel.git diff --git a/webcit/tools.c b/webcit/tools.c index 149f48d3f..d85e47ed7 100644 --- a/webcit/tools.c +++ b/webcit/tools.c @@ -32,15 +32,6 @@ typedef unsigned char byte; #define FALSE 0 #define TRUE 1 -char *ascmonths[] = { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" -}; - -char *ascdays[] = { - "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" -}; - static byte dtable[256]; /* base64 encode / decode table */ char *safestrncpy(char *dest, const char *src, size_t n) @@ -192,103 +183,6 @@ char ch; } -/* - * Format a date/time stamp for output - */ -void fmt_date(char *buf, time_t thetime, int brief) -{ - struct tm tm; - struct tm today_tm; - time_t today_timet; - int hour; - - today_timet = time(NULL); - localtime_r(&today_timet, &today_tm); - - localtime_r(&thetime, &tm); - hour = tm.tm_hour; - if (hour == 0) - hour = 12; - else if (hour > 12) - hour = hour - 12; - - buf[0] = 0; - - if (brief) { - - if ((tm.tm_year == today_tm.tm_year) - &&(tm.tm_mon == today_tm.tm_mon) - &&(tm.tm_mday == today_tm.tm_mday)) { - sprintf(buf, "%2d:%02d%s", - hour, tm.tm_min, - ((tm.tm_hour >= 12) ? "pm" : "am") - ); - } - else { - sprintf(buf, "%s %d %d", - ascmonths[tm.tm_mon], - tm.tm_mday, - tm.tm_year + 1900 - ); - } - } - else { - sprintf(buf, "%s %d %d %2d:%02d%s", - ascmonths[tm.tm_mon], - tm.tm_mday, - tm.tm_year + 1900, - hour, tm.tm_min, ((tm.tm_hour >= 12) ? "pm" : "am") - ); - } -} - - - -/* - * Format TIME ONLY for output - */ -void fmt_time(char *buf, time_t thetime) -{ - struct tm *tm; - int hour; - - buf[0] = 0; - tm = localtime(&thetime); - hour = tm->tm_hour; - if (hour == 0) - hour = 12; - else if (hour > 12) - hour = hour - 12; - - sprintf(buf, "%d:%02d%s", - hour, tm->tm_min, ((tm->tm_hour > 12) ? "pm" : "am") - ); -} - - - - -/* - * Format a date/time stamp to the format used in HTTP headers - */ -void httpdate(char *buf, time_t thetime) -{ - struct tm *tm; - - buf[0] = 0; - tm = localtime(&thetime); - - sprintf(buf, "%s, %02d %s %4d %02d:%02d:%02d", - ascdays[tm->tm_wday], - tm->tm_mday, - ascmonths[tm->tm_mon], - tm->tm_year + 1900, tm->tm_hour, tm->tm_min, tm->tm_sec); -} - - - - - /* * Utility function to "readline" from memory * (returns new pointer)