X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjpegls%2FDecoder%2Fglobal.c;h=9375585e8e0e834e59984da2e57c7e235dc28f39;hb=68d67ea7128441d7243c25fd2ed2b4d2fd6e5a5b;hp=55d1ddc7e9034ea865940fe29768bcbfe289c1e7;hpb=94015b89675cf4431c7e4953a597b70cfde03bcc;p=gdcm.git diff --git a/src/gdcmjpegls/Decoder/global.c b/src/gdcmjpegls/Decoder/global.c index 55d1ddc7..9375585e 100644 --- a/src/gdcmjpegls/Decoder/global.c +++ b/src/gdcmjpegls/Decoder/global.c @@ -51,8 +51,12 @@ */ #include -#include #include "global.h" +#ifdef HAVE_UNISTD_H +#include +#else +#include +#endif @@ -70,7 +74,7 @@ without the written permission of the copyright holder.\n\ FILE *in, *out; FILE *c_in[MAX_COMPONENTS]; FILE *c_out[MAX_COMPONENTS]; -FILE *msgfile = NULL; // = stdout; +FILE *msgfile = NULL; /* = stdout;*/ /* Context quantization thresholds - initially unset */ int T3 = -1, @@ -328,29 +332,29 @@ char *ttyfilename = "CON"; void fprint_disclaimer(FILE *fp, int nopause) { - char *p0, *p1; - FILE *ttyf; - int i, c; + char *p0, *p1; + FILE *ttyf; + int i; /*, c;*/ - nopause = nopause | !isatty(fileno(fp)); + nopause = nopause | !isatty(fileno(fp)); - if ( !nopause && (ttyf=fopen(ttyfilename,"r"))==NULL ) { - nopause = 1; - } + if ( !nopause && (ttyf=fopen(ttyfilename,"r"))==NULL ) { + nopause = 1; + } - for ( i=1, p0=disclaimer; ; i++ ) { - if ( !(*p0) ) break; - if ( !nopause && i%PAUSE==0 ) { + for ( i=1, p0=disclaimer; ; i++ ) { + if ( !(*p0) ) break; + if ( !nopause && i%PAUSE==0 ) { fflush(fp); fprintf(stderr, "--- (press RETURN to continue) ---"); fflush(stderr); - c = getc(ttyf); - } - for ( p1=p0; (*p1 != '\n') && (*p1 != 0); p1++ ); - *p1 = 0; - fprintf(fp,"%s\n",p0); - p0 = p1+1; +/* c = getc(ttyf);*/ } - fprintf(fp,"\n"); fflush(fp); - if ( !nopause) fclose(ttyf); + for ( p1=p0; (*p1 != '\n') && (*p1 != 0); p1++ ); + *p1 = 0; + fprintf(fp,"%s\n",p0); + p0 = p1+1; + } + fprintf(fp,"\n"); fflush(fp); + if ( !nopause) fclose(ttyf); }