diff -r mbuffer-20010704/CHANGES mbuffer-20010716/CHANGES
0a1,9
> 20010716:
> - fixed option -q to not block out usage of multi
>   volume support
> - docu update
> - minor debug message update
> - more autoloader sanity checks
> - changed status for networking stuff to BETA
>   i.e. new configure option "--enable-networking"
> 
diff -r mbuffer-20010704/README mbuffer-20010716/README
54a55,56
> Use configure option --enable-networking to include
> this code.
83a86
> # make networking compile under tru64
diff -r mbuffer-20010704/acconfig.h mbuffer-20010716/acconfig.h
15a16,18
> /* networking code is still BETA */
> #undef NETWORKING
> 
diff -r mbuffer-20010704/config.h.in mbuffer-20010716/config.h.in
32a33,35
> /* networking code is BETA */
> #undef NETWORKING
> 
diff -r mbuffer-20010704/configure mbuffer-20010716/configure
20c20
< --enable-experimental     enable experimental code"
---
> --enable-networking     enable networking code (BETA)XS"
601c601
< echo "configure:586: checking target system type" >&5
---
> echo "configure:602: checking target system type" >&5
647c647
< VERSION=20010704
---
> VERSION=20010716
670c670
< echo "configure:655: checking for $ac_word" >&5
---
> echo "configure:671: checking for $ac_word" >&5
700c700
< echo "configure:685: checking for $ac_word" >&5
---
> echo "configure:701: checking for $ac_word" >&5
794c794
< #line 779 "configure"
---
> #line 795 "configure"
799c799
< if { (eval echo configure:784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
---
> if { (eval echo configure:800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
825c825
< echo "configure:810: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
---
> echo "configure:826: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
830c830
< echo "configure:815: checking whether we are using GNU C" >&5
---
> echo "configure:831: checking whether we are using GNU C" >&5
957c957
< echo "configure:942: checking for $ac_word" >&5
---
> echo "configure:958: checking for $ac_word" >&5
1082c1082
< #line 1051 "configure"
---
> #line 1083 "configure"
1134a1135,1170
> # Extract the first word of "mt", so it can be a program name with args.
> set dummy mt; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> echo "configure:1139: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_path_MT'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>   case "$MT" in
>   /*)
>   ac_cv_path_MT="$MT" # Let the user override the test with a path.
>   ;;
>   ?:/*)			 
>   ac_cv_path_MT="$MT" # Let the user override the test with a dos path.
>   ;;
>   *)
>   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
>   ac_dummy="$PATH"
>   for ac_dir in $ac_dummy; do 
>     test -z "$ac_dir" && ac_dir=.
>     if test -f $ac_dir/$ac_word; then
>       ac_cv_path_MT="$ac_dir/$ac_word"
>       break
>     fi
>   done
>   IFS="$ac_save_ifs"
>   test -z "$ac_cv_path_MT" && ac_cv_path_MT="echo "configure: warning: could not find the program mt - you might need this if you want autoloader support" 1>&2"
>   ;;
> esac
> fi
> MT="$ac_cv_path_MT"
> if test -n "$MT"; then
>   echo "$ac_t""$MT" 1>&6
> else
>   echo "$ac_t""no" 1>&6
> fi
> 
1160c1196
< echo "configure:1161: checking return type of signal handlers" >&5
---
> echo "configure:1197: checking return type of signal handlers" >&5
1165c1201
< #line 1166 "configure"
---
> #line 1202 "configure"
1182c1218
< if { (eval echo configure:1183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
---
> if { (eval echo configure:1219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1201c1237
< echo "configure:1170: checking how to run the C preprocessor" >&5
---
> echo "configure:1238: checking how to run the C preprocessor" >&5
1216c1252
< #line 1217 "configure"
---
> #line 1253 "configure"
1222c1258
< { (eval echo configure:1223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
---
> { (eval echo configure:1259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1233c1269
< #line 1234 "configure"
---
> #line 1270 "configure"
1239c1275
< { (eval echo configure:1240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
---
> { (eval echo configure:1276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1250c1286
< #line 1251 "configure"
---
> #line 1287 "configure"
1256c1292
< { (eval echo configure:1225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
---
> { (eval echo configure:1293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1284c1320
< echo "configure:1285: checking for $ac_hdr" >&5
---
> echo "configure:1321: checking for $ac_hdr" >&5
1289c1325
< #line 1290 "configure"
---
> #line 1326 "configure"
1294c1330
< { (eval echo configure:1295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
---
> { (eval echo configure:1331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1323c1359
< echo "configure:1292: checking for $ac_func" >&5
---
> echo "configure:1360: checking for $ac_func" >&5
1328c1364
< #line 1297 "configure"
---
> #line 1365 "configure"
1351c1387
< if { (eval echo configure:1352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
---
> if { (eval echo configure:1388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1376c1412
< echo "configure:1345: checking for working mmap" >&5
---
> echo "configure:1413: checking for working mmap" >&5
1384c1420
< #line 1353 "configure"
---
> #line 1421 "configure"
1524c1560
< if { (eval echo configure:1525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
---
> if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1547c1583
< echo "configure:1548: checking whether time.h and sys/time.h may both be included" >&5
---
> echo "configure:1584: checking whether time.h and sys/time.h may both be included" >&5
1552c1588
< #line 1553 "configure"
---
> #line 1589 "configure"
1561c1597
< if { (eval echo configure:1562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
---
> if { (eval echo configure:1598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1582c1618
< echo "configure:1551: checking for ANSI C header files" >&5
---
> echo "configure:1619: checking for ANSI C header files" >&5
1587c1623
< #line 1556 "configure"
---
> #line 1624 "configure"
1595c1631
< { (eval echo configure:1564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
---
> { (eval echo configure:1632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1612c1648
< #line 1613 "configure"
---
> #line 1649 "configure"
1630c1666
< #line 1631 "configure"
---
> #line 1667 "configure"
1651c1687
< #line 1620 "configure"
---
> #line 1688 "configure"
1662c1698
< if { (eval echo configure:1663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
---
> if { (eval echo configure:1699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1688c1724
< echo "configure:1689: checking for $ac_func" >&5
---
> echo "configure:1725: checking for $ac_func" >&5
1693c1729
< #line 1694 "configure"
---
> #line 1730 "configure"
1716c1752
< if { (eval echo configure:1717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
---
> if { (eval echo configure:1753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1744c1780
< echo "configure:1745: checking for $ac_hdr" >&5
---
> echo "configure:1781: checking for $ac_hdr" >&5
1749c1785
< #line 1750 "configure"
---
> #line 1786 "configure"
1754c1790
< { (eval echo configure:1755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
---
> { (eval echo configure:1791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1781c1817
< echo "configure:1782: checking for st_blksize in struct stat" >&5
---
> echo "configure:1818: checking for st_blksize in struct stat" >&5
1786c1822
< #line 1787 "configure"
---
> #line 1823 "configure"
1794c1830
< if { (eval echo configure:1795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
---
> if { (eval echo configure:1831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1846,1848c1882,1884
< # Check whether --enable-experimental or --disable-experimental was given.
< if test "${enable_experimental+set}" = set; then
<   enableval="$enable_experimental"
---
> # Check whether --enable-networking or --disable-networking was given.
> if test "${enable_networking+set}" = set; then
>   enableval="$enable_networking"
1850c1886
< #define EXPERIMENTAL 1
---
> #define NETWORKING 1
1855c1891
< echo "configure:1792: checking for library containing socket" >&5
---
> echo "configure:1892: checking for library containing socket" >&5
1862c1898
< #line 1863 "configure"
---
> #line 1899 "configure"
1873c1909
< if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
---
> if { (eval echo configure:1910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1884c1920
< #line 1885 "configure"
---
> #line 1921 "configure"
1895c1931
< if { (eval echo configure:1896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
---
> if { (eval echo configure:1932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1917c1953
< echo "configure:1886: checking for library containing gethostbyname" >&5
---
> echo "configure:1954: checking for library containing gethostbyname" >&5
1924c1960
< #line 1925 "configure"
---
> #line 1961 "configure"
1935c1971
< if { (eval echo configure:1936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
---
> if { (eval echo configure:1972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1946c1982
< #line 1947 "configure"
---
> #line 1983 "configure"
1957c1993
< if { (eval echo configure:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
---
> if { (eval echo configure:1994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2137a2174
> s%@MT@%$MT%g
2142c2179
< s%@EXPERIMENTAL@%$EXPERIMENTAL%g
---
> s%@NETWORKING@%$NETWORKING%g
diff -r mbuffer-20010704/configure.in mbuffer-20010716/configure.in
11c11
< VERSION=20010704
---
> VERSION=20010716
26a27
> AC_PATH_PROG(MT,mt,AC_MSG_WARN(could not find the program mt - you might need this if you want autoloader support))
72,74c73,75
< AC_ARG_ENABLE(experimental,
<         --enable-experimental     enable experimental code,
<         AC_DEFINE_UNQUOTED(EXPERIMENTAL)
---
> AC_ARG_ENABLE(networking,
>         --enable-networking     enable networking code (BETA)XS,
>         AC_DEFINE_UNQUOTED(NETWORKING)
80c81
< AC_SUBST(EXPERIMENTAL)
---
> AC_SUBST(NETWORKING)
diff -r mbuffer-20010704/mbuffer.1.in mbuffer-20010716/mbuffer.1.in
18c18,20
< use network port \fIport\fP as input instead of the standard input
---
> use network port \fIport\fP as input instead of the standard input. If
> given a hostname and a port in the form hostname:port the first interface 
> with the IP of hostname will be used.
diff -r mbuffer-20010704/mbuffer.c mbuffer-20010716/mbuffer.c
18c18
< #ifdef EXPERIMENTAL
---
> #ifdef NETWORKING
117c117
< #ifdef EXPERIMENTAL
---
> #ifdef NETWORKING
207c207,211
< 			system(cmd);
---
> 			if (-1 == system(cmd)) {
> 				warningmsg("error executing mt to change volume in autoloader...\n");
> 				Autoloader = 0;
> 				continue;
> 			}
296,308c300,319
< 	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");
< 	}
---
> 	do {
> 		if ((Autoloader) && (Outfile)) {
> 			infomsg("requesting change of volume...\n");
> 			sprintf(cmd,"mt -f %s offline",Outfile);
> 			if (-1 == system(cmd)) {
> 				warningmsg("error executing mt to change volume in autoloader...\n");
> 				Autoloader = 0;
> 				continue;
> 			}
> 			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");
> 		}
> 		if (-1 == (Out = open(Outfile,Nooverwrite|O_CREAT|O_WRONLY|O_TRUNC|O_SYNC,0666)))
> 			errormsg("error reopening output file: %s\n",strerror(errno));
> 	} while (-1 == Out);
310,314d320
< 	if (-1 == (Out = open(Outfile,Nooverwrite|O_CREAT|O_WRONLY|O_TRUNC|O_SYNC,0666))) {
< 		errormsg("error reopening output file: %s\n",strerror(errno));
< 		Finish = 1;
< 		pthread_exit((void *) -1);
< 	}
402c408
< #ifdef EXPERIMENTAL
---
> #ifdef NETWORKING
420c426
< 		debugmsg("resolving client hostname...\n");
---
> 		debugmsg("resolving hostname of input interface...\n");
510,512d515
< #ifdef EXPERIMENTAL
< 		"-I <port>  : use network port <port> as input\n"
< #endif
514c517,518
< #ifdef EXPERIMENTAL
---
> #ifdef NETWORKING
> 		"-I <port>  : use network port <port> as input\n"
579c583
< #ifdef EXPERIMENTAL
---
> #ifdef NETWORKING
620c624
< #ifdef EXPERIMENTAL
---
> #ifdef NETWORKING
628c632
< #ifdef EXPERIMENTAL
---
> #ifdef NETWORKING
694c698
< #ifdef EXPERIMENTAL
---
> #ifdef NETWORKING
748c752
< 	debugmsg("creating semaphore...\n");
---
> 	debugmsg("creating semaphores...\n");
750c754
< 		fatal("Error creating semaphore: %s\n",strerror(errno));
---
> 		fatal("Error creating semaphore Buf2Dev: %s\n",strerror(errno));
752c756
< 		fatal("Error creating semaphore: %s\n",strerror(errno));
---
> 		fatal("Error creating semaphore Dev2Buf: %s\n",strerror(errno));
754c758
< 		fatal("Error creating semaphore: %s\n",strerror(errno));
---
> 		fatal("Error creating semaphore Percentage: %s\n",strerror(errno));
760c764
< #ifdef EXPERIMENTAL
---
> #ifdef NETWORKING
769c773
< #ifdef EXPERIMENTAL
---
> #ifdef NETWORKING
798,805c802,807
< 	if (Status) {
< 		debugmsg("accessing terminal...\n");
< 		Terminal = fopen("/dev/tty","r+");
< 		if (!Terminal) {
< 			errormsg("could not open terminal: %s\n",strerror(errno));
< 			warningmsg("no multi volume support");
< 			Status = 0;
< 		}
---
> 	debugmsg("accessing terminal...\n");
> 	Terminal = fopen("/dev/tty","r+");
> 	if (!Terminal) {
> 		errormsg("could not open terminal: %s\n",strerror(errno));
> 		warningmsg("multi volume support turned off");
> 		Status = 0;