home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Geek Gadgets 1
/
ADE-1.bin
/
ade-dist
/
less-321-diffs.gz
/
less-321-diffs
Wrap
Text File
|
1996-10-13
|
38KB
|
1,166 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/less/Product-Info amiga/fsf/less/Product-Info
--- baseline/fsf/less/Product-Info Wed Dec 31 17:00:00 1969
+++ amiga/fsf/less/Product-Info Sat Sep 28 00:00:00 1996
@@ -0,0 +1,29 @@
+.name
+less
+.type
+Programmer Tool
+.short
+Viewer program similar to 'more'.
+.description
+Less is a program similar to more (1), but which allows backward
+movement in the file as well as forward movement. Also, less does not
+have to read the entire input file before starting, so with large
+input files it starts up faster than text editors like vi (1). Less
+uses termcap (or terminfo on some systems), so it can run on a variety
+of terminals. There is even limited support for hardcopy terminals.
+(On a hardcopy terminal, lines which should be printed at the top of
+the screen are prefixed with a caret.)
+
+Commands are based on both more and vi. Commands may be preceded by a
+decimal number, called N in the descriptions below. The number is
+used by some commands, as indicated.
+.version
+321
+.author
+Mark Nudelman et al.
+.requirements
+Amiga binaries require ixemul.library.
+.distribution
+Freely distributable.
+.described-by
+Fred Fish (fnf@ninemoons.com)
diff -rup --new-file baseline/fsf/less/charset.c amiga/fsf/less/charset.c
--- baseline/fsf/less/charset.c Thu May 30 14:40:04 1996
+++ amiga/fsf/less/charset.c Sat Sep 28 00:00:00 1996
@@ -238,7 +238,11 @@ init_charset()
/*
* Default to "ascii".
*/
+#ifdef __amigaos__ /* Should be machine configurable? */
+ (void) icharset("latin1");
+#else
(void) icharset("ascii");
+#endif
#endif
}
diff -rup --new-file baseline/fsf/less/configure amiga/fsf/less/configure
--- baseline/fsf/less/configure Fri May 3 13:22:17 1996
+++ amiga/fsf/less/configure Mon Sep 30 22:46:45 1996
@@ -1,7 +1,7 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.9
+# 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
@@ -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.9"
+ echo "configure generated by autoconf version 2.10"
exit 0 ;;
-with-* | --with-*)
@@ -600,7 +618,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:604: \"$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:622: \"$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
@@ -627,9 +645,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
@@ -672,13 +690,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 676 "configure"
+#line 694 "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:682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -687,13 +705,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 691 "configure"
+#line 709 "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:697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -720,7 +738,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_g
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 724 "configure"
+#line 742 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -738,7 +756,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 742 "configure"
+#line 760 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -785,6 +803,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.
@@ -797,7 +816,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
@@ -840,24 +859,26 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
TERMLIBS=
echo $ac_n "checking for -lncurses""... $ac_c" 1>&6
-ac_lib_var=`echo ncurses_initscr | tr '.-/+' '___p'`
+ac_lib_var=`echo ncurses'_'initscr | 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="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 851 "configure"
+#line 870 "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 initscr();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
initscr()
; return 0; }
EOF
-if { (eval echo configure:861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -876,24 +897,26 @@ else
fi
echo $ac_n "checking for -lcurses""... $ac_c" 1>&6
-ac_lib_var=`echo curses_initscr | tr '.-/+' '___p'`
+ac_lib_var=`echo curses'_'initscr | 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="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 887 "configure"
+#line 908 "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 initscr();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
initscr()
; return 0; }
EOF
-if { (eval echo configure:897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -912,24 +935,26 @@ else
fi
echo $ac_n "checking for -ltermcap""... $ac_c" 1>&6
-ac_lib_var=`echo termcap_tgetent | tr '.-/+' '___p'`
+ac_lib_var=`echo termcap'_'tgetent | 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="-ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 923 "configure"
+#line 946 "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 tgetent();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -948,24 +973,26 @@ else
fi
echo $ac_n "checking for -ltermlib""... $ac_c" 1>&6
-ac_lib_var=`echo termlib_tgetent | tr '.-/+' '___p'`
+ac_lib_var=`echo termlib'_'tgetent | 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="-ltermlib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 959 "configure"
+#line 984 "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 tgetent();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -985,24 +1012,26 @@ have_termlib=no
fi
echo $ac_n "checking for -lgen""... $ac_c" 1>&6
-ac_lib_var=`echo gen_regcmp | tr '.-/+' '___p'`
+ac_lib_var=`echo gen'_'regcmp | 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="-lgen $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 996 "configure"
+#line 1023 "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 regcmp();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
regcmp()
; return 0; }
EOF
-if { (eval echo configure:1006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1015,7 +1044,7 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo gen | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ ac_tr_lib=HAVE_LIB`echo gen | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
@@ -1027,24 +1056,26 @@ else
fi
echo $ac_n "checking for -lintl""... $ac_c" 1>&6
-ac_lib_var=`echo intl_regcmp | tr '.-/+' '___p'`
+ac_lib_var=`echo intl'_'regcmp | 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="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1038 "configure"
+#line 1067 "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 regcmp();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
regcmp()
; return 0; }
EOF
-if { (eval echo configure:1048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1057,7 +1088,7 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo intl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ ac_tr_lib=HAVE_LIB`echo intl | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
@@ -1069,24 +1100,26 @@ else
fi
echo $ac_n "checking for -lPW""... $ac_c" 1>&6
-ac_lib_var=`echo PW_regcmp | tr '.-/+' '___p'`
+ac_lib_var=`echo PW'_'regcmp | 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="-lPW $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1080 "configure"
+#line 1111 "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 regcmp();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
regcmp()
; return 0; }
EOF
-if { (eval echo configure:1090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1099,7 +1132,7 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo PW | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ ac_tr_lib=HAVE_LIB`echo PW | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
@@ -1115,15 +1148,15 @@ echo $ac_n "checking for working termina
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
cat > conftest.$ac_ext <<EOF
-#line 1119 "configure"
+#line 1152 "configure"
#include "confdefs.h"
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
tgetent(0); tgetflag(0); tgetnum(0); tgetstr(0);
; return 0; }
EOF
-if { (eval echo configure:1127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
termok=yes
else
@@ -1154,11 +1187,11 @@ else
ac_cv_c_cross=yes
else
cat > conftest.$ac_ext <<EOF
-#line 1158 "configure"
+#line 1191 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-{ (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1195: \"$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
@@ -1176,7 +1209,7 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1180 "configure"
+#line 1213 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1184,7 +1217,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1199,7 +1232,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 1203 "configure"
+#line 1236 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1217,7 +1250,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 1221 "configure"
+#line 1254 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1238,7 +1271,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1242 "configure"
+#line 1275 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1249,7 +1282,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
exit (0); }
EOF
-{ (eval echo configure:1253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
@@ -1276,12 +1309,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1280 "configure"
+#line 1313 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1311,7 +1344,7 @@ if eval "test \"`echo '$''{'ac_cv_type_o
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1315 "configure"
+#line 1348 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1339,7 +1372,7 @@ fi
echo $ac_n "checking for void""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1343 "configure"
+#line 1376 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -1347,7 +1380,7 @@ int t() {
void *foo = 0;
; return 0; }
EOF
-if { (eval echo configure:1351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1384: \"$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_VOID 1
@@ -1361,7 +1394,7 @@ rm -f conftest*
echo $ac_n "checking for const""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1365 "configure"
+#line 1398 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -1369,7 +1402,7 @@ int t() {
const int foo = 0;
; return 0; }
EOF
-if { (eval echo configure:1373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1406: \"$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_CONST 1
@@ -1383,7 +1416,7 @@ rm -f conftest*
echo $ac_n "checking for time_t""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1387 "configure"
+#line 1420 "configure"
#include "confdefs.h"
#include <time.h>
int main() { return 0; }
@@ -1391,7 +1424,7 @@ int t() {
time_t t = 0;
; return 0; }
EOF
-if { (eval echo configure:1395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1428: \"$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_TIME_T 1
@@ -1409,7 +1442,7 @@ if eval "test \"`echo '$''{'ac_cv_type_s
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1413 "configure"
+#line 1446 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -1427,7 +1460,7 @@ int t() {
int i;
; return 0; }
EOF
-if { (eval echo configure:1431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -1451,15 +1484,17 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1455 "configure"
+#line 1488 "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
@@ -1473,7 +1508,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1501,15 +1536,17 @@ if eval "test \"`echo '$''{'ac_cv_func_t
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1505 "configure"
+#line 1540 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char tcgetattr(); 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 tcgetattr();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1523,7 +1560,7 @@ tcgetattr();
; return 0; }
EOF
-if { (eval echo configure:1527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_tcgetattr=yes"
else
@@ -1546,18 +1583,18 @@ fi
echo $ac_n "checking for fileno""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1550 "configure"
+#line 1587 "configure"
#include "confdefs.h"
#if HAVE_STDIO_H
#include <stdio.h>
#endif
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
static int x; x = fileno(stdin);
; return 0; }
EOF
-if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_FILENO 1
@@ -1572,7 +1609,7 @@ rm -f conftest*
echo $ac_n "checking for strerror""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1576 "configure"
+#line 1613 "configure"
#include "confdefs.h"
#if HAVE_STDIO_H
@@ -1584,12 +1621,12 @@ cat > conftest.$ac_ext <<EOF
#if HAVE_ERRNO_H
#include <errno.h>
#endif
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
static char *x; x = strerror(0);
; return 0; }
EOF
-if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_STRERROR 1
@@ -1604,15 +1641,15 @@ rm -f conftest*
echo $ac_n "checking for sys_errlist""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1608 "configure"
+#line 1645 "configure"
#include "confdefs.h"
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
extern char *sys_errlist[]; static char **x; x = sys_errlist;
; return 0; }
EOF
-if { (eval echo configure:1616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_SYS_ERRLIST 1
@@ -1628,18 +1665,18 @@ rm -f conftest*
have_errno=no
echo $ac_n "checking for errno""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1632 "configure"
+#line 1669 "configure"
#include "confdefs.h"
#if HAVE_ERRNO_H
#include <errno.h>
#endif
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
static int x; x = errno;
; return 0; }
EOF
-if { (eval echo configure:1643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes - in errno.h" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_ERRNO 1
@@ -1650,18 +1687,18 @@ rm -f conftest*
if test $have_errno = no; then
cat > conftest.$ac_ext <<EOF
-#line 1654 "configure"
+#line 1691 "configure"
#include "confdefs.h"
#if HAVE_ERRNO_H
#include <errno.h>
#endif
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
extern int errno; static int x; x = errno;
; return 0; }
EOF
-if { (eval echo configure:1665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes - must define" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_ERRNO 1
@@ -1680,16 +1717,16 @@ fi
echo $ac_n "checking for locale""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1684 "configure"
+#line 1721 "configure"
#include "confdefs.h"
#include <locale.h>
#include <ctype.h>
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);
; return 0; }
EOF
-if { (eval echo configure:1693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_LOCALE 1
@@ -1703,18 +1740,18 @@ rm -f conftest*
echo $ac_n "checking for ctype functions""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1707 "configure"
+#line 1744 "configure"
#include "confdefs.h"
#if HAVE_CTYPE_H
#include <ctype.h>
#endif
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
static int x; x = isupper(x); x = tolower(x); x = toupper(x);
; return 0; }
EOF
-if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_UPPER_LOWER 1
@@ -1730,7 +1767,7 @@ rm -f conftest*
have_ospeed=no
echo $ac_n "checking termcap for ospeed""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1734 "configure"
+#line 1771 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1740,12 +1777,12 @@ cat > conftest.$ac_ext <<EOF
#if HAVE_TERMCAP_H
#include <termcap.h>
#endif
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
ospeed = 0;
; return 0; }
EOF
-if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes - in termcap.h" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_OSPEED 1
@@ -1756,15 +1793,15 @@ rm -f conftest*
if test $have_ospeed = no; then
cat > conftest.$ac_ext <<EOF
-#line 1760 "configure"
+#line 1797 "configure"
#include "confdefs.h"
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
extern short ospeed; ospeed = 0;
; return 0; }
EOF
-if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes - must define" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_OSPEED 1
@@ -1788,7 +1825,7 @@ if test "$cross_compiling" = yes; then
have_posix_regex=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 1792 "configure"
+#line 1829 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -1798,7 +1835,7 @@ if (regcomp(&r, "abc", 0)) exit(1);
if (regexec(&r, "xabcy", 1, &rm, 0)) exit(1);
exit(0); }
EOF
-{ (eval echo configure:1802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
have_posix_regex=yes
else
@@ -1815,17 +1852,17 @@ EOF
have_regex=yes
elif test $have_posix_regex = unknown; then
cat > conftest.$ac_ext <<EOF
-#line 1819 "configure"
+#line 1856 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <regex.h>
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
regex_t *r; regfree(r);
; return 0; }
EOF
-if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""using POSIX regcomp" 1>&6
cat >> confdefs.h <<\EOF
@@ -1842,15 +1879,17 @@ if eval "test \"`echo '$''{'ac_cv_func_r
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1846 "configure"
+#line 1883 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char regcmp(); 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 regcmp();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1864,7 +1903,7 @@ regcmp();
; return 0; }
EOF
-if { (eval echo configure:1868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_regcmp=yes"
else
@@ -1887,16 +1926,16 @@ fi
fi
if test $have_regex = no; then
cat > conftest.$ac_ext <<EOF
-#line 1891 "configure"
+#line 1930 "configure"
#include "confdefs.h"
#include "regexp.h"
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
regcomp("");
; return 0; }
EOF
-if { (eval echo configure:1900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""using V8 regcomp" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_V8_REGCOMP 1
@@ -1924,15 +1963,17 @@ if eval "test \"`echo '$''{'ac_cv_func_r
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1928 "configure"
+#line 1967 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char re_comp(); 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 re_comp();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1946,7 +1987,7 @@ re_comp();
; return 0; }
EOF
-if { (eval echo configure:1950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_re_comp=yes"
else
@@ -2029,7 +2070,9 @@ DEFS=-DHAVE_CONFIG_H
: ${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.
@@ -2050,7 +2093,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.9"
+ echo "$CONFIG_STATUS generated by autoconf version 2.10"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -2090,6 +2133,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%@CC@%$CC%g
s%@CPP@%$CPP%g
@@ -2248,6 +2294,12 @@ cat >> $CONFIG_STATUS <<\EOF
echo "$ac_file is unchanged"
rm -f conftest.h
else
+ # Remove last slash and all that follows it. Not all systems have dirname.
+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+ # The file is in a subdirectory.
+ test ! -d "$ac_dir" && mkdir "$ac_dir"
+ fi
rm -f $ac_file
mv conftest.h $ac_file
fi
@@ -2258,6 +2310,7 @@ fi; done
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/less/less.h amiga/fsf/less/less.h
--- baseline/fsf/less/less.h Tue Jul 16 14:59:34 1996
+++ amiga/fsf/less/less.h Sat Sep 28 00:00:00 1996
@@ -176,7 +176,11 @@ typedef long POSITION;
#if MSDOS_COMPILER || OS2
#define OPEN_TTYIN() open("CON", OPEN_READ)
#else
+#ifdef __amigaos__
+#define OPEN_TTYIN() 2 /* FIXME: should be something like open("con:", OPEN_READ) */
+#else
#define OPEN_TTYIN() open("/dev/tty", OPEN_READ)
+#endif
#endif
#if MSDOS_COMPILER || OS2 || _OSK
diff -rup --new-file baseline/fsf/less/manifests/bin amiga/fsf/less/manifests/bin
--- baseline/fsf/less/manifests/bin Wed Dec 31 17:00:00 1969
+++ amiga/fsf/less/manifests/bin Sat Sep 28 00:00:00 1996
@@ -0,0 +1,6 @@
+COPYING
+COPYING.info
+bin/less
+bin/lesskey
+man/man1/less.1
+man/man1/lesskey.1
diff -rup --new-file baseline/fsf/less/manifests/src amiga/fsf/less/manifests/src
--- baseline/fsf/less/manifests/src Wed Dec 31 17:00:00 1969
+++ amiga/fsf/less/manifests/src Sat Sep 28 00:00:00 1996
@@ -0,0 +1,72 @@
+fsf/less/INSTALL
+fsf/less/Makefile.aut
+fsf/less/Makefile.bcc
+fsf/less/Makefile.dos
+fsf/less/Makefile.in
+fsf/less/Makefile.o9c
+fsf/less/Makefile.o9u
+fsf/less/Makefile.os2
+fsf/less/Makefile.w32
+fsf/less/NEWS
+fsf/less/Product-Info
+fsf/less/README
+fsf/less/acconfig.h
+fsf/less/brac.c
+fsf/less/ch.c
+fsf/less/charset.c
+fsf/less/cmd.h
+fsf/less/cmdbuf.c
+fsf/less/command.c
+fsf/less/configure
+fsf/less/configure.in
+fsf/less/decode.c
+fsf/less/defines.dos
+fsf/less/defines.h.in
+fsf/less/defines.h.top
+fsf/less/defines.o9
+fsf/less/defines.os2
+fsf/less/defines.w32
+fsf/less/edit.c
+fsf/less/filename.c
+fsf/less/forwback.c
+fsf/less/funcs.h
+fsf/less/help.c
+fsf/less/ifile.c
+fsf/less/input.c
+fsf/less/install.sh
+fsf/less/jump.c
+fsf/less/less.h
+fsf/less/less.hlp
+fsf/less/less.man
+fsf/less/less.nro
+fsf/less/lesskey.c
+fsf/less/lesskey.h
+fsf/less/lesskey.man
+fsf/less/lesskey.nro
+fsf/less/line.c
+fsf/less/linenum.c
+fsf/less/lsystem.c
+fsf/less/main.c
+fsf/less/manifests/bin
+fsf/less/manifests/src
+fsf/less/mark.c
+fsf/less/mkfuncs.awk
+fsf/less/mkhelp.c
+fsf/less/mkinstalldirs
+fsf/less/optfunc.c
+fsf/less/option.c
+fsf/less/option.h
+fsf/less/opttbl.c
+fsf/less/os.c
+fsf/less/output.c
+fsf/less/position.c
+fsf/less/position.h
+fsf/less/prompt.c
+fsf/less/regexp.c
+fsf/less/regexp.h
+fsf/less/screen.c
+fsf/less/search.c
+fsf/less/signal.c
+fsf/less/tags.c
+fsf/less/ttyin.c
+fsf/less/version.c
diff -rup --new-file baseline/fsf/less/os.c amiga/fsf/less/os.c
--- baseline/fsf/less/os.c Mon Jun 10 10:01:43 1996
+++ amiga/fsf/less/os.c Sat Sep 28 00:00:00 1996
@@ -187,6 +187,7 @@ errno_message(filename)
#if MUST_DEFINE_ERRNO
extern int errno;
#endif
+ extern char *strerror (int); /* FIXME - use MUST_DEFINE_STRERROR? */
p = strerror(errno);
#else
p = "cannot open";