dest[dpos++] = '\r';
dest[dpos++] = '\n';
dest[dpos] = 0;
- thisline = 0;
}
return(dpos);
/*
* if we send out non ascii subjects, we encode it this way.
*/
-char *rfc2047encode(char *line, long length)
+char *rfc2047encode(const char *line, long length)
{
- char *AlreadyEncoded;
+ const char *AlreadyEncoded;
char *result;
long end;
#define UTF8_HEADER "=?UTF-8?B?"
*/
void fmt_date(char *buf, size_t n, time_t thetime, int seconds) {
struct tm tm;
- int hour;
+ char *teh_format = NULL;
- /* Month strings for date conversions ... this needs to be localized eventually */
- char *fmt_date_months[12] = {
- "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
- };
-
- strcpy(buf, "");
+ *buf = '\0';
localtime_r(&thetime, &tm);
- hour = tm.tm_hour;
- if (hour == 0) hour = 12;
- else if (hour > 12) hour = hour - 12;
-
if (seconds) {
- snprintf(buf, n, "%s %d %4d %d:%02d:%02d%s",
- fmt_date_months[tm.tm_mon],
- tm.tm_mday,
- tm.tm_year + 1900,
- hour,
- tm.tm_min,
- tm.tm_sec,
- ( (tm.tm_hour >= 12) ? "pm" : "am" )
- );
- } else {
- snprintf(buf, n, "%s %d %4d %d:%02d%s",
- fmt_date_months[tm.tm_mon],
- tm.tm_mday,
- tm.tm_year + 1900,
- hour,
- tm.tm_min,
- ( (tm.tm_hour >= 12) ? "pm" : "am" )
- );
+ teh_format = "%F %R:%S";
+ }
+ else {
+ teh_format = "%F %R";
}
+
+ strftime(buf, n, teh_format, &tm);
}
int a, b, c, len, eclen, olen;
char *ec = " +#&;`'|*?-~<>^()[]{}/$\"\\";
- strcpy(outbuf, "");
+ *outbuf = '\0';
len = strlen(strbuf);
eclen = strlen(ec);
olen = 0;
*/
void generate_uuid(char *buf) {
static int seq = (-1);
+ static int no_kernel_uuid = 0;
+
+ /* If we are running on Linux then we have a kernelspace uuid generator available */
+
+ if (no_kernel_uuid == 0) {
+ FILE *fp;
+ fp = fopen("/proc/sys/kernel/random/uuid", "rb");
+ if (fp) {
+ int rv;
+ rv = fread(buf, 36, 1, fp);
+ fclose(fp);
+ if (rv == 1) {
+ buf[36] = 0;
+ return;
+ }
+ }
+ }
+
+ /* If the kernel didn't provide us with a uuid, we generate a pseudo-random one */
+
+ no_kernel_uuid = 1;
if (seq == (-1)) {
seq = (int)rand();