}
}
-/* Writes the current time to 'string' based on 'template'.
- * The current time is either local time or UTC based on 'utc'. */
+/* Writes time 'when' to 'string' based on 'template', in local time or UTC
+ * based on 'utc'. */
void
-ds_put_strftime(struct ds *ds, const char *template, bool utc)
+ds_put_strftime(struct ds *ds, const char *template, time_t when, bool utc)
{
struct tm tm;
- time_t now = time_wall();
if (utc) {
- gmtime_r(&now, &tm);
+ gmtime_r(&when, &tm);
} else {
- localtime_r(&now, &tm);
+ localtime_r(&when, &tm);
}
for (;;) {
}
}
+/* Returns a malloc()'d string for time 'when' based on 'template', in local
+ * time or UTC based on 'utc'. */
+char *
+xastrftime(const char *template, time_t when, bool utc)
+{
+ struct ds s;
+
+ ds_init(&s);
+ ds_put_strftime(&s, template, when, utc);
+ return s.string;
+}
+
int
ds_get_line(struct ds *ds, FILE *file)
{
ds_put_hex_dump(struct ds *ds, const void *buf_, size_t size,
uintptr_t ofs, bool ascii)
{
- const uint8_t *buf = buf_;
- const size_t per_line = 16; /* Maximum bytes per line. */
-
- while (size > 0)
- {
- size_t start, end, n;
- size_t i;
-
- /* Number of bytes on this line. */
- start = ofs % per_line;
- end = per_line;
- if (end - start > size)
- end = start + size;
- n = end - start;
-
- /* Print line. */
- ds_put_format(ds, "%08jx ", (uintmax_t) ROUND_DOWN(ofs, per_line));
- for (i = 0; i < start; i++)
- ds_put_format(ds, " ");
- for (; i < end; i++)
- ds_put_format(ds, "%02hhx%c",
- buf[i - start], i == per_line / 2 - 1? '-' : ' ');
- if (ascii)
- {
- for (; i < per_line; i++)
+ const uint8_t *buf = buf_;
+ const size_t per_line = 16; /* Maximum bytes per line. */
+
+ while (size > 0) {
+ size_t start, end, n;
+ size_t i;
+
+ /* Number of bytes on this line. */
+ start = ofs % per_line;
+ end = per_line;
+ if (end - start > size)
+ end = start + size;
+ n = end - start;
+
+ /* Print line. */
+ ds_put_format(ds, "%08jx ", (uintmax_t) ROUND_DOWN(ofs, per_line));
+ for (i = 0; i < start; i++) {
ds_put_format(ds, " ");
- ds_put_format(ds, "|");
- for (i = 0; i < start; i++)
- ds_put_format(ds, " ");
- for (; i < end; i++) {
- int c = buf[i - start];
- ds_put_char(ds, c >= 32 && c < 127 ? c : '.');
- }
- for (; i < per_line; i++)
- ds_put_format(ds, " ");
- ds_put_format(ds, "|");
}
- ds_put_format(ds, "\n");
+ for (; i < end; i++) {
+ ds_put_format(ds, "%02hhx%c",
+ buf[i - start], i == per_line / 2 - 1? '-' : ' ');
+ }
+ if (ascii) {
+ for (; i < per_line; i++)
+ ds_put_format(ds, " ");
+ ds_put_format(ds, "|");
+ for (i = 0; i < start; i++)
+ ds_put_format(ds, " ");
+ for (; i < end; i++) {
+ int c = buf[i - start];
+ ds_put_char(ds, c >= 32 && c < 127 ? c : '.');
+ }
+ for (; i < per_line; i++)
+ ds_put_format(ds, " ");
+ ds_put_format(ds, "|");
+ } else {
+ ds_chomp(ds, ' ');
+ }
+ ds_put_format(ds, "\n");
- ofs += n;
- buf += n;
- size -= n;
+ ofs += n;
+ buf += n;
+ size -= n;
}
}