diff -rc fileutils-3.9-fsf/INSTALL fileutils-3.9-amiga/INSTALL *** fileutils-3.9-fsf/INSTALL Wed Sep 15 23:05:10 1993 --- fileutils-3.9-amiga/INSTALL Mon Feb 21 23:54:32 1994 *************** *** 35,42 **** where DIR is the directory that contains the source code. By default, `make install' will install the package's files in ! `/usr/local/bin', `/usr/local/man', etc. You can specify an ! installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PATH'. Alternately, you can do so by consistently giving a value for the `prefix' variable when you run `make', e.g., make prefix=/usr/gnu --- 35,42 ---- where DIR is the directory that contains the source code. By default, `make install' will install the package's files in ! `/gnu/bin', `/gnu/man', etc. You can specify an ! installation prefix other than `/gnu' by giving `configure' the option `--prefix=PATH'. Alternately, you can do so by consistently giving a value for the `prefix' variable when you run `make', e.g., make prefix=/usr/gnu diff -rc fileutils-3.9-fsf/Makefile.in fileutils-3.9-amiga/Makefile.in *** fileutils-3.9-fsf/Makefile.in Tue Oct 12 04:02:44 1993 --- fileutils-3.9-amiga/Makefile.in Mon Feb 21 23:54:20 1994 *************** *** 25,31 **** srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin libdir = $(exec_prefix)/lib --- 25,31 ---- srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /gnu exec_prefix = $(prefix) bindir = $(exec_prefix)/bin libdir = $(exec_prefix)/lib diff -rc fileutils-3.9-fsf/configure fileutils-3.9-amiga/configure *** fileutils-3.9-fsf/configure Wed Oct 13 21:55:55 1993 --- fileutils-3.9-amiga/configure Tue Feb 22 00:26:13 1994 *************** *** 101,107 **** srcdirdefaulted=yes # Try the directory containing this script, then `..'. prog=$0 ! confdir=`echo $prog|sed 's%/[^/][^/]*$%%'` test "X$confdir" = "X$prog" && confdir=. srcdir=$confdir if test ! -r $srcdir/$unique_file; then --- 101,107 ---- srcdirdefaulted=yes # Try the directory containing this script, then `..'. prog=$0 ! confdir=`echo $prog| sed 's|/$||' | sed 's|//|/|' | sed 's|/[^/]*$||'` test "X$confdir" = "X$prog" && confdir=. srcdir=$confdir if test ! -r $srcdir/$unique_file; then *************** *** 130,135 **** --- 130,137 ---- # We want these before the checks, so the checks can modify their values. + CFLAGS="-O2" #HACK (fnf) + LDFLAGS="" #HACK (fnf) test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1 test -z "$LDFLAGS" && LDFLAGS=-g *************** *** 349,355 **** echo checking for POSIXized ISC if test -d /etc/conf/kconfig.d && ! grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then ISC=1 # If later tests want to check for ISC. --- 351,357 ---- echo checking for POSIXized ISC if test -d /etc/conf/kconfig.d && ! grep _POSIX_VERSION /gnu/include/sys/unistd.h >/dev/null 2>&1 then ISC=1 # If later tests want to check for ISC. *************** *** 970,976 **** echo '#include "confdefs.h" #include ' > conftest.c eval "$CPP conftest.c > conftest.out 2>&1" ! if egrep "MOUNT_UFS" conftest.out >/dev/null 2>&1; then rm -rf conftest* { --- 972,978 ---- echo '#include "confdefs.h" #include ' > conftest.c eval "$CPP conftest.c > conftest.out 2>&1" ! if true; then rm -rf conftest* { *************** *** 2084,2090 **** echo checking for AFS ! test -d /afs && { test -n "$verbose" && \ echo " defining AFS" --- 2086,2092 ---- echo checking for AFS ! false && { test -n "$verbose" && \ echo " defining AFS" diff -rc fileutils-3.9-fsf/lib/Makefile.in fileutils-3.9-amiga/lib/Makefile.in *** fileutils-3.9-fsf/lib/Makefile.in Sat Oct 16 04:24:47 1993 --- fileutils-3.9-amiga/lib/Makefile.in Mon Feb 21 23:54:58 1994 *************** *** 27,33 **** CFLAGS = @CFLAGS@ YACC = @YACC@ ! prefix = /usr/local exec_prefix = $(prefix) libdir = $(exec_prefix)/lib --- 27,33 ---- CFLAGS = @CFLAGS@ YACC = @YACC@ ! prefix = /gnu exec_prefix = $(prefix) libdir = $(exec_prefix)/lib diff -rc fileutils-3.9-fsf/lib/backupfile.c fileutils-3.9-amiga/lib/backupfile.c *** fileutils-3.9-fsf/lib/backupfile.c Tue Oct 12 15:17:42 1993 --- fileutils-3.9-amiga/lib/backupfile.c Mon Feb 21 23:50:39 1994 *************** *** 100,106 **** --- 100,110 ---- /* The extension added to file names to produce a simple (as opposed to numbered) backup file name. */ + #ifdef AMIGA + char *simple_backup_suffix = "!"; + #else char *simple_backup_suffix = "~"; + #endif char *basename (); char *dirname (); *************** *** 125,131 **** --- 129,139 ---- if (backup_type == simple) return concat (file, simple_backup_suffix); + #ifdef AMIGA + base_versions = concat (basename (file), ".!"); + #else base_versions = concat (basename (file), ".~"); + #endif if (base_versions == 0) return 0; dir = dirname (file); *************** *** 191,197 **** --- 199,209 ---- backup_name = malloc (strlen (file) + 16); if (backup_name == 0) return 0; + #ifdef AMIGA + sprintf (backup_name, "%s.!%d!", file, version); + #else sprintf (backup_name, "%s.~%d~", file, version); + #endif return backup_name; } *************** *** 213,219 **** --- 225,235 ---- { for (p = &backup[base_length]; ISDIGIT (*p); ++p) version = version * 10 + *p - '0'; + #ifdef AMIGA + if (p[0] != '!' || p[1]) + #else if (p[0] != '~' || p[1]) + #endif version = 0; } return version; diff -rc fileutils-3.9-fsf/man/Makefile.in fileutils-3.9-amiga/man/Makefile.in *** fileutils-3.9-fsf/man/Makefile.in Fri Aug 13 21:49:02 1993 --- fileutils-3.9-amiga/man/Makefile.in Mon Feb 21 23:55:06 1994 *************** *** 20,26 **** srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /usr/local exec_prefix = $(prefix) mandir = $(prefix)/man/man1 manprefix = --- 20,26 ---- srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /gnu exec_prefix = $(prefix) mandir = $(prefix)/man/man1 manprefix = diff -rc fileutils-3.9-fsf/mkinstalldirs fileutils-3.9-amiga/mkinstalldirs *** fileutils-3.9-fsf/mkinstalldirs Fri Aug 13 15:07:14 1993 --- fileutils-3.9-amiga/mkinstalldirs Mon Feb 21 23:50:41 1994 *************** *** 30,35 **** --- 30,36 ---- done done + exit 0 exit $errstatus # eof diff -rc fileutils-3.9-fsf/src/Makefile.in fileutils-3.9-amiga/src/Makefile.in *** fileutils-3.9-fsf/src/Makefile.in Mon Oct 18 23:26:38 1993 --- fileutils-3.9-amiga/src/Makefile.in Mon Feb 21 23:55:16 1994 *************** *** 20,26 **** srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin binprefix = --- 20,26 ---- srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /gnu exec_prefix = $(prefix) bindir = $(exec_prefix)/bin binprefix = diff -rc fileutils-3.9-fsf/src/chgrp.c fileutils-3.9-amiga/src/chgrp.c *** fileutils-3.9-fsf/src/chgrp.c Mon Oct 18 23:35:03 1993 --- fileutils-3.9-amiga/src/chgrp.c Mon Feb 21 23:50:42 1994 *************** *** 101,107 **** {0, 0, 0, 0} }; - void main (argc, argv) int argc; char **argv; --- 101,106 ---- diff -rc fileutils-3.9-fsf/src/chmod.c fileutils-3.9-amiga/src/chmod.c *** fileutils-3.9-fsf/src/chmod.c Mon Oct 18 23:35:04 1993 --- fileutils-3.9-amiga/src/chmod.c Mon Feb 21 23:50:43 1994 *************** *** 90,96 **** /* Parse the ASCII mode given on the command line into a linked list of `struct mode_change' and apply that to each file argument. */ - void main (argc, argv) int argc; char **argv; --- 90,95 ---- diff -rc fileutils-3.9-fsf/src/chown.c fileutils-3.9-amiga/src/chown.c *** fileutils-3.9-fsf/src/chown.c Mon Oct 18 23:35:05 1993 --- fileutils-3.9-amiga/src/chown.c Mon Feb 21 23:50:44 1994 *************** *** 111,117 **** {0, 0, 0, 0} }; - void main (argc, argv) int argc; char **argv; --- 111,116 ---- diff -rc fileutils-3.9-fsf/src/cp.c fileutils-3.9-amiga/src/cp.c *** fileutils-3.9-fsf/src/cp.c Mon Oct 18 23:35:08 1993 --- fileutils-3.9-amiga/src/cp.c Mon Feb 21 23:50:45 1994 *************** *** 160,166 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char *argv[]; --- 160,165 ---- diff -rc fileutils-3.9-fsf/src/dd.c fileutils-3.9-amiga/src/dd.c *** fileutils-3.9-fsf/src/dd.c Mon Oct 18 23:35:09 1993 --- fileutils-3.9-amiga/src/dd.c Mon Feb 21 23:50:46 1994 *************** *** 333,339 **** {0, 0, 0, 0} }; - void main (argc, argv) int argc; char **argv; --- 333,338 ---- diff -rc fileutils-3.9-fsf/src/df.c fileutils-3.9-amiga/src/df.c *** fileutils-3.9-fsf/src/df.c Mon Oct 18 23:35:10 1993 --- fileutils-3.9-amiga/src/df.c Mon Feb 21 23:50:47 1994 *************** *** 138,144 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 138,143 ---- diff -rc fileutils-3.9-fsf/src/du.c fileutils-3.9-amiga/src/du.c *** fileutils-3.9-fsf/src/du.c Mon Oct 18 23:35:12 1993 --- fileutils-3.9-amiga/src/du.c Mon Feb 21 23:50:48 1994 *************** *** 223,229 **** exit (status); } - void main (argc, argv) int argc; char *argv[]; --- 223,228 ---- diff -rc fileutils-3.9-fsf/src/install.c fileutils-3.9-amiga/src/install.c *** fileutils-3.9-fsf/src/install.c Mon Oct 18 23:35:13 1993 --- fileutils-3.9-amiga/src/install.c Mon Feb 21 23:50:49 1994 *************** *** 162,168 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 162,167 ---- *************** *** 462,468 **** { int pid, status; ! pid = fork (); switch (pid) { case -1: --- 461,467 ---- { int pid, status; ! pid = vfork (); switch (pid) { case -1: diff -rc fileutils-3.9-fsf/src/ln.c fileutils-3.9-amiga/src/ln.c *** fileutils-3.9-fsf/src/ln.c Mon Oct 18 23:35:14 1993 --- fileutils-3.9-amiga/src/ln.c Mon Feb 21 23:50:49 1994 *************** *** 119,125 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 119,124 ---- diff -rc fileutils-3.9-fsf/src/ls.c fileutils-3.9-amiga/src/ls.c *** fileutils-3.9-fsf/src/ls.c Mon Oct 18 23:35:15 1993 --- fileutils-3.9-amiga/src/ls.c Mon Feb 21 23:50:51 1994 *************** *** 441,447 **** }; - void main (argc, argv) int argc; char **argv; --- 441,446 ---- *************** *** 704,711 **** --- 703,715 ---- break; case 'B': + #ifdef AMIGA + add_ignore_pattern ("*!"); + add_ignore_pattern (".*!"); + #else add_ignore_pattern ("*~"); add_ignore_pattern (".*~"); + #endif break; case 'C': diff -rc fileutils-3.9-fsf/src/mkdir.c fileutils-3.9-amiga/src/mkdir.c *** fileutils-3.9-fsf/src/mkdir.c Mon Oct 18 23:35:16 1993 --- fileutils-3.9-amiga/src/mkdir.c Mon Feb 21 23:50:51 1994 *************** *** 72,78 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 72,77 ---- diff -rc fileutils-3.9-fsf/src/mkfifo.c fileutils-3.9-amiga/src/mkfifo.c *** fileutils-3.9-fsf/src/mkfifo.c Mon Oct 18 23:35:17 1993 --- fileutils-3.9-amiga/src/mkfifo.c Mon Feb 21 23:50:52 1994 *************** *** 61,67 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 61,66 ---- diff -rc fileutils-3.9-fsf/src/mknod.c fileutils-3.9-amiga/src/mknod.c *** fileutils-3.9-fsf/src/mknod.c Mon Oct 18 23:35:18 1993 --- fileutils-3.9-amiga/src/mknod.c Mon Feb 21 23:50:53 1994 *************** *** 66,72 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 66,71 ---- diff -rc fileutils-3.9-fsf/src/mv.c fileutils-3.9-amiga/src/mv.c *** fileutils-3.9-fsf/src/mv.c Mon Oct 18 23:35:19 1993 --- fileutils-3.9-amiga/src/mv.c Mon Feb 21 23:50:54 1994 *************** *** 120,126 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 120,125 ---- diff -rc fileutils-3.9-fsf/src/mvdir.c fileutils-3.9-amiga/src/mvdir.c *** fileutils-3.9-fsf/src/mvdir.c Mon Oct 18 23:35:20 1993 --- fileutils-3.9-amiga/src/mvdir.c Mon Feb 21 23:50:54 1994 *************** *** 99,105 **** exit (status); } - void main (argc, argv) int argc; char **argv; --- 99,104 ---- diff -rc fileutils-3.9-fsf/src/rm.c fileutils-3.9-amiga/src/rm.c *** fileutils-3.9-fsf/src/rm.c Mon Oct 18 23:35:21 1993 --- fileutils-3.9-amiga/src/rm.c Mon Feb 21 23:50:55 1994 *************** *** 106,112 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 106,111 ---- diff -rc fileutils-3.9-fsf/src/rmdir.c fileutils-3.9-amiga/src/rmdir.c *** fileutils-3.9-fsf/src/rmdir.c Mon Oct 18 23:35:22 1993 --- fileutils-3.9-amiga/src/rmdir.c Mon Feb 21 23:50:56 1994 *************** *** 66,72 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 66,71 ---- diff -rc fileutils-3.9-fsf/src/touch.c fileutils-3.9-amiga/src/touch.c *** fileutils-3.9-fsf/src/touch.c Mon Oct 18 23:35:23 1993 --- fileutils-3.9-amiga/src/touch.c Mon Feb 21 23:50:57 1994 *************** *** 132,138 **** CH_ATIME, CH_ATIME, CH_ATIME, CH_MTIME, CH_MTIME }; - void main (argc, argv) int argc; char **argv; --- 132,137 ----