a50e959
diff -ur bar-1.10.9.orig/Makefile.am bar-1.10.9/Makefile.am
a50e959
--- bar-1.10.9.orig/Makefile.am	2007-06-06 10:44:05.000000000 -1000
a50e959
+++ bar-1.10.9/Makefile.am	2010-02-01 16:26:18.000000000 -1000
a50e959
@@ -85,14 +85,14 @@
a50e959
 
a50e959
 DISTCLEANFILES += ./log.test-*
a50e959
 
a50e959
-bin_PROGRAMS += bar
a50e959
+bin_PROGRAMS += clpbar
a50e959
 noinst_HEADERS += types.h
a50e959
 noinst_HEADERS += error.h
a50e959
 noinst_HEADERS += fd.h
a50e959
 noinst_HEADERS += io.h
a50e959
 noinst_HEADERS += display.h
a50e959
 noinst_HEADERS += args.h
a50e959
-bar_SOURCES = \
a50e959
+clpbar_SOURCES = \
a50e959
 	error.c \
a50e959
 	fd.c \
a50e959
 	io.c \
a50e959
@@ -101,7 +101,7 @@
a50e959
 	bar.c \
a50e959
 	#
a50e959
 
a50e959
-man_MANS += bar.1
a50e959
+man_MANS += clpbar.1
a50e959
 EXTRA_DIST += $(man_MANS)
a50e959
 
a50e959
 # EXTRA_DIST += PORTING
a50e959
diff -ur bar-1.10.9.orig/args.c bar-1.10.9/args.c
a50e959
--- bar-1.10.9.orig/args.c	2007-06-28 03:09:58.000000000 -1000
a50e959
+++ bar-1.10.9/args.c	2010-02-01 17:12:11.000000000 -1000
a50e959
@@ -2808,12 +2808,12 @@
a50e959
 
a50e959
 	home_dir = getenv("HOME");
a50e959
 	if (home_dir != 0) {
a50e959
-		sprintf(filename, "%.*s/.barrc", 4088, home_dir);
a50e959
+		sprintf(filename, "%.*s/.clpbarrc", 4091, home_dir);
a50e959
 		if (parse_rcfile(ferr, filename) != 0)
a50e959
 			return(1);
a50e959
 	}
a50e959
 
a50e959
-	sprintf(filename, "./.barrc");
a50e959
+	sprintf(filename, "./.clpbarrc");
a50e959
 	if (parse_rcfile(ferr, filename) != 0)
a50e959
 		return(1);
a50e959
 	
a50e959
Only in bar-1.10.9: clpbar.1.in
a50e959
diff -ur bar-1.10.9.orig/configure.in bar-1.10.9/configure.in
a50e959
--- bar-1.10.9.orig/configure.in	2007-06-28 03:09:35.000000000 -1000
a50e959
+++ bar-1.10.9/configure.in	2010-02-01 16:39:14.000000000 -1000
a50e959
@@ -1,6 +1,6 @@
a50e959
 AC_INIT(bar.c)
a50e959
 AC_CANONICAL_SYSTEM
a50e959
-AM_INIT_AUTOMAKE(bar,1.10.9)
a50e959
+AM_INIT_AUTOMAKE(clpbar,1.10.9)
a50e959
 AM_CONFIG_HEADER(config.h)
a50e959
 
a50e959
 AC_PROG_CC
a50e959
@@ -571,7 +571,7 @@
a50e959
 	AC_DEFINE(USE_IOVEC,1,[Use vectored I/O (if available)])
a50e959
 fi
a50e959
 
a50e959
-AC_CONFIG_FILES([Makefile bar.1 doxygen.conf])
a50e959
+AC_CONFIG_FILES([Makefile clpbar.1 doxygen.conf])
a50e959
 AC_CONFIG_COMMANDS([test-script-preparation],[chmod u+x test-00?])
a50e959
 AC_OUTPUT
a50e959
 
a50e959
diff -ur bar-1.10.9.orig/test-001 bar-1.10.9/test-001
a50e959
--- bar-1.10.9.orig/test-001	2006-10-03 05:58:54.000000000 -1000
a50e959
+++ bar-1.10.9/test-001	2010-02-01 17:16:32.000000000 -1000
a50e959
@@ -1,5 +1,5 @@
a50e959
 #!/bin/sh
