commit 4a018ec16dc29a53f0cc87d3527c8bd1607ea44d
parent ae963a3521ddbc43fe18729b77e110e7b13c7e78
Author: William Casarin <jb55@jb55.com>
Date: Mon, 2 Nov 2020 11:13:15 -0800
fix whitespace issues
Signed-off-by: William Casarin <jb55@jb55.com>
Diffstat:
| M | datefmt.c | | | 190 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
1 file changed, 95 insertions(+), 95 deletions(-)
diff --git a/datefmt.c b/datefmt.c
@@ -20,13 +20,13 @@ struct parser {
size_t len;
int64_t after;
int n_digits;
- const char *format;
+ const char *format;
char digits[12];
};
static enum state update_state(int c, enum state state)
{
- int is_boundary = c == -1 || !isalnum(c);
+ int is_boundary = c == -1 || !isalnum(c);
if (is_boundary) {
if (state == WAIT || state == BEGIN) {
@@ -38,8 +38,8 @@ static enum state update_state(int c, enum state state)
if (state == BOUNDARY) {
return MIDDLE;
} else if (state == BEGIN) {
- return MIDDLE;
- }
+ return MIDDLE;
+ }
}
if (state == BEGIN) {
@@ -51,57 +51,57 @@ static enum state update_state(int c, enum state state)
static void print_rest(struct parser *parser, char *charbuf, enum state *new_state)
{
- *new_state = BOUNDARY;
- printf("%.*s%s", parser->n_digits, parser->digits, charbuf);
- parser->n_digits = 0;
+ *new_state = BOUNDARY;
+ printf("%.*s%s", parser->n_digits, parser->digits, charbuf);
+ parser->n_digits = 0;
}
static enum state doaction(int c, enum state new_state, struct parser *parser)
{
- static char timebuf[128];
- char charbuf[2];
- int64_t ts;
-
- if (c == -1)
- charbuf[0] = 0;
- else {
- charbuf[0] = (char)c;
- charbuf[1] = 0;
- }
-
- if (parser->state == MIDDLE && new_state == BOUNDARY) {
- ts = strtoll(parser->digits, NULL, 10);
- /* found date */
- if (ts > parser->after) {
- strftime(timebuf, sizeof(timebuf), parser->format, localtime(&ts));
- printf("%s%s", timebuf, charbuf);
- } else {
- print_rest(parser, charbuf, &new_state);
- }
- } else if (new_state == MIDDLE) {
- if (parser->n_digits < 10) {
- parser->digits[parser->n_digits++] = (char)c;
- parser->digits[parser->n_digits] = 0;
- } else {
- print_rest(parser, charbuf, &new_state);
- }
- } else {
- if (c != -1)
- fputc(c, stdout);
- }
-
- return new_state;
+ static char timebuf[128];
+ char charbuf[2];
+ int64_t ts;
+
+ if (c == -1)
+ charbuf[0] = 0;
+ else {
+ charbuf[0] = (char)c;
+ charbuf[1] = 0;
+ }
+
+ if (parser->state == MIDDLE && new_state == BOUNDARY) {
+ ts = strtoll(parser->digits, NULL, 10);
+ /* found date */
+ if (ts > parser->after) {
+ strftime(timebuf, sizeof(timebuf), parser->format, localtime(&ts));
+ printf("%s%s", timebuf, charbuf);
+ } else {
+ print_rest(parser, charbuf, &new_state);
+ }
+ } else if (new_state == MIDDLE) {
+ if (parser->n_digits < 10) {
+ parser->digits[parser->n_digits++] = (char)c;
+ parser->digits[parser->n_digits] = 0;
+ } else {
+ print_rest(parser, charbuf, &new_state);
+ }
+ } else {
+ if (c != -1)
+ fputc(c, stdout);
+ }
+
+ return new_state;
}
/* static const char *state_name(enum state state) */
/* { */
-/* switch (state) { */
-/* case BOUNDARY: return "BOUNDARY"; */
-/* case WAIT: return "WAIT"; */
-/* case MIDDLE: return "MIDDLE"; */
-/* case BEGIN: return "BEGIN"; */
-/* } */
-/* return "UNKN"; */
+/* switch (state) { */
+/* case BOUNDARY: return "BOUNDARY"; */
+/* case WAIT: return "WAIT"; */
+/* case MIDDLE: return "MIDDLE"; */
+/* case BEGIN: return "BEGIN"; */
+/* } */
+/* return "UNKN"; */
/* } */
@@ -113,19 +113,19 @@ static void process(struct parser *parser, int last)
int c;
for (i = 0; i < parser->len+last; i++) {
- if (last && i == parser->len)
- c = -1;
+ if (last && i == parser->len)
+ c = -1;
else
- c = parser->buf[i];
+ c = parser->buf[i];
/* transition state */
new_state = update_state(c, parser->state);
- /* debug */
- /* printf("%c | %s -> %s\n", (char)c, state_name(parser->state), state_name(new_state)); */
+ /* debug */
+ /* printf("%c | %s -> %s\n", (char)c, state_name(parser->state), state_name(new_state)); */
/* action */
- new_state = doaction(c, new_state, parser);
+ new_state = doaction(c, new_state, parser);
if (new_state == BOUNDARY) {
parser->n_digits = 0;
@@ -145,66 +145,66 @@ static void parser_init(struct parser *parser)
parser->len = 0;
parser->after = 1420070400ULL;
parser->n_digits = 0;
- parser->format = "%F %R";
+ parser->format = "%F %R";
}
static void usage() {
- printf("usage: datefmt [OPTION...] [FORMAT]\n\n");
- printf("format unix timestamps from stdin\n\n");
- printf(" -a, --after <timestamp> only format timestamps after this date \n");
- printf(" --version display version information and exit \n");
+ printf("usage: datefmt [OPTION...] [FORMAT]\n\n");
+ printf("format unix timestamps from stdin\n\n");
+ printf(" -a, --after <timestamp> only format timestamps after this date \n");
+ printf(" --version display version information and exit \n");
- printf("\n FORMAT\n a strftime format string, defaults to '%%F %%R'\n");
+ printf("\n FORMAT\n a strftime format string, defaults to '%%F %%R'\n");
- printf("\n EXAMPLE\n datefmt --after $(date -d yesterday +%%s) %%R < spreadsheet.csv\n\n");
- printf(" Created By: William Casarin <https://jb55.com>\n");
- exit(0);
+ printf("\n EXAMPLE\n datefmt --after $(date -d yesterday +%%s) %%R < spreadsheet.csv\n\n");
+ printf(" Created By: William Casarin <https://jb55.com>\n");
+ exit(0);
}
static void shift_arg(int *argc, char **argv)
{
- if (*argc < 1)
- return;
- memmove(argv, &argv[1], ((*argc)-1) * sizeof(char*));
- *argc = *argc - 1;
+ if (*argc < 1)
+ return;
+ memmove(argv, &argv[1], ((*argc)-1) * sizeof(char*));
+ *argc = *argc - 1;
}
static void parse_arg(int *argc, char **argv, struct parser *parser)
{
- char *endptr;
-
- if (!strcmp(argv[0], "--after") || !strcmp(argv[0], "-a")) {
- shift_arg(argc, argv);
- if (*argc > 0) {
- parser->after = strtoll(argv[0], &endptr, 10);
- if (endptr == argv[0]) {
- printf("error: invalid after value '%s'\n", argv[0]);
- exit(1);
- }
- shift_arg(argc, argv);
- } else {
- printf("error: expected argument to --after\n");
- exit(1);
- }
- } else if (!strcmp("--help", argv[0])) {
- usage();
- } else if (!strcmp("--version", argv[0])) {
- printf("datefmt " VERSION "\n");
- exit(0);
- } else {
- parser->format = (const char*)argv[0];
- shift_arg(argc, argv);
- }
+ char *endptr;
+
+ if (!strcmp(argv[0], "--after") || !strcmp(argv[0], "-a")) {
+ shift_arg(argc, argv);
+ if (*argc > 0) {
+ parser->after = strtoll(argv[0], &endptr, 10);
+ if (endptr == argv[0]) {
+ printf("error: invalid after value '%s'\n", argv[0]);
+ exit(1);
+ }
+ shift_arg(argc, argv);
+ } else {
+ printf("error: expected argument to --after\n");
+ exit(1);
+ }
+ } else if (!strcmp("--help", argv[0])) {
+ usage();
+ } else if (!strcmp("--version", argv[0])) {
+ printf("datefmt " VERSION "\n");
+ exit(0);
+ } else {
+ parser->format = (const char*)argv[0];
+ shift_arg(argc, argv);
+ }
}
static void parse_args(int argc, char **argv, struct parser *parser)
{
- shift_arg(&argc, argv);
+ shift_arg(&argc, argv);
- while (argc > 0) {
- parse_arg(&argc, argv, parser);
- }
+ while (argc > 0) {
+ parse_arg(&argc, argv, parser);
+ }
}
int main(int argc, char *argv[])
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
struct parser parser;
parser_init(&parser);
- parse_args(argc, argv, &parser);
+ parse_args(argc, argv, &parser);
do {
parser.len = fread(parser.buf, 1, READSIZE, stdin);
