diff -r mbuffer-20010703/CHANGES mbuffer-20010704/CHANGES 0a1,7 > 20010704: > - fixed possible termination hang on write error > - fixed debugmessage for input thread > - added support for autoloaders > - update for experimental networking code > - docu update > diff -r mbuffer-20010703/README mbuffer-20010704/README 19a20 > # auto-loader support (TEST IT!) diff -r mbuffer-20010703/configure mbuffer-20010704/configure 601c601 < echo "configure:602: checking target system type" >&5 --- > echo "configure:586: checking target system type" >&5 647c647 < VERSION=20010703 --- > VERSION=20010704 670c670 < echo "configure:671: checking for $ac_word" >&5 --- > echo "configure:655: checking for $ac_word" >&5 700c700 < echo "configure:701: checking for $ac_word" >&5 --- > echo "configure:685: checking for $ac_word" >&5 794c794 < #line 795 "configure" --- > #line 779 "configure" 799c799 < if { (eval echo configure:800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 825c825 < echo "configure:826: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 --- > echo "configure:810: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 830c830 < echo "configure:831: checking whether we are using GNU C" >&5 --- > echo "configure:815: checking whether we are using GNU C" >&5 957c957 < echo "configure:958: checking for $ac_word" >&5 --- > echo "configure:942: checking for $ac_word" >&5 1082c1082 < #line 1083 "configure" --- > #line 1051 "configure" 1201c1201 < echo "configure:1202: checking how to run the C preprocessor" >&5 --- > echo "configure:1170: checking how to run the C preprocessor" >&5 1256c1256 < { (eval echo configure:1257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- > { (eval echo configure:1225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1323c1323 < echo "configure:1324: checking for $ac_func" >&5 --- > echo "configure:1292: checking for $ac_func" >&5 1328c1328 < #line 1329 "configure" --- > #line 1297 "configure" 1376c1376 < echo "configure:1377: checking for working mmap" >&5 --- > echo "configure:1345: checking for working mmap" >&5 1384c1384 < #line 1385 "configure" --- > #line 1353 "configure" 1582c1582 < echo "configure:1583: checking for ANSI C header files" >&5 --- > echo "configure:1551: checking for ANSI C header files" >&5 1587c1587 < #line 1588 "configure" --- > #line 1556 "configure" 1595c1595 < { (eval echo configure:1596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- > { (eval echo configure:1564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1651c1651 < #line 1652 "configure" --- > #line 1620 "configure" 1855c1855 < echo "configure:1856: checking for library containing socket" >&5 --- > echo "configure:1792: checking for library containing socket" >&5 1917c1917 < echo "configure:1918: checking for library containing gethostbyname" >&5 --- > echo "configure:1886: checking for library containing gethostbyname" >&5 diff -r mbuffer-20010703/configure.in mbuffer-20010704/configure.in 11c11 < VERSION=20010703 --- > VERSION=20010704 diff -r mbuffer-20010703/mbuffer.1.in mbuffer-20010704/mbuffer.1.in 55a56,58 > .TP > \fB\-a\fR <\fItime\fP> > used device is an autoloader which takes \fItime\fP seconds to load a new tape 61c64 < set verbose level to \fInum\fP (valid values are 0..5, 0 = none, 5 = all, even debugging informations) --- > set verbose level to \fInum\fP. Valid values are 0..5 (0 = none, 1 = errors, 2 = warnings, 4 = informations, 5 = debugging informations). Higher values include lower values messages. diff -r mbuffer-20010703/mbuffer.c mbuffer-20010704/mbuffer.c 32c32 < Numblocks = 256, Outblocksize = 0; --- > Numblocks = 256, Outblocksize = 0, Autoloader = 0; 198a199,200 > char cmd[15+strlen(Infile)]; > 202,205c204,215 < fprintf(Terminal,"\ninsert next volume and press return to continue..."); < fflush(Terminal); < tcflush(fileno(Terminal),TCIFLUSH); < fgetc(Terminal); --- > if ((Autoloader) && (Infile)) { > infomsg("requesting change of volume...\n"); > sprintf(cmd,"mt -f %s offline",Infile); > system(cmd); > infomsg("waiting for drive to get ready...\n"); > sleep(Autoloader); > } else { > fprintf(Terminal,"\ninsert next volume and press return to continue..."); > fflush(Terminal); > tcflush(fileno(Terminal),TCIFLUSH); > fgetc(Terminal); > } 275a286,287 > char cmd[15+strlen(Outfile)]; > 284,288c296,309 < fprintf(Terminal,"\nWARNING: multivolume is known to be buggy in some situations...\n" < "volume full - insert new media and press return whe ready...\n"); < tcflush(fileno(Terminal),TCIFLUSH); < fgetc(Terminal); < fprintf(Terminal,"\nOK - continuing...\n"); --- > warningmsg("multivolume is known to be buggy in some situations...\n"); > if ((Autoloader) && (Outfile)) { > infomsg("requesting change of volume...\n"); > sprintf(cmd,"mt -f %s offline",Outfile); > system(cmd); > infomsg("waiting for drive to get ready...\n"); > sleep(Autoloader); > } else { > fprintf(Terminal,"\nvolume full - insert new media and press return whe ready...\n"); > tcflush(fileno(Terminal),TCIFLUSH); > fgetc(Terminal); > fprintf(Terminal,"\nOK - continuing...\n"); > } > infomsg("continuing with next volume\n"); 344c365 < debugmsg("outputThread: write(Out, Buffer[%i] + %i, %i) = %i\t(rest = %i)\n", at, Blocksize - rest, rest > Outsize ? Outsize : rest, err, rest); --- > debugmsg("outputThread: write(Out, Buffer[%i] + %Lu, %i) = %i\t(rest = %i)\n", at, Blocksize - rest, rest > Outsize ? Outsize : rest, err, rest); 357a379 > sem_post(&Dev2Buf); 454,455c476 < if (0 != (*port = atoi(argv[*c]))) { < (*c)++; --- > if (0 != (*port = atoi(argv[*c]))) 457d477 < } 459d478 < (*c)++; 504a524 > "-a