a50e959
 
a50e959
-./test-001-pre | ./bar 2> /dev/null | ./test-001-post
a50e959
+./test-001-pre | ./clpbar 2> /dev/null | ./test-001-post
a50e959
 if [ "$?" -ne 0 ]; then exit 1; fi
a50e959
 exit 0
a50e959
diff -ur bar-1.10.9.orig/test-002 bar-1.10.9/test-002
a50e959
--- bar-1.10.9.orig/test-002	2006-10-03 05:58:54.000000000 -1000
a50e959
+++ bar-1.10.9/test-002	2010-02-01 17:16:42.000000000 -1000
a50e959
@@ -22,9 +22,9 @@
a50e959
 	exit 1
a50e959
 fi
a50e959
 
a50e959
-./bar -if ${src_file} -of ${dst_file} 2> /dev/null
a50e959
+./clpbar -if ${src_file} -of ${dst_file} 2> /dev/null
a50e959
 if [ "$?" -ne 0 ]; then
a50e959
-	echo "*** ERROR: ./bar failed"
a50e959
+	echo "*** ERROR: ./clpbar failed"
a50e959
 	exit 1
a50e959
 fi
a50e959
 cmp ${src_file} ${dst_file} > /dev/null 2>&1
a50e959
@@ -33,9 +33,9 @@
a50e959
 	exit 1
a50e959
 fi
a50e959
 
a50e959
-cat ${src_file} | ./bar 2> /dev/null > ${dst_file}
a50e959
+cat ${src_file} | ./clpbar 2> /dev/null > ${dst_file}
a50e959
 if [ "$?" -ne 0 ]; then
a50e959
-	echo "*** ERROR: ./bar failed"
a50e959
+	echo "*** ERROR: ./clpbar failed"
a50e959
 	exit 1
a50e959
 fi
a50e959
 cmp ${src_file} ${dst_file} > /dev/null 2>&1
a50e959
diff -ur bar-1.10.9.orig/test-003 bar-1.10.9/test-003
a50e959
--- bar-1.10.9.orig/test-003	2006-10-03 05:58:54.000000000 -1000
a50e959
+++ bar-1.10.9/test-003	2010-02-01 17:16:53.000000000 -1000
a50e959
@@ -41,10 +41,10 @@
a50e959
 	exit 1
a50e959
 fi
a50e959
 
a50e959
-echo "- Copying file through bar..."
a50e959
-./bar -if ${src_file} -of ${dst_file} 2> /dev/null
a50e959
+echo "- Copying file through clpbar..."
a50e959
+./clpbar -if ${src_file} -of ${dst_file} 2> /dev/null
a50e959
 if [ "$?" -ne 0 ]; then
a50e959
-	echo "*** ERROR: bar failed"
a50e959
+	echo "*** ERROR: clpbar failed"
a50e959
 	exit 1
a50e959
 fi
a50e959
 
a50e959
diff -ur bar-1.10.9.orig/test-004 bar-1.10.9/test-004
a50e959
--- bar-1.10.9.orig/test-004	2006-10-03 05:58:54.000000000 -1000
a50e959
+++ bar-1.10.9/test-004	2010-02-01 17:17:01.000000000 -1000
a50e959
@@ -69,7 +69,7 @@
a50e959
 			dd \
a50e959
 				if=${dst_file_1} \
a50e959
 				2> /dev/null \
a50e959
-				| ./bar \
a50e959
+				| ./clpbar \
a50e959
 					-s ${block_count}b \
a50e959
 					-of ${dst_file_2} \
a50e959
 					-bl ${block_size} \
a50e959
@@ -77,7 +77,7 @@
a50e959
 					2> /dev/null \
a50e959
 					#
a50e959
 			if [ "$?" -ne 0 ]; then
a50e959
-				echo "ERROR: bar failed"
a50e959
+				echo "ERROR: clpbar failed"
a50e959
 				exit 1
a50e959
 			fi
a50e959
 			cmp ${dst_file_1} ${dst_file_2}