home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Geek Gadgets 1
/
ADE-1.bin
/
ade-dist
/
cpio-2.4.2-diffs.gz
/
cpio-2.4.2-diffs
Wrap
Text File
|
1996-10-13
|
77KB
|
2,344 lines
This file contains patches that transform the baseline version into
the amiga version. Assuming that you have unarchived the baseline
version in the current directory, just run the command:
patch -p1 -E -b .pbak <diff-file
where 'diff-file' is this patch file. After running patch you should
remove all the generated *.pbak files, and look for any *.rej files
that indicate a problem patching the baseline source.
diff -rup --new-file baseline/fsf/cpio/BeOS.diffs amiga/fsf/cpio/BeOS.diffs
--- baseline/fsf/cpio/BeOS.diffs Wed Dec 31 17:00:00 1969
+++ amiga/fsf/cpio/BeOS.diffs Sat Sep 28 00:00:00 1996
@@ -0,0 +1,573 @@
+This patch works around current bugs in the BeOS shell that affect
+configure.
+
+============================================================================
+
+diff -rc cpio-ref/configure cpio/configure
+*** cpio-ref/configure Tue Sep 10 03:05:53 1996
+--- cpio/configure Mon Sep 16 01:55:42 1996
+***************
+*** 599,605 ****
+ yes;
+ #endif
+ EOF
+! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gcc=yes
+ else
+ ac_cv_prog_gcc=no
+--- 599,605 ----
+ yes;
+ #endif
+ EOF
+! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:603: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gcc=yes
+ else
+ ac_cv_prog_gcc=no
+***************
+*** 657,663 ****
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ :
+--- 657,663 ----
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:661: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ :
+***************
+*** 672,678 ****
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ :
+--- 672,678 ----
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:676: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ :
+***************
+*** 851,857 ****
+ #include <minix/config.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+--- 851,857 ----
+ #include <minix/config.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:855: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+***************
+*** 929,935 ****
+ int i;
+ ; return 0; }
+ EOF
+! if { (eval echo configure:933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_type_signal=void
+ else
+--- 929,935 ----
+ int i;
+ ; return 0; }
+ EOF
+! if { (eval echo configure:933: \"$ac_compile\") 1>&5; xxx=`(eval $ac_compile 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ ac_cv_type_signal=void
+ else
+***************
+*** 959,965 ****
+ return makedev(0, 0);
+ ; return 0; }
+ EOF
+! if { (eval echo configure:963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_header_sys_types_h_makedev=yes
+ else
+--- 959,965 ----
+ return makedev(0, 0);
+ ; return 0; }
+ EOF
+! if { (eval echo configure:963: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ ac_cv_header_sys_types_h_makedev=yes
+ else
+***************
+*** 985,991 ****
+ #include <sys/mkdev.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+--- 985,991 ----
+ #include <sys/mkdev.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:989: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+***************
+*** 1020,1026 ****
+ #include <sys/sysmacros.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+--- 1020,1026 ----
+ #include <sys/sysmacros.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1024: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+***************
+*** 1058,1064 ****
+ #include <sys/mtio.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+--- 1058,1064 ----
+ #include <sys/mtio.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1062: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+***************
+*** 1084,1090 ****
+ #include <sys/socket.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+--- 1084,1090 ----
+ #include <sys/socket.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1088: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+***************
+*** 1114,1120 ****
+ #include <netdb.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+--- 1114,1120 ----
+ #include <netdb.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1118: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+***************
+*** 1203,1209 ****
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_c_const=yes
+ else
+--- 1203,1209 ----
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1207: \"$ac_compile\") 1>&5; xxx=`(eval $ac_compile 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ ac_cv_c_const=yes
+ else
+***************
+*** 1268,1274 ****
+ #include "confdefs.h"
+ main(){return(0);}
+ EOF
+! { (eval echo configure:1272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ ac_cv_c_cross=no
+ else
+--- 1268,1274 ----
+ #include "confdefs.h"
+ main(){return(0);}
+ EOF
+! { (eval echo configure:1272: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ ac_cv_c_cross=no
+ else
+***************
+*** 1294,1300 ****
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+--- 1294,1300 ----
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1298: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+***************
+*** 1359,1365 ****
+ exit (0); }
+
+ EOF
+! { (eval echo configure:1363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ :
+ else
+--- 1359,1365 ----
+ exit (0); }
+
+ EOF
+! { (eval echo configure:1363: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ :
+ else
+***************
+*** 1391,1397 ****
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+--- 1391,1397 ----
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1395: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+***************
+*** 1446,1452 ****
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+--- 1446,1452 ----
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1450: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+***************
+*** 1478,1484 ****
+ struct utimbuf foo
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
+ #define HAVE_UTIME_H 1
+--- 1478,1484 ----
+ struct utimbuf foo
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1482: \"$ac_compile\") 1>&5; xxx=`(eval $ac_compile 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
+ #define HAVE_UTIME_H 1
+***************
+*** 1504,1510 ****
+ if (fnmatch ("a*", "abc", 0) == 0) return 0;
+ else return 1; }
+ EOF
+! { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ have_fnmatch=yes
+ else
+--- 1504,1510 ----
+ if (fnmatch ("a*", "abc", 0) == 0) return 0;
+ else return 1; }
+ EOF
+! { (eval echo configure:1508: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ have_fnmatch=yes
+ else
+***************
+*** 1551,1557 ****
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+--- 1551,1557 ----
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1555: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+***************
+*** 1602,1608 ****
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_vprintf=yes"
+ else
+--- 1602,1608 ----
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1606: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_vprintf=yes"
+ else
+***************
+*** 1652,1658 ****
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func__doprnt=yes"
+ else
+--- 1652,1658 ----
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1656: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_func__doprnt=yes"
+ else
+***************
+*** 1689,1695 ****
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_header_alloca_h=yes
+ else
+--- 1689,1695 ----
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1693: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ ac_cv_header_alloca_h=yes
+ else
+***************
+*** 1737,1743 ****
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_func_alloca=yes
+ else
+--- 1737,1743 ----
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1741: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ ac_cv_func_alloca=yes
+ else
+***************
+*** 1825,1831 ****
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+--- 1825,1831 ----
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1829: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+***************
+*** 1876,1882 ****
+ exit (find_stack_direction() < 0);
+ }
+ EOF
+! { (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ ac_cv_c_stack_direction=1
+ else
+--- 1876,1882 ----
+ exit (find_stack_direction() < 0);
+ }
+ EOF
+! { (eval echo configure:1880: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ ac_cv_c_stack_direction=1
+ else
+***************
+*** 1911,1917 ****
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+--- 1911,1917 ----
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1915: \"$ac_compile\") 1>&5; xxx=`(eval $ac_compile 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+***************
+*** 1954,1960 ****
+ opendir()
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+--- 1954,1960 ----
+ opendir()
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1958: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+***************
+*** 1993,1999 ****
+ opendir()
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+--- 1993,1999 ----
+ opendir()
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1997: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+***************
+*** 2033,2039 ****
+ gethostname()
+ ; return 0; }
+ EOF
+! if { (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+--- 2033,2039 ----
+ gethostname()
+ ; return 0; }
+ EOF
+! if { (eval echo configure:2037: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+***************
+*** 2071,2077 ****
+ setsockopt()
+ ; return 0; }
+ EOF
+! if { (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+--- 2071,2077 ----
+ setsockopt()
+ ; return 0; }
+ EOF
+! if { (eval echo configure:2075: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+***************
+*** 2108,2116 ****
+ EOF
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+! (set) 2>&1 |
+ sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+! >> confcache
+ if cmp -s $cache_file confcache; then
+ :
+ else
+--- 2108,2116 ----
+ EOF
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+! (set) >cache.tmp 2>&1
+ sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+! <cache.tmp >> confcache
+ if cmp -s $cache_file confcache; then
+ :
+ else
+***************
+*** 2121,2127 ****
+ echo "not updating unwritable cache $cache_file"
+ fi
+ fi
+! rm -f confcache
+
+ trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+--- 2121,2127 ----
+ echo "not updating unwritable cache $cache_file"
+ fi
+ fi
+! rm -f confcache cache.tmp
+
+ trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
diff -rup --new-file baseline/fsf/cpio/Makefile.in amiga/fsf/cpio/Makefile.in
--- baseline/fsf/cpio/Makefile.in Wed Dec 20 09:28:30 1995
+++ amiga/fsf/cpio/Makefile.in Sat Sep 28 00:00:00 1996
@@ -80,6 +80,15 @@ libexecdir = @libexecdir@
# Where to put the info
infodir = @infodir@
+# Where to put the guide files
+guidedir = $(prefix)/guide
+
+# Where to put the dvi files
+dvidir = $(prefix)/dvi
+
+# Where to put the PostScript files
+psdir = $(prefix)/ps
+
# Where to put the Unix-style manual pages.
mandir = @mandir@/man1
# Extension (not including `.') for the Unix-style manual page filenames.
@@ -91,6 +100,7 @@ SHELL = /bin/sh
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
+DVIPS = dvips
TEXFILES = *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.log *.pg *.toc *.tp *.vr
@@ -117,7 +127,7 @@ README NEWS INSTALL cpio.1 mt.1 makefile
configure configure.in mkinstalldirs install-sh $(MT_SRCS) rmt.c tcexparg.c \
alloca.c cpio.texi cpio.info texinfo.tex
-all: @PROGS@
+all: @PROGS@ cpio.info cpio.guide
.c.o:
$(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
@@ -170,24 +180,39 @@ configure: configure.in
TAGS: $(SRCS)
etags $(SRCS)
-.SUFFIXES: .texi .info .dvi
+.SUFFIXES: .texi .info .dvi .guide .ps
.texi.info:
- $(MAKEINFO) -I$(srcdir) $<
+ $(MAKEINFO) -I$(srcdir) $< --no-split --output=$@
+
+.texi.guide:
+ $(MAKEINFO) -I$(srcdir) $< --no-split --output=$@ --amiga
.texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+.dvi.ps:
+ $(DVIPS) -o $@ $<
+
info:: $(INFO_DEPS)
dvi:: $(DVIS)
-install:: install-info
+install:: install-info install-guide # install-ps install-dvi
install-info: $(INFO_DEPS)
- cd $(srcdir); for file in *.info*; do \
+ for file in *.info*; do \
$(INSTALL_DATA) $$file $(infodir)/$$file; \
done
+
+install-guide: cpio.guide
+ $(INSTALL_DATA) $? $(guidedir)/cpio.guide
+
+install-dvi: cpio.dvi
+ $(INSTALL_DATA) $? $(dvidir)/cpio.dvi
+
+install-ps: cpio.ps
+ $(INSTALL_DATA) $? $(psdir)/cpio.ps
uninstall:: uninstall-info
diff -rup --new-file baseline/fsf/cpio/Product-Info amiga/fsf/cpio/Product-Info
--- baseline/fsf/cpio/Product-Info Wed Dec 31 17:00:00 1969
+++ amiga/fsf/cpio/Product-Info Sat Sep 28 00:00:00 1996
@@ -0,0 +1,81 @@
+.name
+cpio
+.fullname
+GNU cp in/out program
+.type
+System Administration
+.short
+GNU utility to copy to/from archives.
+.description
+Cpio copies files into or out of a cpio or tar archive, which is a
+file that contains other files plus information about them, such as
+their pathname, owner, timestamps, and access permissions. The
+archive can be another file on the disk, a magnetic tape, or a pipe.
+Cpio has three operating modes. In copy-out mode, cpio copies files
+into an archive. It reads a list of filenames, one per line, on the
+standard input, and writes the archive onto the standard output. A
+typical way to generate the list of filenames is with the find
+command; you should give find the -depth option to minimize problems
+with permissions on directories that are unwritable or not searchable.
+
+In copy-in mode, cpio copies files out of an archive or lists the
+archive contents. It reads the archive from the standard input. Any
+non-option command line arguments are shell globbing patterns; only
+files in the archive whose names match one or more of those patterns
+are copied from the archive. Unlike in the shell, an initial `.' in a
+filename does match a wildcard at the start of a pattern, and a `/' in
+a filename can match wildcards. If no patterns are given, all files
+are extracted.
+
+In copy-pass mode, cpio copies files from one directory tree to
+another, combining the copy-out and copy-in steps without actually
+using an archive. It reads the list of files to copy from the
+standard input; the directory into which it will copy them is given as
+a non-option argument.
+
+Cpio supports the following archive formats: binary, old ASCII, new
+ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 tar.
+The binary format is obsolete because it encodes information about the
+files in a way that is not portable between different machine
+architectures. The old ASCII format is portable between different
+machine architectures, but should not be used on file systems with
+more than 65536 i-nodes. The new ASCII format is portable between
+different machine architectures and can be used on any size file
+system, but is not supported by all versions of cpio; currently, it is
+only supported by GNU and Unix System V R4. The crc format is like
+the new ASCII format, but also contains a checksum for each file which
+cpio calculates when creating an archive and verifies when the file is
+extracted from the archive. The HPUX formats are provided for
+compatibility with HPUX's cpio which stores device files differently.
+
+The tar format is provided for compatability with the tar program. It
+can not be used to archive files with names longer than 100
+characters, and can not be used to archive "special" (block or
+character devices) files. The POSIX.1 tar format can not be used to
+archive files with names longer than 255 characters (less unless they
+have a "/" in just the right place).
+
+By default, cpio creates binary format archives, for compatibility
+with older cpio programs. When extracting from archives, cpio
+automatically recognizes which kind of archive it is reading and can
+read archives created on machines with a different byte-order.
+
+Some of the options to cpio apply only to certain operating modes; see
+the SYNOPSIS section for a list of which options are allowed in which
+modes.
+.version
+2.4.2
+.author
+Phil Nelson
+David MacKenzie
+John Oleynick
+.email
+phil@cs.wwu.edu
+djm@gnu.ai.mit.edu
+juo@klinzhai.rutgers.edu
+.requirements
+The binary requires ixemul.library.
+.distribution
+GNU Public License
+.described-by
+Fred Fish (fnf@amigalib.com)
diff -rup --new-file baseline/fsf/cpio/configure amiga/fsf/cpio/configure
--- baseline/fsf/cpio/configure Wed Dec 20 09:34:04 1995
+++ amiga/fsf/cpio/configure Mon Sep 30 22:38:12 1996
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.7
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+# Generated automatically using autoconf version 2.10
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
@@ -44,6 +44,9 @@ libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
infodir='${prefix}/info'
+guidedir='${prefix}/guide'
+psdir='${prefix}/ps'
+dvidir='${prefix}/dvi'
mandir='${prefix}/man'
# Initialize some other variables.
@@ -158,6 +161,9 @@ Directory and file names:
--includedir=DIR C header files in DIR [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
--infodir=DIR info documentation in DIR [PREFIX/info]
+ --guidedir=DIR Amigaguide documentation in DIR [PREFIX/guide]
+ --psdir=DIR postscript documentation in DIR [PREFIX/ps]
+ --dvidir=DIR TeX dvi documentation in DIR [PREFIX/dvi]
--mandir=DIR man documentation in DIR [PREFIX/man]
--srcdir=DIR find the sources in DIR [configure dir or ..]
--program-prefix=PREFIX prepend PREFIX to installed program names
@@ -200,6 +206,18 @@ EOF
-infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
infodir="$ac_optarg" ;;
+ -guidedir | --guidedir | --guidedi | --guided | --guide | --gui)
+ ac_prev=guidedir ;;
+ -guidedir=* | --guidedir=* | --guidedi=* | --guided=* | --guide=* |--gui=*)+ guidedir="$ac_optarg" ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)+ psdir="$ac_optarg" ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* |--dv=*)+ dvidir="$ac_optarg" ;;
+
-libdir | --libdir | --libdi | --libd)
ac_prev=libdir ;;
-libdir=* | --libdir=* | --libdi=* | --libd=*)
@@ -330,7 +348,7 @@ EOF
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.7"
+ echo "configure generated by autoconf version 2.10"
exit 0 ;;
-with-* | --with-*)
@@ -495,12 +513,9 @@ fi
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='echo $CPP $CPPFLAGS 1>&5;
-$CPP $CPPFLAGS'
-ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5;
-${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
-ac_link='echo ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5;
-${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -534,7 +549,6 @@ else
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
fi
fi
CC="$ac_cv_prog_CC"
@@ -544,6 +558,55 @@ else
echo "$ac_t""no" 1>&6
fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ ac_prog_rejected=no
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# -gt 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ set dummy "$ac_dir/$ac_word" "$@"
+ shift
+ ac_cv_prog_CC="$@"
+ fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
@@ -554,7 +617,7 @@ else
yes;
#endif
EOF
-if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -581,9 +644,9 @@ fi
echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
if test $ac_cv_prog_gcc_g = yes; then
- CFLAGS="-g -O"
+ CFLAGS="-g -O2"
else
- CFLAGS="-O"
+ CFLAGS="-O2"
fi
fi
else
@@ -606,12 +669,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 610 "configure"
+#line 673 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -620,12 +684,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 624 "configure"
+#line 688 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -652,7 +717,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_g
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 656 "configure"
+#line 721 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -670,7 +735,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 674 "configure"
+#line 739 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -717,6 +782,7 @@ ac_configure=$ac_aux_dir/configure # Thi
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AmigaOS /c/install
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
@@ -729,7 +795,7 @@ else
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+ /|./|.//|/etc/*|/c/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
for ac_prog in ginstall installbsd scoinst install; do
@@ -771,7 +837,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
echo $ac_n "checking for AIX""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 775 "configure"
+#line 841 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -798,11 +864,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 802 "configure"
+#line 868 "configure"
#include "confdefs.h"
#include <minix/config.h>
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -862,7 +929,7 @@ if eval "test \"`echo '$''{'ac_cv_type_s
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 866 "configure"
+#line 933 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -880,7 +947,7 @@ int t() {
int i;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -902,15 +969,15 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 906 "configure"
+#line 973 "configure"
#include "confdefs.h"
#include <sys/types.h>
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
return makedev(0, 0);
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_types_h_makedev=yes
else
@@ -931,11 +998,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 935 "configure"
+#line 1002 "configure"
#include "confdefs.h"
#include <sys/mkdev.h>
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -965,11 +1033,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 969 "configure"
+#line 1037 "configure"
#include "confdefs.h"
#include <sys/sysmacros.h>
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1002,11 +1071,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1006 "configure"
+#line 1075 "configure"
#include "confdefs.h"
#include <sys/mtio.h>
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1026,12 +1096,13 @@ EOF
PROGS="$PROGS mt"
cat > conftest.$ac_ext <<EOF
-#line 1030 "configure"
+#line 1100 "configure"
#include "confdefs.h"
#include <sgtty.h>
#include <sys/socket.h>
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1056,11 +1127,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1060 "configure"
+#line 1131 "configure"
#include "confdefs.h"
#include <netdb.h>
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1087,13 +1159,19 @@ EOF
fi
fi
+# Amiga hack - force NO_REMOTE to be defined and override RTAPELIB to null
+RTAPELIB=
+cat >> confdefs.h <<\EOF
+#define NO_REMOTE 1
+EOF
+
echo $ac_n "checking for working const""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1097 "configure"
+#line 1175 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -1143,7 +1221,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1167,7 +1245,7 @@ if eval "test \"`echo '$''{'ac_cv_type_u
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1171 "configure"
+#line 1249 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -1204,11 +1282,11 @@ else
ac_cv_c_cross=yes
else
cat > conftest.$ac_ext <<EOF
-#line 1208 "configure"
+#line 1286 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-eval $ac_link
+{ (eval echo configure:1290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_c_cross=no
else
@@ -1226,14 +1304,15 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1230 "configure"
+#line 1308 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <float.h>
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1248,7 +1327,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1252 "configure"
+#line 1331 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1266,7 +1345,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1270 "configure"
+#line 1349 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1287,7 +1366,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1291 "configure"
+#line 1370 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1298,7 +1377,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
exit (0); }
EOF
-eval $ac_link
+{ (eval echo configure:1381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
@@ -1325,11 +1404,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1329 "configure"
+#line 1408 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1360,15 +1440,17 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1364 "configure"
+#line 1444 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1382,7 +1464,7 @@ $ac_func();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1405,7 +1487,7 @@ done
echo $ac_n "checking for utime.h""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1409 "configure"
+#line 1491 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <utime.h>
@@ -1414,7 +1496,7 @@ int t() {
struct utimbuf foo
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_UTIME_H 1
@@ -1433,14 +1515,14 @@ if test "$cross_compiling" = yes; then
have_fnmatch=no
else
cat > conftest.$ac_ext <<EOF
-#line 1437 "configure"
+#line 1519 "configure"
#include "confdefs.h"
main() {
if (fnmatch ("a*", "abc", 0) == 0) return 0;
else return 1; }
EOF
-eval $ac_link
+{ (eval echo configure:1526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
have_fnmatch=yes
else
@@ -1463,15 +1545,17 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1467 "configure"
+#line 1549 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1485,7 +1569,7 @@ $ac_func();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1512,15 +1596,17 @@ if eval "test \"`echo '$''{'ac_cv_func_v
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1516 "configure"
+#line 1600 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
char vprintf();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1534,7 +1620,7 @@ vprintf();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -1560,15 +1646,17 @@ if eval "test \"`echo '$''{'ac_cv_func__
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1564 "configure"
+#line 1650 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
char _doprnt();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1582,7 +1670,7 @@ _doprnt();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -1611,15 +1699,15 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1615 "configure"
+#line 1703 "configure"
#include "confdefs.h"
#include <alloca.h>
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -1643,7 +1731,7 @@ if eval "test \"`echo '$''{'ac_cv_func_a
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1647 "configure"
+#line 1735 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -1662,12 +1750,12 @@ char *alloca ();
# endif
#endif
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_func_alloca=yes
else
@@ -1702,7 +1790,7 @@ if eval "test \"`echo '$''{'ac_cv_os_cra
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1706 "configure"
+#line 1794 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -1731,15 +1819,17 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1735 "configure"
+#line 1823 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1753,7 +1843,7 @@ $ac_func();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1785,7 +1875,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 1789 "configure"
+#line 1879 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -1804,7 +1894,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-eval $ac_link
+{ (eval echo configure:1898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_c_stack_direction=1
else
@@ -1830,7 +1920,7 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1834 "configure"
+#line 1924 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -1839,7 +1929,7 @@ int t() {
DIR *dirp = 0;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -1863,22 +1953,26 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for -ldir""... $ac_c" 1>&6
-ac_lib_var=`echo dir | tr '.-/+' '___p'`
+ac_lib_var=`echo dir'_'opendir | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1874 "configure"
+#line 1964 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char opendir();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
opendir()
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1898,22 +1992,26 @@ fi
else
echo $ac_n "checking for -lx""... $ac_c" 1>&6
-ac_lib_var=`echo x | tr '.-/+' '___p'`
+ac_lib_var=`echo x'_'opendir | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1909 "configure"
+#line 2003 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char opendir();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
opendir()
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1934,22 +2032,26 @@ fi
fi
echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
-ac_lib_var=`echo nsl | tr '.-/+' '___p'`
+ac_lib_var=`echo nsl'_'gethostname | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1945 "configure"
+#line 2043 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char gethostname();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
gethostname()
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1968,22 +2070,26 @@ else
fi
echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
-ac_lib_var=`echo socket | tr '.-/+' '___p'`
+ac_lib_var=`echo socket'_'setsockopt | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1979 "configure"
+#line 2081 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char setsockopt();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
setsockopt()
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2054,7 +2160,7 @@ trap 'rm -f $CONFIG_STATUS conftest*; ex
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
s%\[%\\&%g
s%\]%\\&%g
@@ -2068,7 +2174,9 @@ rm -f conftest.defs
: ${CONFIG_STATUS=./config.status}
echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
+# Some systems, like AmigaOS, won't allow you to remove a script that is
+# being executed, so just move it out of the way instead.
+if test -f $CONFIG_STATUS; then mv $CONFIG_STATUS $CONFIG_STATUS.old; else true; fi
cat > $CONFIG_STATUS <<EOF
#! /bin/sh
# Generated automatically by configure.
@@ -2089,7 +2197,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.7"
+ echo "$CONFIG_STATUS generated by autoconf version 2.10"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -2129,6 +2237,9 @@ s%@libdir@%$libdir%g
s%@includedir@%$includedir%g
s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g
+s%@guidedir@%$guidedir%g
+s%@psdir@%$psdir%g
+s%@dvidir@%$dvidir%g
s%@mandir@%$mandir%g
s%@PROGS@%$PROGS%g
s%@CC@%$CC%g
@@ -2205,6 +2316,7 @@ rm -f conftest.subs
exit 0
EOF
chmod +x $CONFIG_STATUS
+rm -f CONFIG.STATUS.old
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
diff -rup --new-file baseline/fsf/cpio/configure.in amiga/fsf/cpio/configure.in
--- baseline/fsf/cpio/configure.in Wed Dec 20 09:28:29 1995
+++ amiga/fsf/cpio/configure.in Sat Sep 28 00:00:00 1996
@@ -27,6 +27,9 @@ else
AC_CHECK_HEADER(netdb.h, AC_DEFINE(HAVE_NETDB_H) RTAPELIB=rtapelib.o,
AC_DEFINE(NO_REMOTE))
fi
+# Amiga hack - force NO_REMOTE to be defined and override RTAPELIB to null
+RTAPELIB=
+AC_DEFINE(NO_REMOTE)
AC_SUBST(RTAPELIB)dnl
AC_C_CONST
diff -rup --new-file baseline/fsf/cpio/cpio.info amiga/fsf/cpio/cpio.info
--- baseline/fsf/cpio/cpio.info Wed Dec 20 09:35:51 1995
+++ amiga/fsf/cpio/cpio.info Wed Dec 31 17:00:00 1969
@@ -1,489 +0,0 @@
-This is Info file cpio.info, produced by Makeinfo-1.55 from the input
-file cpio.texi.
-
-START-INFO-DIR-ENTRY
-* cpio: (cpio). Making tape (or disk) archives.
-END-INFO-DIR-ENTRY
-
- This file documents GNU cpio 2.4.
-
- Copyright (C) 1995 Free Software Foundation, Inc.
-
- Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
- Permission is granted to copy and distribute modified versions of
-this manual under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
- Permission is granted to copy and distribute translations of this
-manual into another language, under the above conditions for modified
-versions, except that this permission notice may be stated in a
-translation approved by the Foundation.
-
-
-File: cpio.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
-
-
-
- GNU cpio is a tool for creating and extracting archives, or copying
-files from one place to another. It handles a number of cpio formats as
-well as reading and writing tar files. This is the first edition of the
-GNU cpio documentation and is consistant with GNU cpio 2.4.
-
-* Menu:
-
-* Introduction::
-* Tutorial:: Getting started.
-* Invoking `cpio':: How to invoke `cpio'.
-* Media:: Using tapes and other archive media.
-* Concept Index:: Concept index.
-
- -- The Detailed Node Listing --
-
-Invoking cpio
-
-* Copy-out mode::
-* Copy-in mode::
-* Copy-pass mode::
-* Options::
-
-
-File: cpio.info, Node: Introduction, Next: Tutorial, Prev: Top, Up: Top
-
-Introduction
-************
-
- GNU cpio copies files into or out of a cpio or tar archive, The
-archive can be another file on the disk, a magnetic tape, or a pipe.
-
- GNU cpio supports the following archive formats: binary, old ASCII,
-new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 tar.
-The tar format is provided for compatability with the tar program. By
-default, cpio creates binary format archives, for compatibility with
-older cpio programs. When extracting from archives, cpio automatically
-recognizes which kind of archive it is reading and can read archives
-created on machines with a different byte-order.
-
-
-File: cpio.info, Node: Tutorial, Next: Invoking `cpio', Prev: Introduction, Up: Top
-
-Tutorial
-********
-
- GNU cpio performs three primary functions. Copying files to an
-archive, Extracting files from an archive, and passing files to another
-directory tree. An archive can be a file on disk, one or more floppy
-disks, or one or more tapes.
-
- When creating an archive, cpio takes the list of files to be
-processed from the standard input, and then sends the archive to the
-standard output, or to the device defined by the `-F' option. *Note
-Copy-out mode::. Usually find or ls is used to provide this list to
-the standard input. In the following example you can see the
-possibilities for archiving the contents of a single directory.
-
- % ls | cpio -ov > directory.cpio
-
- The `-o' option creates the archive, and the `-v' option prints the
-names of the files archived as they are added. Notice that the options
-can be put together after a single `-' or can be placed separately on
-the command line. The `>' redirects the cpio output to the file
-`directory.cpio'.
-
- If you wanted to archive an entire directory tree, the find command
-can provide the file list to cpio:
-
- % find . -print -depth | cpio -ov > tree.cpio
-
- This will take all the files in the current directory, the
-directories below and place them in the archive tree.cpio. Again the
-`-o' creates an archive, and the `-v' option shows you the name of the
-files as they are archived. *Note Copy-out mode::. Using the `.' in
-the find statement will give you more flexibility when doing restores,
-as it will save file names with a relative path vice a hard wired,
-absolute path. The `-depth' option forces `find' to print of the
-entries in a directory before printing the directory itself. This
-limits the effects of restrictive directory permissions by printing the
-directory entries in a directory before the directory name itself.
-
- Extracting an archive requires a bit more thought because cpio will
-not create directories by default. Another characteristic, is it will
-not overwrite existing files unless you tell it to.
-
- % cpio -iv < directory.cpio
-
- This will retrieve the files archived in the file directory.cpio and
-place them in the present directory. The `-i' option extracts the
-archive and the `-v' shows the file names as they are extracted. If
-you are dealing with an archived directory tree, you need to use the
-`-d' option to create directories as necessary, something like:
-
- % cpio -idv < tree.cpio
-
- This will take the contents of the archive tree.cpio and extract it
-to the current directory. If you try to extract the files on top of
-files of the same name that already exist (and have the same or later
-modification time) cpio will not extract the file unless told to do so
-by the -u option. *Note Copy-in mode::.
-
- In copy-pass mode, cpio copies files from one directory tree to
-another, combining the copy-out and copy-in steps without actually
-using an archive. It reads the list of files to copy from the standard
-input; the directory into which it will copy them is given as a
-non-option argument. *Note Copy-pass mode::.
-
- % find . -depth -print0 | cpio --null -pvd new-dir
-
- The example shows copying the files of the present directory, and
-sub-directories to a new directory called new-dir. Some new options are
-the `-print0' available with GNU find, combined with the `--null'
-option of cpio. These two options act together to send file names
-between find and cpio, even if special characters are embedded in the
-file names. Another is `-p', which tells cpio to pass the files it
-finds to the directory `new-dir'.
-
-
-File: cpio.info, Node: Invoking `cpio', Next: Media, Prev: Tutorial, Up: Top
-
-Invoking cpio
-*************
-
-* Menu:
-
-* Copy-out mode::
-* Copy-in mode::
-* Copy-pass mode::
-* Options::
-
-
-File: cpio.info, Node: Copy-out mode, Next: Copy-in mode, Prev: Invoking `cpio', Up: Invoking `cpio'
-
-Copy-out mode
-=============
-
- In copy-out mode, cpio copies files into an archive. It reads a list
-of filenames, one per line, on the standard input, and writes the
-archive onto the standard output. A typical way to generate the list
-of filenames is with the find command; you should give find the -depth
-option to minimize problems with permissions on directories that are
-unreadable. *Note Options::.
-
- cpio {-o|--create} [-0acvABLV] [-C bytes] [-H format]
- [-M message] [-O [[user@]host:]archive] [-F [[user@]host:]archive]
- [--file=[[user@]host:]archive] [--format=format] [--sparse]
- [--message=message][--null] [--reset-access-time] [--verbose]
- [--dot] [--append] [--block-size=blocks] [--dereference]
- [--io-size=bytes] [--help] [--version] < name-list [> archive]
-
-
-File: cpio.info, Node: Copy-in mode, Next: Copy-pass mode, Prev: Copy-out mode, Up: Invoking `cpio'
-
-Copy-in mode
-============
-
- In copy-in mode, cpio copies files out of an archive or lists the
-archive contents. It reads the archive from the standard input. Any
-non-option command line arguments are shell globbing patterns; only
-files in the archive whose names match one or more of those patterns are
-copied from the archive. Unlike in the shell, an initial `.' in a
-filename does match a wildcard at the start of a pattern, and a `/' in a
-filename can match wildcards. If no patterns are given, all files are
-extracted. *Note Options::.
-
- cpio {-i|--extract} [-bcdfmnrtsuvBSV] [-C bytes] [-E file]
- [-H format] [-M message] [-R [user][:.][group]]
- [-I [[user@]host:]archive] [-F [[user@]host:]archive]
- [--file=[[user@]host:]archive] [--make-directories]
- [--nonmatching] [--preserve-modification-time]
- [--numeric-uid-gid] [--rename] [--list] [--swap-bytes] [--swap]
- [--dot] [--unconditional] [--verbose] [--block-size=blocks]
- [--swap-halfwords] [--io-size=bytes] [--pattern-file=file]
- [--format=format] [--owner=[user][:.][group]]
- [--no- preserve-owner] [--message=message] [--help] [--version]
- [-no-abosolute-filenames] [-only-verify-crc] [-quiet]
- [pattern...] [< archive]
-
-
-File: cpio.info, Node: Copy-pass mode, Next: Options, Prev: Copy-in mode, Up: Invoking `cpio'
-
-Copy-pass mode
-==============
-
- In copy-pass mode, cpio copies files from one directory tree to
-another, combining the copy-out and copy-in steps without actually
-using an archive. It reads the list of files to copy from the standard
-input; the directory into which it will copy them is given as a
-non-option argument. *Note Options::.
-
- cpio {-p|--pass-through} [-0adlmuvLV] [-R [user][:.][group]]
- [--null] [--reset-access-time] [--make-directories] [--link]
- [--preserve-modification-time] [--unconditional] [--verbose]
- [--dot] [--dereference] [--owner=[user][:.][group]] [--sparse]
- [--no-preserve-owner] [--help] [--version] destination-directory
- < name-list
-
-
-File: cpio.info, Node: Options, Prev: Copy-pass mode, Up: Invoking `cpio'
-
-Options
-=======
-
-`-0, --null'
- Read a list of filenames terminated by a null character, instead
- of a newline, so that files whose names contain newlines can be
- archived. GNU find is one way to produce a list of
- null-terminated filenames. This option may be used in copy-out
- and copy-pass modes.
-
-`-a, --reset-access-time'
- Reset the access times of files after reading them, so that it
- does not look like they have just been read.
-
-`-A, --append'
- Append to an existing archive. Only works in copy-out mode. The
- archive must be a disk file specified with the -O or -F (-file)
- option.
-
-`-b, --swap'
- Swap both halfwords of words and bytes of halfwords in the data.
- Equivalent to -sS. This option may be used in copy-in mode. Use
- this option to convert 32-bit integers between big-endian and
- little-endian machines.
-
-`-B'
- Set the I/O block size to 5120 bytes. Initially the block size is
- 512 bytes.
-
-`--block-size=BLOCK-SIZE'
- Set the I/O block size to BLOCK-SIZE * 512 bytes.
-
-`-c'
- Use the old portable (ASCII) archive format.
-
-`-C IO-SIZE, --io-size=IO-SIZE'
- Set the I/O block size to IO-SIZE bytes.
-
-`-d, --make-directories'
- Create leading directories where needed.
-
-`-E FILE, --pattern-file=FILE'
- Read additional patterns specifying filenames to extract or list
- from FILE. The lines of FILE are treated as if they had been
- non-option arguments to cpio. This option is used in copy-in mode,
-
-`-f, --nonmatching'
- Only copy files that do not match any of the given patterns.
-
-`-F, --file=archive'
- Archive filename to use instead of standard input or output. To
- use a tape drive on another machine as the archive, use a filename
- that starts with `HOSTNAME:'. The hostname can be preceded by a
- username and an `@' to access the remote tape drive as that user,
- if you have permission to do so (typically an entry in that user's
- `~/.rhosts' file).
-
-`--force-local'
- With -F, -I, or -O, take the archive file name to be a local file
- even if it contains a colon, which would ordinarily indicate a
- remote host name.
-
-`-H FORMAT, --format=FORMAT'
- Use archive format FORMAT. The valid formats are listed below;
- the same names are also recognized in all-caps. The default in
- copy-in mode is to automatically detect the archive format, and in
- copy-out mode is `bin'.
-
- `bin'
- The obsolete binary format.
-
- `odc'
- The old (POSIX.1) portable format.
-
- `newc'
- The new (SVR4) portable format, which supports file systems
- having more than 65536 i-nodes.
-
- `crc'
- The new (SVR4) portable format with a checksum added.
-
- `tar'
- The old tar format.
-
- `ustar'
- The POSIX.1 tar format. Also recognizes GNU tar archives,
- which are similar but not identical.
-
- `hpbin'
- The obsolete binary format used by HPUX's cpio (which stores
- device files differently).
-
- `hpodc'
- The portable format used by HPUX's cpio (which stores device
- files differently).
-
-`-i, --extract'
- Run in copy-in mode. *Note Copy-in mode::.
-
-`-I archive'
- Archive filename to use instead of standard input. To use a tape
- drive on another machine as the archive, use a filename that
- starts with `HOSTNAME:'. The hostname can be preceded by a
- username and an `@' to access the remote tape drive as that user,
- if you have permission to do so (typically an entry in that user's
- `~/.rhosts' file).
-
-`-k'
- Ignored; for compatibility with other versions of cpio.
-
-`-l, --link'
- Link files instead of copying them, when possible.
-
-`-L, --dereference'
- Copy the file that a symbolic link points to, rather than the
- symbolic link itself.
-
-`-m, --preserve-modification-time'
- Retain previous file modification times when creating files.
-
-`-M MESSAGE, --message=MESSAGE'
- Print MESSAGE when the end of a volume of the backup media (such
- as a tape or a floppy disk) is reached, to prompt the user to
- insert a new volume. If MESSAGE contains the string "%d", it is
- replaced by the current volume number (starting at 1).
-
-`-n, --numeric-uid-gid'
- Show numeric UID and GID instead of translating them into names
- when using the `--verbose option'.
-
-`--no-absolute-filenames'
- Create all files relative to the current directory in copy-in
- mode, even if they have an absolute file name in the archive.
-
-`--no-preserve-owner'
- Do not change the ownership of the files; leave them owned by the
- user extracting them. This is the default for non-root users, so
- that users on System V don't inadvertantly give away files. This
- option can be used in copy-in mode and copy-pass mode
-
-`-o, --create'
- Run in copy-out mode. *Note Copy-out mode::.
-
-`-O archive'
- Archive filename to use instead of standard output. To use a tape
- drive on another machine as the archive, use a filename that
- starts with `HOSTNAME:'. The hostname can be preceded by a
- username and an `@' to access the remote tape drive as that user,
- if you have permission to do so (typically an entry in that user's
- `~/.rhosts' file).
-
-`--only-verify-crc'
- Verify the CRC's of each file in the archive, when reading a CRC
- format archive. Don't actually extract the files.
-
-`-p, --pass-through'
- Run in copy-pass mode. *Note Copy-pass mode::.
-
-`--quiet'
- Do not print the number of blocks copied.
-
-`-r, --rename'
- Interactively rename files.
-
-`-R [user][:.][group], --owner [user][:.][group]'
- Set the ownership of all files created to the specified user and/or
- group in copy-out and copy-pass modes. Either the user, the
- group, or both, must be present. If the group is omitted but the
- ":" or "." separator is given, use the given user's login group.
- Only the super-user can change files' ownership.
-
-`-s, --swap-bytes'
- Swap the bytes of each halfword (pair of bytes) in the files.This
- option can be used in copy-in mode.
-
-`-S, --swap-halfwords'
- Swap the halfwords of each word (4 bytes) in the files. This
- option may be used in copy-in mode.
-
-`--sparse'
- Write files with large blocks of zeros as sparse files. This
- option is used in copy-out and copy-pass modes.
-
-`-t, --list'
- Print a table of contents of the input.
-
-`-u, --unconditional'
- Replace all files, without asking whether to replace existing
- newer files with older files.
-
-`-v, --verbose'
- List the files processed, or with `-t', give an `ls -l' style
- table of contents listing. In a verbose table of contents of a
- ustar archive, user and group names in the archive that do not
- exist on the local system are replaced by the names that
- correspond locally to the numeric UID and GID stored in the
- archive.
-
-`-V --dot'
- Print a `.' for each file processed.
-
-`--version'
- Print the cpio program version number and exit.
-
-
-File: cpio.info, Node: Media, Next: Concept Index, Prev: Invoking `cpio', Up: Top
-
-Magnetic Media
-**************
-
- Archives are usually written on removable media-tape cartridges, mag
-tapes, or floppy disks.
-
- The amount of data a tape or disk holds depends not only on its size,
-but also on how it is formatted. A 2400 foot long reel of mag tape
-holds 40 megabytes of data when formated at 1600 bits per inch. The
-physically smaller EXABYTE tape cartridge holds 2.3 gigabytes.
-
- Magnetic media are re-usable-once the archive on a tape is no longer
-needed, the archive can be erased and the tape or disk used over. Media
-quality does deteriorate with use, however. Most tapes or disks should
-be disgarded when they begin to produce data errors.
-
- Magnetic media are written and erased using magnetic fields, and
-should be protected from such fields to avoid damage to stored data.
-Sticking a floppy disk to a filing cabinet using a magnet is probably
-not a good idea.
-
-
-File: cpio.info, Node: Concept Index, Prev: Media, Up: Top
-
-Concept Index
-*************
-
-* Menu:
-
-* command line options: Invoking `cpio'.
-* copying directory structures: Tutorial.
-* creating a cpio archive: Tutorial.
-* extracting a cpio archive: Tutorial.
-* invoking cpio: Invoking `cpio'.
-* magnetic media: Media.
-* passing directory structures: Tutorial.
-
-
-
-Tag Table:
-Node: Top944
-Node: Introduction1664
-Node: Tutorial2379
-Node: Invoking `cpio'6051
-Node: Copy-out mode6240
-Node: Copy-in mode7151
-Node: Copy-pass mode8499
-Node: Options9295
-Node: Media16451
-Node: Concept Index17437
-
-End Tag Table
diff -rup --new-file baseline/fsf/cpio/main.c amiga/fsf/cpio/main.c
--- baseline/fsf/cpio/main.c Wed Nov 30 17:24:21 1994
+++ amiga/fsf/cpio/main.c Sat Sep 28 00:00:00 1996
@@ -492,7 +492,7 @@ initialize_buffers ()
bzero (zeros_512, 512);
}
-void
+int
main (argc, argv)
int argc;
char *argv[];
diff -rup --new-file baseline/fsf/cpio/manifests/bin amiga/fsf/cpio/manifests/bin
--- baseline/fsf/cpio/manifests/bin Wed Dec 31 17:00:00 1969
+++ amiga/fsf/cpio/manifests/bin Sat Sep 28 00:00:00 1996
@@ -0,0 +1,9 @@
+COPYING
+COPYING.info
+bin/cpio
+bin/mt
+guide/cpio.guide
+info/cpio.info
+libexec/rmt
+man/man1/cpio.1
+man/man1/mt.1
diff -rup --new-file baseline/fsf/cpio/manifests/src amiga/fsf/cpio/manifests/src
--- baseline/fsf/cpio/manifests/src Wed Dec 31 17:00:00 1969
+++ amiga/fsf/cpio/manifests/src Sat Sep 28 00:00:00 1996
@@ -0,0 +1,66 @@
+fsf/cpio/BeOS.diffs
+fsf/cpio/COPYING
+fsf/cpio/COPYING.LIB
+fsf/cpio/ChangeLog
+fsf/cpio/INSTALL
+fsf/cpio/Makefile.in
+fsf/cpio/NEWS
+fsf/cpio/Product-Info
+fsf/cpio/README
+fsf/cpio/alloca.c
+fsf/cpio/argmatch.c
+fsf/cpio/bcopy.c
+fsf/cpio/configure
+fsf/cpio/configure.in
+fsf/cpio/copyin.c
+fsf/cpio/copyout.c
+fsf/cpio/copypass.c
+fsf/cpio/cpio.1
+fsf/cpio/cpio.def
+fsf/cpio/cpio.h
+fsf/cpio/cpio.texi
+fsf/cpio/cpiohdr.h
+fsf/cpio/defer.c
+fsf/cpio/defer.h
+fsf/cpio/dirname.c
+fsf/cpio/dstring.c
+fsf/cpio/dstring.h
+fsf/cpio/error.c
+fsf/cpio/extern.h
+fsf/cpio/filemode.c
+fsf/cpio/filetypes.h
+fsf/cpio/fnmatch.c
+fsf/cpio/fnmatch.h
+fsf/cpio/getopt.c
+fsf/cpio/getopt.h
+fsf/cpio/getopt1.c
+fsf/cpio/global.c
+fsf/cpio/idcache.c
+fsf/cpio/install-sh
+fsf/cpio/main.c
+fsf/cpio/makefile.os2
+fsf/cpio/makefile.pc
+fsf/cpio/makepath.c
+fsf/cpio/manifests/bin
+fsf/cpio/manifests/src
+fsf/cpio/mkdir.c
+fsf/cpio/mkinstalldirs
+fsf/cpio/mt.1
+fsf/cpio/mt.c
+fsf/cpio/rmt.c
+fsf/cpio/rmt.h
+fsf/cpio/rtapelib.c
+fsf/cpio/safe-stat.h
+fsf/cpio/strdup.c
+fsf/cpio/stripslash.c
+fsf/cpio/system.h
+fsf/cpio/tar.c
+fsf/cpio/tar.h
+fsf/cpio/tarhdr.h
+fsf/cpio/tcexparg.c
+fsf/cpio/texinfo.tex
+fsf/cpio/userspec.c
+fsf/cpio/util.c
+fsf/cpio/version.c
+fsf/cpio/xmalloc.c
+fsf/cpio/xstrdup.c
diff -rup --new-file baseline/fsf/cpio/mt.1 amiga/fsf/cpio/mt.1
--- baseline/fsf/cpio/mt.1 Wed Nov 22 14:31:50 1995
+++ amiga/fsf/cpio/mt.1 Sat Sep 28 00:00:00 1996
@@ -16,7 +16,7 @@ which must be one of the tape operations
drive.
.PP
The default tape device to operate on is taken from the file
-.I /usr/include/sys/mtio.h
+.I /ade/include/sys/mtio.h
when
.B mt
is compiled. It can be overridden by giving a device file name in
diff -rup --new-file baseline/fsf/cpio/mt.c amiga/fsf/cpio/mt.c
--- baseline/fsf/cpio/mt.c Wed Nov 22 14:31:49 1995
+++ amiga/fsf/cpio/mt.c Sat Sep 28 00:00:00 1996
@@ -167,7 +167,7 @@ struct option longopts[] =
/* The name this program was run with. */
char *program_name;
-void
+int
main (argc, argv)
int argc;
char **argv;
diff -rup --new-file baseline/fsf/cpio/rtapelib.c amiga/fsf/cpio/rtapelib.c
--- baseline/fsf/cpio/rtapelib.c Wed Nov 30 15:59:40 1994
+++ amiga/fsf/cpio/rtapelib.c Sat Sep 28 00:00:00 1996
@@ -372,28 +372,20 @@ __rmt_open (path, oflag, mode, bias)
if (*login)
{
- execl ("/usr/ucb/rsh", "rsh", system, "-l", login,
+ execl ("/ade/bin/remsh", "remsh", system, "-l", login,
"/etc/rmt", (char *) 0);
- execl ("/usr/bin/remsh", "remsh", system, "-l", login,
+ execl ("/ade/bin/rsh", "rsh", system, "-l", login,
"/etc/rmt", (char *) 0);
- execl ("/usr/bin/rsh", "rsh", system, "-l", login,
- "/etc/rmt", (char *) 0);
- execl ("/usr/bsd/rsh", "rsh", system, "-l", login,
- "/etc/rmt", (char *) 0);
- execl ("/usr/bin/nsh", "nsh", system, "-l", login,
+ execl ("/ade/bin/nsh", "nsh", system, "-l", login,
"/etc/rmt", (char *) 0);
}
else
{
- execl ("/usr/ucb/rsh", "rsh", system,
- "/etc/rmt", (char *) 0);
- execl ("/usr/bin/remsh", "remsh", system,
- "/etc/rmt", (char *) 0);
- execl ("/usr/bin/rsh", "rsh", system,
+ execl ("/ade/bin/remsh", "remsh", system,
"/etc/rmt", (char *) 0);
- execl ("/usr/bsd/rsh", "rsh", system,
+ execl ("/ade/bin/rsh", "rsh", system,
"/etc/rmt", (char *) 0);
- execl ("/usr/bin/nsh", "nsh", system,
+ execl ("/ade/bin/nsh", "nsh", system,
"/etc/rmt", (char *) 0);
}