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