{ "d", 24 * 60 * 60 * 1000LL * 1000LL},
{ "day", 24 * 60 * 60 * 1000LL * 1000LL},
{ "days", 24 * 60 * 60 * 1000LL * 1000LL},
+ { "week", 7 * 24 * 60 * 60 * 1000LL * 1000LL},
+ { "weeks", 7 * 24 * 60 * 60 * 1000LL * 1000LL},
{ "a", 31536000000000LL /* year */ },
{ NULL, 0}
};
{
struct tm tv;
time_t t;
-#if HAVE_TM_GMTOFF
- struct tm *tp;
-#endif
if (0 == strcasecmp ("end of time", fancy_time))
{
return GNUNET_SYSERR;
t = mktime (&tv);
atime->abs_value_us = (uint64_t) ((uint64_t) t * 1000LL * 1000LL);
-#if HAVE_TM_GMTOFF
- tp = localtime (&t);
- atime->abs_value_us += 1000LL * 1000LL * tp->tm_gmtoff;
-#elif defined LINUX
- atime->abs_value_us -= 1000LL * 1000LL * timezone;
-#elif defined WINDOWS
- {
- DWORD tzv;
- TIME_ZONE_INFORMATION tzi;
- tzv = GetTimeZoneInformation (&tzi);
- if (TIME_ZONE_ID_INVALID != tzv)
- {
- atime->abs_value_us -= 1000LL * 1000LL * tzi.Bias * 60LL;
- }
- }
-#endif
return GNUNET_OK;
}
free (encoded_string);
return ret;
fail:
- LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were `%s'->`%s'\n"),
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("Character sets requested were `%s'->`%s'\n"),
"UTF-8", output_charset);
ret = GNUNET_malloc (len + 1);
memcpy (ret, input, len);
if (t.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us)
return _("end of time");
tt = t.abs_value_us / 1000LL / 1000LL;
- tp = gmtime (&tt);
+ tp = localtime (&tt);
+ /* This is hacky, but i don't know a way to detect libc character encoding.
+ * Just expect utf8 from glibc these days.
+ * As for msvcrt, use the wide variant, which always returns utf16
+ * (otherwise we'd have to detect current codepage or use W32API character
+ * set conversion routines to convert to UTF8).
+ */
+#ifndef WINDOWS
strftime (buf, sizeof (buf), "%a %b %d %H:%M:%S %Y", tp);
+#else
+ {
+ static wchar_t wbuf[255];
+ uint8_t *conved;
+ size_t ssize;
+
+ wcsftime (wbuf, sizeof (wbuf) / sizeof (wchar_t),
+ L"%a %b %d %H:%M:%S %Y", tp);
+
+ ssize = sizeof (buf);
+ conved = u16_to_u8 (wbuf, sizeof (wbuf) / sizeof (wchar_t),
+ (uint8_t *) buf, &ssize);
+ if (conved != (uint8_t *) buf)
+ {
+ strncpy (buf, (char *) conved, sizeof (buf));
+ buf[255 - 1] = '\0';
+ free (conved);
+ }
+ }
+#endif
return buf;
}
/**
- * Get the numeric value corresponding to a character.
+ * Get the decoded value corresponding to a character according to Crockford
+ * Base32 encoding.
*
* @param a a character
* @return corresponding numeric value
static unsigned int
getValue__ (unsigned char a)
{
+ unsigned int dec;
+
+ switch (a)
+ {
+ case 'O':
+ case 'o':
+ a = '0';
+ break;
+ case 'i':
+ case 'I':
+ case 'l':
+ case 'L':
+ a = '1';
+ break;
+ /* also consider U to be V */
+ case 'u':
+ case 'U':
+ a = 'V';
+ break;
+ default:
+ break;
+ }
if ((a >= '0') && (a <= '9'))
return a - '0';
- if ((a >= 'A') && (a <= 'V'))
- return (a - 'A' + 10);
- if ((a >= 'a') && (a <= 'v'))
- return (a - 'a' + 10);
+ if ((a >= 'a') && (a <= 'z'))
+ a = toupper (a);
+ /* return (a - 'a' + 10); */
+ dec = 0;
+ if ((a >= 'A') && (a <= 'Z'))
+ {
+ if ('I' < a)
+ dec++;
+ if ('L' < a)
+ dec++;
+ if ('O' < a)
+ dec++;
+ if ('U' < a)
+ dec++;
+ return (a - 'A' + 10 - dec);
+ }
return -1;
}
/**
- * Convert binary data to ASCII encoding. The ASCII encoding is rather
- * GNUnet specific. It was chosen such that it only uses characters
- * in [0-9A-V], can be produced without complex arithmetics and uses a
- * small number of characters.
+ * Convert binary data to ASCII encoding using Crockford Base32 encoding.
* Does not append 0-terminator, but returns a pointer to the place where
* it should be placed, if needed.
*
/**
* 32 characters for encoding
*/
- static char *encTable__ = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
+ static char *encTable__ = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
unsigned int wpos;
unsigned int rpos;
unsigned int bits;
/**
- * Convert ASCII encoding back to data
- * out_size must match exactly the size of the data before it was encoded.
+ * Convert Crockford Base32hex encoding back to data.
+ * @a out_size must match exactly the size of the data before it was encoded.
*
* @param enc the encoding
* @param enclen number of characters in @a enc (without 0-terminator, which can be missing)
{
vbit = encoded_len % 5; /* padding! */
shift = 5 - vbit;
- bits = (ret = getValue__ (enc[--rpos])) >> (5 - (encoded_len % 5));
+ bits = (ret = getValue__ (enc[--rpos])) >> shift;
}
else
{
/**
* Makes a copy of argv that consists of a single memory chunk that can be
- * freed with a single call to GNUNET_free ();
+ * freed with a single call to GNUNET_free();
*/
static char *const *
_make_continuous_arg_copy (int argc,
* other than W32.
* Returned argv has u8argv[u8argc] == NULL.
* Returned argv is a single memory block, and can be freed with a single
- * GNUNET_free () call.
+ * GNUNET_free() call.
*
* @param argc argc (as given by main())
* @param argv argv (as given by main())