diff options
Diffstat (limited to 'date.c')
| -rw-r--r-- | date.c | 38 |
1 files changed, 15 insertions, 23 deletions
@@ -59,8 +59,7 @@ static _Noreturn void usage(void); int main(const int argc, char *argv[]) { - register const char * format; - register const char * cp; + register const char * format = "+%+"; register int ch; register bool rflag = false; time_t t; @@ -77,7 +76,6 @@ main(const int argc, char *argv[]) textdomain(TZ_DOMAIN); #endif /* HAVE_GETTEXT */ t = time(NULL); - format = NULL; while ((ch = getopt(argc, argv, "ucr:")) != EOF && ch != -1) { switch (ch) { default: @@ -108,20 +106,17 @@ main(const int argc, char *argv[]) break; } } - while (optind < argc) { - cp = argv[optind++]; - if (*cp == '+') - if (format == NULL) - format = cp + 1; - else { - fprintf(stderr, -_("date: error: multiple formats in command line\n")); - usage(); - } - else { - fprintf(stderr, _("date: unknown operand: %s\n"), cp); - usage(); - } + if (optind < argc) { + if (argc - optind != 1) { + fprintf(stderr, + _("date: error: multiple operands in command line\n")); + usage(); + } + format = argv[optind]; + if (*format != '+') { + fprintf(stderr, _("date: unknown operand: %s\n"), format); + usage(); + } } display(format, t); @@ -186,7 +181,7 @@ display(char const *format, time_t now) errensure(); return; } - timeout(stdout, format ? format : "%+", tmp); + timeout(stdout, format, tmp); putchar('\n'); fflush(stdout); fflush(stderr); @@ -207,8 +202,6 @@ timeout(FILE *fp, char const *format, struct tm const *tmp) size_t size; struct tm tm; - if (*format == '\0') - return; if (!tmp) { fprintf(stderr, _("date: error: time out of range\n")); errensure(); @@ -225,13 +218,12 @@ timeout(FILE *fp, char const *format, struct tm const *tmp) errensure(); exit(retval); } - cp[0] = '\1'; result = strftime(cp, size, format, tmp); - if (result != 0 || cp[0] == '\0') + if (result != 0) break; size += INCR; cp = realloc(cp, size); } - fwrite(cp, 1, result, fp); + fwrite(cp + 1, 1, result - 1, fp); free(cp); } |