diff options
Diffstat (limited to 'contrib/groff/grolj4/lj4.cc')
| -rw-r--r-- | contrib/groff/grolj4/lj4.cc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/contrib/groff/grolj4/lj4.cc b/contrib/groff/grolj4/lj4.cc index 002503a..0c23a45 100644 --- a/contrib/groff/grolj4/lj4.cc +++ b/contrib/groff/grolj4/lj4.cc @@ -33,6 +33,7 @@ X command to include bitmap graphics */ #include "driver.h" +#include "nonposix.h" static struct { const char *name; @@ -567,11 +568,11 @@ printer *make_printer() static int lookup_paper_size(const char *s) { - for (int i = 0; i < sizeof(paper_table)/sizeof(paper_table[0]); i++) - // FIXME Do this case-insensitively. - // Perhaps allow unique prefix. - if (strcmp(s, paper_table[i].name) == 0) + for (int i = 0; i < sizeof(paper_table)/sizeof(paper_table[0]); i++) { + // FIXME Perhaps allow unique prefix. + if (strcasecmp(s, paper_table[i].name) == 0) return i; + } return -1; } @@ -596,6 +597,8 @@ void handle_unknown_desc_command(const char *command, const char *arg, static void usage(); +extern "C" int optopt, optind; + int main(int argc, char **argv) { program_name = argv[0]; @@ -603,7 +606,6 @@ int main(int argc, char **argv) setbuf(stderr, stderr_buf); font::set_unknown_desc_command_handler(handle_unknown_desc_command); int c; - extern int optopt, optind; while ((c = getopt(argc, argv, ":F:p:d:lvw:c:")) != EOF) switch(c) { case 'l': @@ -637,8 +639,8 @@ int main(int argc, char **argv) } case 'v': { - extern const char *version_string; - fprintf(stderr, "grolj4 version %s\n", version_string); + extern const char *Version_string; + fprintf(stderr, "grolj4 version %s\n", Version_string); fflush(stderr); break; } @@ -675,6 +677,9 @@ int main(int argc, char **argv) default: assert(0); } +#ifdef SET_BINARY + SET_BINARY(fileno(stdout)); +#endif if (optind >= argc) do_file("-"); else { |
