home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Geek Gadgets 1
/
ADE-1.bin
/
ade-dist
/
time-1.7-diffs.gz
/
time-1.7-diffs
Wrap
Text File
|
1996-10-13
|
38KB
|
1,229 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/time/Makefile.in amiga/fsf/time/Makefile.in
--- baseline/fsf/time/Makefile.in Thu Jul 11 14:07:03 1996
+++ amiga/fsf/time/Makefile.in Sat Sep 28 00:00:00 1996
@@ -25,6 +25,9 @@ infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
+guidedir = $(prefix)/guide
+dvidir = $(prefix)/dvi
+psdir = $(prefix)/ps
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -67,6 +70,7 @@ time_LDADD = $(LDADD)
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
+DVIPS = dvips
INFOS = time.info*
INFO_DEPS = time.info
DVIS = time.dvi
@@ -170,21 +174,39 @@ time.info: time.texi version.texi
.texi.info:
- $(MAKEINFO) -I$(srcdir) $< -o $(srcdir)/$@
+ $(MAKEINFO) -I$(srcdir) $< -o $@
.texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+.texi.guide:
+ $(MAKEINFO) -I$(srcdir) $< -o $@ --no-split --amiga
+
+.dvi.ps:
+ $(DVIPS) -o $@ $<
+
+install-dvi:
+ $(mkinstalldirs) $(dvidir)
+ $(INSTALL_DATA) time.dvi $(dvidir)/time.dvi
+
+install-guide:
+ $(mkinstalldirs) $(guidedir)
+ $(INSTALL_DATA) time.guide $(guidedir)/time.guide
+
+install-ps:
+ $(mkinstalldirs) $(psdir)
+ $(INSTALL_DATA) time.ps $(psdir)/time.ps
+
install-info: $(INFO_DEPS)
$(mkinstalldirs) $(infodir)
for file in $(INFO_DEPS); do \
- for ifile in `cd $(srcdir) && echo $$file*`; do \
- $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
+ for ifile in `echo $$file*`; do \
+ $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
done; \
done
uninstall-info:
- cd $(srcdir) && for file in *.info*; do \
+ for file in *.info*; do \
rm -f $(infodir)/$$file; \
done
@@ -261,20 +283,24 @@ info: $(INFO_DEPS)
dvi: $(DVIS)
+guide: time.guide
+
+ps: time.ps
+
check: all
installcheck:
install-exec: install-binPROGRAMS
-install-data: install-info
+install-data: install-info install-guide install-dvi install-ps
install: install-exec install-data all
@:
uninstall: uninstall-binPROGRAMS uninstall-info
-all: $(INFO_DEPS) $(PROGRAMS) Makefile
+all: $(INFO_DEPS) $(PROGRAMS) Makefile guide dvi ps
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
@@ -337,7 +363,7 @@ stamp-v: Makefile
fi
echo timestamp > $@
.SUFFIXES:
-.SUFFIXES: .c .o .texi .info .dvi
+.SUFFIXES: .c .o .texi .info .dvi .guide .ps
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -rup --new-file baseline/fsf/time/Product-Info amiga/fsf/time/Product-Info
--- baseline/fsf/time/Product-Info Wed Dec 31 17:00:00 1969
+++ amiga/fsf/time/Product-Info Sat Sep 28 00:00:00 1996
@@ -0,0 +1,33 @@
+.name
+time
+.fullname
+GNU time
+.type
+Miscellaneous
+.short
+GNU util to measure program resource use
+.description
+The `time' command runs another program, then displays information
+about the resources used by that program, collected by the system while
+the program was running. You can select which information is reported
+and the format in which it is shown, or have `time' save the information
+in a file instead of display it on the screen.
+
+The resources that `time' can report on fall into the general
+categories of time, memory, I/O, and IPC calls. Some systems do not
+provide much information about program resource use; `time' reports
+unavailable information as zero values.
+.version
+1.7
+.author
+David Keppel\n
+David MacKenzie
+.requirements
+Binary version requires ixemul.library.
+.distribution
+GNU Public License
+.email
+pardo@cs.washington.edu
+djm@gnu.ai.mit.edu
+.described-by
+Lars Hecking (lhecking@nmrc.ucc.ie)
diff -rup --new-file baseline/fsf/time/configure amiga/fsf/time/configure
--- baseline/fsf/time/configure Wed Jun 12 11:45:14 1996
+++ amiga/fsf/time/configure Thu Oct 3 12:23:43 1996
@@ -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=*)
@@ -623,7 +641,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:645: \"$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
@@ -650,9 +668,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
@@ -675,13 +693,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 679 "configure"
+#line 697 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -690,13 +708,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 694 "configure"
+#line 712 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -742,6 +760,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.
@@ -754,7 +773,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
@@ -804,11 +823,11 @@ else
ac_cv_c_cross=yes
else
cat > conftest.$ac_ext <<EOF
-#line 808 "configure"
+#line 827 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-{ (eval echo configure:812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:831: \"$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
@@ -826,7 +845,7 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 830 "configure"
+#line 849 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -834,7 +853,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -849,7 +868,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 853 "configure"
+#line 872 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -867,7 +886,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 871 "configure"
+#line 890 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -888,7 +907,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 892 "configure"
+#line 911 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -899,7 +918,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
exit (0); }
EOF
-{ (eval echo configure:903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
@@ -923,7 +942,7 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 927 "configure"
+#line 946 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -940,7 +959,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -967,12 +986,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 971 "configure"
+#line 990 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:995: \"$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,7 +1021,7 @@ if eval "test \"`echo '$''{'ac_cv_c_cons
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1006 "configure"
+#line 1025 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -1052,7 +1071,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:1056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1076,7 +1095,7 @@ if eval "test \"`echo '$''{'ac_cv_type_p
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1080 "configure"
+#line 1099 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1084,8 +1103,7 @@ else
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "
-pid_t^a-zA-Z_0-9 " >/dev/null 2>&1; then
+ egrep "pid_t" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_pid_t=yes
else
@@ -1108,7 +1126,7 @@ if eval "test \"`echo '$''{'ac_cv_type_s
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1112 "configure"
+#line 1130 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1116,8 +1134,7 @@ else
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "
-size_t^a-zA-Z_0-9 " >/dev/null 2>&1; then
+ egrep "size_t" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_size_t=yes
else
@@ -1140,7 +1157,7 @@ if eval "test \"`echo '$''{'ac_cv_type_s
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1144 "configure"
+#line 1161 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -1158,7 +1175,7 @@ int t() {
int i;
; return 0; }
EOF
-if { (eval echo configure:1162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -1178,7 +1195,7 @@ EOF
echo $ac_n "checking for struct timeval in sys/time.h""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1182 "configure"
+#line 1199 "configure"
#include "confdefs.h"
#include <sys/time.h>
EOF
@@ -1203,7 +1220,7 @@ if eval "test \"`echo '$''{'ac_cv_func_v
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1207 "configure"
+#line 1224 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -1213,7 +1230,7 @@ else
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
@@ -1227,7 +1244,7 @@ vprintf();
; return 0; }
EOF
-if { (eval echo configure:1231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -1253,7 +1270,7 @@ if eval "test \"`echo '$''{'ac_cv_func__
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1257 "configure"
+#line 1274 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -1263,7 +1280,7 @@ else
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
@@ -1277,7 +1294,7 @@ _doprnt();
; return 0; }
EOF
-if { (eval echo configure:1281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -1300,14 +1317,14 @@ fi
fi
echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_wait3'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_func_wait3_rsuage'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
- ac_cv_func_wait3=no
+ ac_cv_func_wait3_rsuage=no
else
cat > conftest.$ac_ext <<EOF
-#line 1311 "configure"
+#line 1328 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -1325,7 +1342,11 @@ main() {
r.ru_stime.tv_sec = 0;
r.ru_stime.tv_usec = 0;
r.ru_majflt = r.ru_minflt = 0;
+#ifdef __amigaos__
+ switch (vfork()) {
+#else
switch (fork()) {
+#endif
case 0: /* Child. */
sleep(1); /* Give up the CPU. */
_exit(0);
@@ -1338,18 +1359,18 @@ main() {
}
}
EOF
-{ (eval echo configure:1342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
- ac_cv_func_wait3=yes
+ ac_cv_func_wait3_rsuage=yes
else
- ac_cv_func_wait3=no
+ ac_cv_func_wait3_rsuage=no
fi
fi
rm -fr conftest*
fi
-echo "$ac_t""$ac_cv_func_wait3" 1>&6
-if test $ac_cv_func_wait3 = yes; then
+echo "$ac_t""$ac_cv_func_wait3_rsuage" 1>&6
+if test $ac_cv_func_wait3_rsuage = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_WAIT3 1
EOF
@@ -1363,7 +1384,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1367 "configure"
+#line 1388 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1373,7 +1394,7 @@ else
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
@@ -1387,7 +1408,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1412,15 +1433,15 @@ done
echo $ac_n "checking for getpagesize""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1416 "configure"
+#line 1437 "configure"
#include "confdefs.h"
#include <sys/param.h>
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
getpagesize();
; return 0; }
EOF
-if { (eval echo configure:1424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
have_gp=yes
else
@@ -1502,7 +1523,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.
@@ -1563,6 +1586,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%@VERSION@%$VERSION%g
s%@PACKAGE@%$PACKAGE%g
@@ -1636,6 +1662,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/time/error.c amiga/fsf/time/error.c
--- baseline/fsf/time/error.c Wed Jun 12 10:45:02 1996
+++ amiga/fsf/time/error.c Sat Sep 28 00:00:00 1996
@@ -23,6 +23,7 @@
#endif
#include <stdio.h>
+#include <string.h>
#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
# if __STDC__
diff -rup --new-file baseline/fsf/time/getopt.c amiga/fsf/time/getopt.c
--- baseline/fsf/time/getopt.c Thu Jul 11 09:34:52 1996
+++ amiga/fsf/time/getopt.c Sat Sep 28 00:00:00 1996
@@ -40,6 +40,7 @@
#endif
#include <stdio.h>
+#include <string.h>
/* Comment out all this code if we are using the GNU C Library, and are not
actually compiling the library itself. This code is part of the GNU C
diff -rup --new-file baseline/fsf/time/manifests/bin amiga/fsf/time/manifests/bin
--- baseline/fsf/time/manifests/bin Wed Dec 31 17:00:00 1969
+++ amiga/fsf/time/manifests/bin Sat Sep 28 00:00:00 1996
@@ -0,0 +1,7 @@
+COPYING
+COPYING.info
+bin/time
+dvi/time.dvi
+guide/time.guide
+info/time.info
+ps/time.ps
diff -rup --new-file baseline/fsf/time/manifests/src amiga/fsf/time/manifests/src
--- baseline/fsf/time/manifests/src Wed Dec 31 17:00:00 1969
+++ amiga/fsf/time/manifests/src Sat Sep 28 00:00:00 1996
@@ -0,0 +1,31 @@
+fsf/time/AUTHORS
+fsf/time/COPYING
+fsf/time/ChangeLog
+fsf/time/INSTALL
+fsf/time/Makefile.am
+fsf/time/Makefile.in
+fsf/time/NEWS
+fsf/time/Product-Info
+fsf/time/README
+fsf/time/configure
+fsf/time/configure.in
+fsf/time/error.c
+fsf/time/getopt.c
+fsf/time/getopt.h
+fsf/time/getopt1.c
+fsf/time/getpagesize.h
+fsf/time/install-sh
+fsf/time/manifests/bin
+fsf/time/manifests/src
+fsf/time/mdate-sh
+fsf/time/mkinstalldirs
+fsf/time/port.h
+fsf/time/resuse.c
+fsf/time/resuse.h
+fsf/time/stamp-vti
+fsf/time/texinfo.tex
+fsf/time/time.c
+fsf/time/time.texi
+fsf/time/version.c
+fsf/time/version.texi
+fsf/time/wait.h
diff -rup --new-file baseline/fsf/time/port.h amiga/fsf/time/port.h
--- baseline/fsf/time/port.h Tue Jun 11 15:24:57 1996
+++ amiga/fsf/time/port.h Sat Sep 28 00:00:00 1996
@@ -21,6 +21,10 @@
char *getenv PARAMS((const char *var));
PTR malloc PARAMS((size_t sz));
#endif
+/* shut up warning about LONG_MAX redefinition */
+#ifdef __amigaos__
+#include <machine/limits.h>
+#endif
#ifndef LONG_MAX
#define LONG_MAX (~(1 << (sizeof (long) * 8 - 1)))
#endif
diff -rup --new-file baseline/fsf/time/resuse.c amiga/fsf/time/resuse.c
--- baseline/fsf/time/resuse.c Thu Jun 13 12:37:43 1996
+++ amiga/fsf/time/resuse.c Sat Sep 28 00:00:00 1996
@@ -91,7 +91,7 @@ resuse_end (pid, resp)
long value;
struct tms tms;
- pid = wait (&status);
+ pid = wait ((int *)&status);
if (pid == -1)
return 0;
diff -rup --new-file baseline/fsf/time/time.c amiga/fsf/time/time.c
--- baseline/fsf/time/time.c Thu Jun 13 12:38:21 1996
+++ amiga/fsf/time/time.c Sat Sep 28 00:00:00 1996
@@ -604,7 +604,12 @@ run_command (cmd, resp)
resuse_start (resp);
+#ifndef __amigaos__
pid = fork (); /* Run CMD as child process. */
+#else
+ pid = vfork ();
+#endif
+
if (pid < 0)
error (1, errno, "cannot fork");
else if (pid == 0)
@@ -628,7 +633,7 @@ run_command (cmd, resp)
signal (SIGQUIT, quit_signal);
}
-void
+int
main (argc, argv)
int argc;
char **argv;
diff -rup --new-file baseline/fsf/time/time.info amiga/fsf/time/time.info
--- baseline/fsf/time/time.info Wed Jun 12 10:46:10 1996
+++ amiga/fsf/time/time.info Wed Dec 31 17:00:00 1969
@@ -1,478 +0,0 @@
-This is Info file ./time.info, produced by Makeinfo-1.55 from the input
-file time.texi.
-
- This file documents the the GNU `time' command for running programs
-and summarizing the system resources they use.
-
- Copyright (C) 1991, 92, 93, 96 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: time.info, Node: Top, Prev: (dir), Up: (dir)
-
- This file documents the the GNU `time' command for running programs
-and summarizing the system resources they use. This is edition 1.7,
-for version 1.7.
-
-* Menu:
-
-* Resource Measurement:: Measuring program resource use.
-
- -- The Detailed Node Listing --
-
-Measuring Program Resource Use
-
-* Setting Format:: Selecting the information reported by `time'.
-* Format String:: The information `time' can report.
-* Redirecting:: Writing the information to a file.
-* Examples:: Examples of using `time'.
-* Accuracy:: Limitations on the accuracy of `time' output.
-* Invoking time:: Summary of the options to the `time' command.
-
-The Format String
-
-* Time Resources::
-* Memory Resources::
-* I/O Resources::
-* Command Info::
-
-
-File: time.info, Node: Resource Measurement, Up: Top
-
-Measuring Program Resource Use
-******************************
-
- The `time' command runs another program, then displays information
-about the resources used by that program, collected by the system while
-the program was running. You can select which information is reported
-and the format in which it is shown (*note Setting Format::.), or have
-`time' save the information in a file instead of displaying it on the
-screen (*note Redirecting::.).
-
- The resources that `time' can report on fall into the general
-categories of time, memory, and I/O and IPC calls. Some systems do not
-provide much information about program resource use; `time' reports
-unavailable information as zero values (*note Accuracy::.).
-
- The format of the `time' command is:
-
- time [option...] COMMAND [ARG...]
-
- `time' runs the program COMMAND, with any given arguments ARG....
-When COMMAND finishes, `time' displays information about resources used
-by COMMAND.
-
- Here is an example of using `time' to measure the time and other
-resources used by running the program `grep':
-
- eg$ time grep nobody /etc/aliases
- nobody:/dev/null
- etc-files:nobody
- misc-group:nobody
- 0.07user 0.50system 0:06.69elapsed 8%CPU (0avgtext+489avgdata 324maxresident)k
- 46inputs+7outputs (43major+251minor)pagefaults 0swaps
-
- Mail suggestions and bug reports for GNU `time' to
-`bug-gnu-utils@prep.ai.mit.edu'. Please include the version of `time',
-which you can get by running `time --version', and the operating system
-and C compiler you used.
-
-* Menu:
-
-* Setting Format:: Selecting the information reported by `time'.
-* Format String:: The information `time' can report.
-* Redirecting:: Writing the information to a file.
-* Examples:: Examples of using `time'.
-* Accuracy:: Limitations on the accuracy of `time' output.
-* Invoking time:: Summary of the options to the `time' command.
-
-
-File: time.info, Node: Setting Format, Next: Format String, Up: Resource Measurement
-
-Setting the Output Format
-=========================
-
- `time' uses a "format string" to determine which information to
-display about the resources used by the command it runs. *Note Format
-String::, for the interpretation of the format string contents.
-
- You can specify a format string with the command line options listed
-below. If no format is specified on the command line, but the `TIME'
-environment variable is set, its value is used as the format string.
-Otherwise, the default format built into `time' is used:
-
- %Uuser %Ssystem %Eelapsed %PCPU (%Xtext+%Ddata %Mmax)k
- %Iinputs+%Ooutputs (%Fmajor+%Rminor)pagefaults %Wswaps
-
- The command line options to set the format are:
-
-`-f FORMAT'
-`--format=FORMAT'
- Use FORMAT as the format string.
-
-`-p'
-`--portability'
- Use the following format string, for conformance with POSIX
- standard 1003.2:
-
- real %e
- user %U
- sys %S
-
-`-v'
-`--verbose'
- Use the built-in verbose format, which displays each available
- piece of information on the program's resource use on its own
- line, with an English description of its meaning.
-
-
-File: time.info, Node: Format String, Next: Redirecting, Prev: Setting Format, Up: Resource Measurement
-
-The Format String
-=================
-
- The "format string" controls the contents of the `time' output. It
-consists of "resource specifiers" and "escapes", interspersed with
-plain text.
-
- A backslash introduces an "escape", which is translated into a
-single printing character upon output. The valid escapes are listed
-below. An invalid escape is output as a question mark followed by a
-backslash.
-
-`\t'
- a tab character
-
-`\n'
- a newline
-
-`\\'
- a literal backslash
-
- `time' always prints a newline after printing the resource use
-information, so normally format strings do not end with a newline
-character (or `\n').
-
- A resource specifier consists of a percent sign followed by another
-character. An invalid resource specifier is output as a question mark
-followed by the invalid character. Use `%%' to output a literal
-percent sign.
-
- The resource specifiers, which are a superset of those recognized by
-the `tcsh' builtin `time' command, are listed below. Not all resources
-are measured by all versions of Unix, so some of the values might be
-reported as zero (*note Accuracy::.).
-
-* Menu:
-
-* Time Resources::
-* Memory Resources::
-* I/O Resources::
-* Command Info::
-
-
-File: time.info, Node: Time Resources, Next: Memory Resources, Up: Format String
-
-Time Resources
---------------
-
-`E'
- Elapsed real (wall clock) time used by the process, in
- [hours:]minutes:seconds.
-
-`e'
- Elapsed real (wall clock) time used by the process, in seconds.
-
-`S'
- Total number of CPU-seconds used by the system on behalf of the
- process (in kernel mode), in seconds.
-
-`U'
- Total number of CPU-seconds that the process used directly (in user
- mode), in seconds.
-
-`P'
- Percentage of the CPU that this job got. This is just user +
- system times divied by the total running time.
-
-
-File: time.info, Node: Memory Resources, Next: I/O Resources, Prev: Time Resources, Up: Format String
-
-Memory Resources
-----------------
-
-`M'
- Maximum resident set size of the process during its lifetime, in
- Kilobytes.
-
-`t'
- Average resident set size of the process, in Kilobytes.
-
-`K'
- Average total (data+stack+text) memory use of the process, in
- Kilobytes.
-
-`D'
- Average size of the process's unshared data area, in Kilobytes.
-
-`p'
- Average size of the process's unshared stack, in Kilobytes.
-
-`X'
- Average size of the process's shared text, in Kilobytes.
-
-`Z'
- System's page size, in bytes. This is a per-system constant, but
- varies between systems.
-
-
-File: time.info, Node: I/O Resources, Next: Command Info, Prev: Memory Resources, Up: Format String
-
-I/O Resources
--------------
-
-`F'
- Number of major, or I/O-requiring, page faults that occurred while
- the process was running. These are faults where the page has
- actually migrated out of primary memory.
-
-`R'
- Number of minor, or recoverable, page faults. These are pages
- that are not valid (so they fault) but which have not yet been
- claimed by other virtual pages. Thus the data in the page is
- still valid but the system tables must be updated.
-
-`W'
- Number of times the process was swapped out of main memory.
-
-`c'
- Number of times the process was context-switched involuntarily
- (because the time slice expired).
-
-`w'
- Number of times that the program was context-switched voluntarily,
- for instance while waiting for an I/O operation to complete.
-
-`I'
- Number of file system inputs by the process.
-
-`O'
- Number of file system outputs by the process.
-
-`r'
- Number of socket messages received by the process.
-
-`s'
- Number of socket messages sent by the process.
-
-`k'
- Number of signals delivered to the process.
-
-
-File: time.info, Node: Command Info, Prev: I/O Resources, Up: Format String
-
-Command Info
-------------
-
-`C'
- Name and command line arguments of the command being timed.
-
-`x'
- Exit status of the command.
-
-
-File: time.info, Node: Redirecting, Next: Examples, Prev: Format String, Up: Resource Measurement
-
-Redirecting Output
-==================
-
- By default, `time' writes the resource use statistics to the
-standard error stream. The options below make it write the statistics
-to a file instead. Doing this can be useful if the program you're
-running writes to the standard error or you're running `time'
-noninteractively or in the background.
-
-`-o FILE'
-`--output=FILE'
- Write the resource use statistics to FILE. By default, this
- *overwrites* the file, destroying the file's previous contents.
-
-`-a'
-`--append'
- *Append* the resource use information to the output file instead
- of overwriting it. This option is only useful with the `-o' or
- `--output' option.
-
-
-File: time.info, Node: Examples, Next: Accuracy, Prev: Redirecting, Up: Resource Measurement
-
-Examples
-========
-
-Run the command `wc /etc/hosts' and show the default information:
-
- eg$ time wc /etc/hosts
- 35 111 1134 /etc/hosts
- 0.00user 0.01system 0:00.04elapsed 25%CPU (0avgtext+0avgdata 0maxresident)k
- 1inputs+1outputs (0major+0minor)pagefaults 0swaps
-
-Run the command `ls -Fs' and show just the user, system, and wall-clock
-time:
-
- eg$ time -f "\t%E real,\t%U user,\t%S sys" ls -Fs
- total 16
- 1 account/ 1 db/ 1 mail/ 1 run/
- 1 backups/ 1 emacs/ 1 msgs/ 1 rwho/
- 1 crash/ 1 games/ 1 preserve/ 1 spool/
- 1 cron/ 1 log/ 1 quotas/ 1 tmp/
- 0:00.03 real, 0.00 user, 0.01 sys
-
-Edit the file `.bashrc' and have `time' append the elapsed time and
-number of signals to the file `log', reading the format string from the
-environment variable `TIME':
-
- eg$ export TIME="\t%E,\t%k" # If using bash or ksh
- eg$ setenv TIME "\t%E,\t%k" # If using csh or tcsh
- eg$ time -a -o log emacs .bashrc
- eg$ cat log
- 0:16.55, 726
-
-Run the command `sleep 4' and show all of the information about it
-verbosely:
-
- eg$ time -v sleep 4
- Command being timed: "sleep 4"
- User time (seconds): 0.00
- System time (seconds): 0.05
- Percent of CPU this job got: 1%
- Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.26
- Average shared text size (kbytes): 36
- Average unshared data size (kbytes): 24
- Average stack size (kbytes): 0
- Average total size (kbytes): 60
- Maximum resident set size (kbytes): 32
- Average resident set size (kbytes): 24
- Major (requiring I/O) page faults: 3
- Minor (reclaiming a frame) page faults: 0
- Voluntary context switches: 11
- Involuntary context switches: 0
- Swaps: 0
- File system inputs: 3
- File system outputs: 1
- Socket messages sent: 0
- Socket messages received: 0
- Signals delivered: 1
- Page size (bytes): 4096
- Exit status: 0
-
-
-File: time.info, Node: Accuracy, Next: Invoking time, Prev: Examples, Up: Resource Measurement
-
-Accuracy
-========
-
- The elapsed time is not collected atomically with the execution of
-the program; as a result, in bizarre circumstances (if the `time'
-command gets stopped or swapped out in between when the program being
-timed exits and when `time' calculates how long it took to run), it
-could be much larger than the actual execution time.
-
- When the running time of a command is very nearly zero, some values
-(e.g., the percentage of CPU used) may be reported as either zero (which
-is wrong) or a question mark.
-
- Most information shown by `time' is derived from the `wait3' system
-call. The numbers are only as good as those returned by `wait3'. Many
-systems do not measure all of the resources that `time' can report on;
-those resources are reported as zero. The systems that measure most or
-all of the resources are based on 4.2 or 4.3BSD. Later BSD releases
-use different memory management code that measures fewer resources.
-
- On systems that do not have a `wait3' call that returns status
-information, the `times' system call is used instead. It provides much
-less information than `wait3', so on those systems `time' reports most
-of the resources as zero.
-
- The `%I' and `%O' values are allegedly only "real" input and output
-and do not include those supplied by caching devices. The meaning of
-"real" I/O reported by `%I' and `%O' may be muddled for workstations,
-especially diskless ones.
-
-
-File: time.info, Node: Invoking time, Prev: Accuracy, Up: Resource Measurement
-
-Running the `time' Command
-==========================
-
- The format of the `time' command is:
-
- time [option...] COMMAND [ARG...]
-
- `time' runs the program COMMAND, with any given arguments ARG....
-When COMMAND finishes, `time' displays information about resources used
-by COMMAND (on the standard error output, by default). If COMMAND
-exits with non-zero status or is terminated by a signal, `time'
-displays a warning message and the exit status or signal number.
-
- Options to `time' must appear on the command line before COMMAND.
-Anything on the command line after COMMAND is passed as arguments to
-COMMAND.
-
-`-o FILE'
-`--output=FILE'
- Write the resource use statistics to FILE.
-
-`-a'
-`--append'
- *Append* the resource use information to the output file instead
- of overwriting it.
-
-`-f FORMAT'
-`--format=FORMAT'
- Use FORMAT as the format string.
-
-`--help'
- Print a summary of the command line options to `time' and exit.
-
-`-p'
-`--portability'
- Use the POSIX format.
-
-`-v'
-`--verbose'
- Use the built-in verbose format.
-
-`-V'
-`--version'
- Print the version number of `time' and exit.
-
-
-
-Tag Table:
-Node: Top934
-Node: Resource Measurement1725
-Node: Setting Format3678
-Node: Format String4907
-Node: Time Resources6214
-Node: Memory Resources6844
-Node: I/O Resources7549
-Node: Command Info8747
-Node: Redirecting8964
-Node: Examples9754
-Node: Accuracy12064
-Node: Invoking time13586
-
-End Tag Table