--- ray/src/util/getinfo.c 1991/04/18 14:35:06 1.3 +++ ray/src/util/getinfo.c 1998/10/27 08:47:17 2.4 @@ -1,4 +1,4 @@ -/* Copyright (c) 1986 Regents of the University of California */ +/* Copyright (c) 1992 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -12,9 +12,15 @@ static char SCCSid[] = "$SunId$ LBL"; #include +#ifdef MSDOS +#include +extern int _fmode; +#endif + extern int fputs(); +int tabstr(s) /* put out line followed by tab */ register char *s; { @@ -24,12 +30,13 @@ register char *s; } if (*--s == '\n') putchar('\t'); + return(0); } main(argc, argv) int argc; -char *argv[]; +char **argv; { int dim = 0; FILE *fp; @@ -38,8 +45,15 @@ char *argv[]; if (argc > 1 && !strcmp(argv[1], "-d")) { argc--; argv++; dim = 1; +#ifdef MSDOS + setmode(fileno(stdin), _fmode = O_BINARY); +#endif } else if (argc == 2 && !strcmp(argv[1], "-")) { - getheader(stdin, NULL); +#ifdef MSDOS + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); +#endif + getheader(stdin, NULL, NULL); copycat(); exit(0); } @@ -76,7 +90,7 @@ register FILE *fp; int j; register int c; - getheader(fp, NULL); /* skip header */ + getheader(fp, NULL, NULL); /* skip header */ switch (c = getc(fp)) { case '+': /* picture */