home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Geek Gadgets 1
/
ADE-1.bin
/
ade-dist
/
id-utils-3.2-diffs.gz
/
id-utils-3.2-diffs
Wrap
Text File
|
1996-10-13
|
125KB
|
3,597 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/id-utils/ChangeLog amiga/fsf/id-utils/ChangeLog
--- baseline/fsf/id-utils/ChangeLog Tue Aug 6 20:22:56 1996
+++ amiga/fsf/id-utils/ChangeLog Sat Sep 28 00:00:00 1996
@@ -1,3 +1,11 @@
+Thu Sep 5 12:34:58 1996 Fred Fish <fnf@ninemoons.com>
+
+ * configure.in: Add check for sbrk() function.
+ * config.h.in: Regenerate using autoheader.
+ * configure: Regenerate using autoconf.
+ * src/mkid.c: Use HAVE_SBRK to conditionalize code that uses the
+ non-portable sbrk() call.
+
Tue Aug 6 22:46:16 1996 Greg McGary <gkm@g2>
* Version 3.2 released
diff -rup --new-file baseline/fsf/id-utils/Product-Info amiga/fsf/id-utils/Product-Info
--- baseline/fsf/id-utils/Product-Info Wed Dec 31 17:00:00 1969
+++ amiga/fsf/id-utils/Product-Info Sat Sep 28 00:00:00 1996
@@ -0,0 +1,22 @@
+.name
+id-utils
+.type
+Programmer Tool
+.short
+identifier database tool
+.description
+`mkid' is a simple, fast, high-capacity, language-independent identifier
+database tool. Actually, the term `identifier' is too limiting--`mkid'
+stores tokens, be they program identifiers of any form, literal numbers, or
+words of human-readable text. Database queries can be issued from the
+command-line, or from within emacs, serving as an augmented tags facility.
+.version
+3.2
+.author
+Various
+.requirements
+Amiga binary requires ixemul.library.
+.distribution
+GNU Public License
+.described-by
+Fred Fish (fnf@ninemoons.com)
diff -rup --new-file baseline/fsf/id-utils/config.h.in amiga/fsf/id-utils/config.h.in
--- baseline/fsf/id-utils/config.h.in Tue Aug 6 20:06:38 1996
+++ amiga/fsf/id-utils/config.h.in Sat Sep 28 00:00:00 1996
@@ -165,6 +165,9 @@
/* Define if you have the putenv function. */
#undef HAVE_PUTENV
+/* Define if you have the sbrk function. */
+#undef HAVE_SBRK
+
/* Define if you have the setenv function. */
#undef HAVE_SETENV
diff -rup --new-file baseline/fsf/id-utils/configure amiga/fsf/id-utils/configure
--- baseline/fsf/id-utils/configure Tue Aug 6 20:16:35 1996
+++ amiga/fsf/id-utils/configure Mon Sep 30 22:45:58 1996
@@ -55,6 +55,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.
@@ -169,6 +172,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
@@ -211,6 +217,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=*)
@@ -688,7 +706,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:692: \"$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:710: \"$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
@@ -715,9 +733,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
@@ -771,6 +789,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.
@@ -783,7 +802,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
@@ -867,13 +886,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 871 "configure"
+#line 890 "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:877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -882,13 +901,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 886 "configure"
+#line 905 "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:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -915,7 +934,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_g
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 919 "configure"
+#line 938 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -933,7 +952,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 937 "configure"
+#line 956 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -984,7 +1003,7 @@ fi
echo $ac_n "checking for AIX""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 988 "configure"
+#line 1007 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -1011,12 +1030,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1015 "configure"
+#line 1034 "configure"
#include "confdefs.h"
#include <minix/config.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1090,7 +1109,7 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1094 "configure"
+#line 1113 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -1099,7 +1118,7 @@ int t() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:1103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -1130,19 +1149,19 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1134 "configure"
+#line 1153 "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 echo configure:1146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1169,19 +1188,19 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1173 "configure"
+#line 1192 "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 echo configure:1185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1210,11 +1229,11 @@ else
ac_cv_c_cross=yes
else
cat > conftest.$ac_ext <<EOF
-#line 1214 "configure"
+#line 1233 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-{ (eval echo configure:1218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1237: \"$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
@@ -1232,7 +1251,7 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1236 "configure"
+#line 1255 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1240,7 +1259,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1255,7 +1274,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 1259 "configure"
+#line 1278 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1273,7 +1292,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 1277 "configure"
+#line 1296 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1294,7 +1313,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1298 "configure"
+#line 1317 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1305,7 +1324,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
exit (0); }
EOF
-{ (eval echo configure:1309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
@@ -1329,7 +1348,7 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1333 "configure"
+#line 1352 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -1384,7 +1403,7 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1388 "configure"
+#line 1407 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -1401,7 +1420,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -1428,12 +1447,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1432 "configure"
+#line 1451 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1465,12 +1484,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1469 "configure"
+#line 1488 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1502,12 +1521,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1506 "configure"
+#line 1525 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1541,7 +1560,7 @@ if eval "test \"`echo '$''{'ac_cv_c_cons
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1545 "configure"
+#line 1564 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -1591,7 +1610,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:1595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1627,7 +1646,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-
do
CC="$ac_save_CC $ac_arg"
cat > conftest.$ac_ext <<EOF
-#line 1631 "configure"
+#line 1650 "configure"
#include "confdefs.h"
#if !defined(__STDC__) || __STDC__ != 1
choke me
@@ -1643,7 +1662,7 @@ struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
; return 0; }
EOF
-if { (eval echo configure:1647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_prog_cc_stdc="$ac_arg"; break
fi
@@ -1679,7 +1698,7 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1683 "configure"
+#line 1702 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1687,7 +1706,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1702,7 +1721,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 1706 "configure"
+#line 1725 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1720,7 +1739,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 1724 "configure"
+#line 1743 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1741,7 +1760,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1745 "configure"
+#line 1764 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1752,7 +1771,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
exit (0); }
EOF
-{ (eval echo configure:1756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
@@ -1779,12 +1798,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1783 "configure"
+#line 1802 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1815,7 +1834,7 @@ if eval "test \"`echo '$''{'ac_cv_type_s
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1819 "configure"
+#line 1838 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -1833,7 +1852,7 @@ int t() {
int i;
; return 0; }
EOF
-if { (eval echo configure:1837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -1855,7 +1874,7 @@ if eval "test \"`echo '$''{'ac_cv_type_o
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1859 "configure"
+#line 1878 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1886,7 +1905,7 @@ if eval "test \"`echo '$''{'ac_cv_type_s
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1890 "configure"
+#line 1909 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1917,7 +1936,7 @@ if eval "test \"`echo '$''{'ac_cv_type_p
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1921 "configure"
+#line 1940 "configure"
#include "confdefs.h"
#include <stddef.h>
#include <sys/types.h>
@@ -1926,7 +1945,7 @@ int t() {
ptrdiff_t p
; return 0; }
EOF
-if { (eval echo configure:1930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_ptrdiff_t=yes
else
@@ -1966,15 +1985,15 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1970 "configure"
+#line 1989 "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 echo configure:1978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -1998,7 +2017,7 @@ if eval "test \"`echo '$''{'ac_cv_func_a
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2002 "configure"
+#line 2021 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -2017,12 +2036,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 echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_func_alloca=yes
else
@@ -2057,7 +2076,7 @@ if eval "test \"`echo '$''{'ac_cv_os_cra
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2061 "configure"
+#line 2080 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -2086,7 +2105,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2090 "configure"
+#line 2109 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2096,7 +2115,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
@@ -2110,7 +2129,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2142,7 +2161,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 2146 "configure"
+#line 2165 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -2161,7 +2180,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-{ (eval echo configure:2165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2184: \"$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
@@ -2200,7 +2219,7 @@ if eval "test \"`echo '$''{'ac_cv_func_r
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2204 "configure"
+#line 2223 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char re_rx_search(); below. */
@@ -2210,7 +2229,7 @@ else
builtin and then its argument prototype would still apply. */
char re_rx_search();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -2224,7 +2243,7 @@ re_rx_search();
; return 0; }
EOF
-if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_re_rx_search=yes"
else
@@ -2249,7 +2268,7 @@ if eval "test \"`echo '$''{'ac_cv_func_v
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2253 "configure"
+#line 2272 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -2259,7 +2278,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
@@ -2273,7 +2292,7 @@ vprintf();
; return 0; }
EOF
-if { (eval echo configure:2277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -2299,7 +2318,7 @@ if eval "test \"`echo '$''{'ac_cv_func__
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2303 "configure"
+#line 2322 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -2309,7 +2328,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
@@ -2323,7 +2342,7 @@ _doprnt();
; return 0; }
EOF
-if { (eval echo configure:2327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -2345,14 +2364,14 @@ fi
fi
-for ac_func in getwd getcwd link strerror isascii bcopy bzero memcpy
+for ac_func in getwd getcwd link strerror isascii bcopy bzero memcpy sbrk
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2356 "configure"
+#line 2375 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2362,7 +2381,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
@@ -2376,7 +2395,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2405,7 +2424,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2409 "configure"
+#line 2428 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2415,7 +2434,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
@@ -2429,7 +2448,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2456,7 +2475,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2460 "configure"
+#line 2479 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2466,7 +2485,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
@@ -2480,7 +2499,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2505,7 +2524,7 @@ if eval "test \"`echo '$''{'ac_cv_func_g
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2509 "configure"
+#line 2528 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getopt_long(); below. */
@@ -2515,7 +2534,7 @@ else
builtin and then its argument prototype would still apply. */
char getopt_long();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -2529,7 +2548,7 @@ getopt_long();
; return 0; }
EOF
-if { (eval echo configure:2533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_getopt_long=yes"
else
@@ -2553,15 +2572,15 @@ if eval "test \"`echo '$''{'gt_cv_func_o
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2557 "configure"
+#line 2576 "configure"
#include "confdefs.h"
#include "obstack.h"
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
struct obstack *mem;obstack_free(mem,NULL)
; return 0; }
EOF
-if { (eval echo configure:2565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
gt_cv_func_obstack=yes
else
@@ -2589,7 +2608,7 @@ else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 2593 "configure"
+#line 2612 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -2597,7 +2616,7 @@ int t() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:2601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
fi
@@ -2627,7 +2646,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2631 "configure"
+#line 2650 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2637,7 +2656,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
@@ -2651,7 +2670,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2681,7 +2700,7 @@ else
ac_cv_func_mmap=no
else
cat > conftest.$ac_ext <<EOF
-#line 2685 "configure"
+#line 2704 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test. */
@@ -2750,7 +2769,7 @@ main()
}
EOF
-{ (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_func_mmap=yes
else
@@ -2778,12 +2797,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2782 "configure"
+#line 2801 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2815,7 +2834,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2819 "configure"
+#line 2838 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2825,7 +2844,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
@@ -2839,7 +2858,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2870,7 +2889,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2874 "configure"
+#line 2893 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2880,7 +2899,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
@@ -2894,7 +2913,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2930,15 +2949,15 @@ if eval "test \"`echo '$''{'ud_cv_val_LC
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2934 "configure"
+#line 2953 "configure"
#include "confdefs.h"
#include <locale.h>
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
return LC_MESSAGES
; return 0; }
EOF
-if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ud_cv_val_LC_MESSAGES=yes
else
@@ -2999,12 +3018,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3003 "configure"
+#line 3022 "configure"
#include "confdefs.h"
#include <libintl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3026,19 +3045,19 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3030 "configure"
+#line 3049 "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 bindtextdomain();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
bindtextdomain()
; return 0; }
EOF
-if { (eval echo configure:3042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:3061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3051,7 +3070,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
@@ -3067,7 +3086,7 @@ if eval "test \"`echo '$''{'ac_cv_func_g
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3071 "configure"
+#line 3090 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -3077,7 +3096,7 @@ else
builtin and then its argument prototype would still apply. */
char gettext();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -3091,7 +3110,7 @@ gettext();
; return 0; }
EOF
-if { (eval echo configure:3095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:3114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_gettext=yes"
else
@@ -3147,7 +3166,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3151 "configure"
+#line 3170 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3157,7 +3176,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
@@ -3171,7 +3190,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:3194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3258,16 +3277,16 @@ else
fi
cat > conftest.$ac_ext <<EOF
-#line 3262 "configure"
+#line 3281 "configure"
#include "confdefs.h"
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
extern int _nl_msg_cat_cntr;
return _nl_msg_cat_cntr
; return 0; }
EOF
-if { (eval echo configure:3271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:3290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
CATOBJEXT=.gmo
DATADIRNAME=share
@@ -3310,15 +3329,15 @@ else
ac_save_LIBS="$LIBS"
LIBS="-li $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3314 "configure"
+#line 3333 "configure"
#include "confdefs.h"
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
main()
; return 0; }
EOF
-if { (eval echo configure:3322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:3341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3331,7 +3350,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 i | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ ac_tr_lib=HAVE_LIB`echo i | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
@@ -3347,7 +3366,7 @@ if eval "test \"`echo '$''{'ac_cv_func_c
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3351 "configure"
+#line 3370 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char catgets(); below. */
@@ -3357,7 +3376,7 @@ else
builtin and then its argument prototype would still apply. */
char catgets();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -3371,7 +3390,7 @@ catgets();
; return 0; }
EOF
-if { (eval echo configure:3375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_catgets=yes"
else
@@ -3721,12 +3740,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3725 "configure"
+#line 3744 "configure"
#include "confdefs.h"
#include <linux/version.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3922,7 +3941,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.
@@ -3983,6 +4004,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%@PACKAGE@%$PACKAGE%g
s%@VERSION@%$VERSION%g
@@ -4239,6 +4263,7 @@ sed -e "/POTFILES =/r po/POTFILES" po/Ma
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/id-utils/configure.in amiga/fsf/id-utils/configure.in
--- baseline/fsf/id-utils/configure.in Tue Aug 6 20:16:19 1996
+++ amiga/fsf/id-utils/configure.in Sat Sep 28 00:00:00 1996
@@ -104,7 +104,7 @@ AC_SUBST(LDFLAGS)
AC_FUNC_ALLOCA
ud_WITH_REGEX
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(getwd getcwd link strerror isascii bcopy bzero memcpy)
+AC_CHECK_FUNCS(getwd getcwd link strerror isascii bcopy bzero memcpy sbrk)
AC_REPLACE_FUNCS(strdup strndup strspn strcspn strpbrk strstr strtok)
AC_REPLACE_FUNCS(basename dirname fnmatch error memcpy memset)
AC_REPLACE_GNU_GETOPT
diff -rup --new-file baseline/fsf/id-utils/doc/Makefile.in amiga/fsf/id-utils/doc/Makefile.in
--- baseline/fsf/id-utils/doc/Makefile.in Tue Aug 6 20:27:21 1996
+++ amiga/fsf/id-utils/doc/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@
@@ -46,6 +49,7 @@ CONFIG_HEADER = ../config.h
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
+DVIPS = dvips
INFOS = id-utils.info id-utils.info-[0-9] id-utils.info-[0-9][0-9]
INFO_DEPS = id-utils.info
DVIS = id-utils.dvi
@@ -102,24 +106,41 @@ id-utils.dvi: id-utils.texi version.texi
.texi.info:
- cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+ $(MAKEINFO) -I$(srcdir) $< -o $@
.texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+.texi.guide:
+ $(MAKEINFO) -I$(srcdir) $< -o $@ --no-split --amiga
+
+.dvi.ps:
+ $(DVIPS) -o $@ $<
+
install-info: $(INFO_DEPS)
$(mkinstalldirs) $(infodir)
for file in $(INFO_DEPS); do \
- for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
- if test -f $(srcdir)/$$ifile; then \
- $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
+ for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+ if test -f $$ifile; then \
+ $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
else : ; fi; \
done; \
done
+install-dvi:
+ $(mkinstalldirs) $(dvidir)
+ $(INSTALL_DATA) id-utils.dvi $(dvidir)/id-utils.dvi
+
+install-guide:
+ $(mkinstalldirs) $(guidedir)
+ $(INSTALL_DATA) id-utils.guide $(guidedir)/id-utils.guide
+
+install-ps:
+ $(mkinstalldirs) $(psdir)
+ $(INSTALL_DATA) id-utils.ps $(psdir)/id-utils.ps
+
uninstall-info:
- cd $(srcdir) && for file in *.info*; do \
+ for file in *.info*; do \
rm -f $(infodir)/$$file; \
done
@@ -151,20 +172,24 @@ info: $(INFO_DEPS)
dvi: $(DVIS)
+guide: id-utils.guide
+
+ps: id-utils.ps
+
check: all
installcheck:
install-exec:
-install-data: install-info
+install-data: install-info install-guide install-dvi install-ps
install: install-exec install-data all
@:
uninstall: uninstall-info
-all: $(INFO_DEPS) Makefile
+all: $(INFO_DEPS) Makefile guide dvi ps
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
@@ -205,7 +230,7 @@ installdirs mostlyclean-generic distclea
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
.SUFFIXES:
-.SUFFIXES: .texi .info .dvi
+.SUFFIXES: .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/id-utils/doc/id-utils.info amiga/fsf/id-utils/doc/id-utils.info
--- baseline/fsf/id-utils/doc/id-utils.info Tue Aug 6 20:24:28 1996
+++ amiga/fsf/id-utils/doc/id-utils.info Wed Dec 31 17:00:00 1969
@@ -1,1176 +0,0 @@
-This is Info file id-utils.info, produced by Makeinfo-1.63 from the
-input file id-utils.texi.
-
-START-INFO-DIR-ENTRY
-* ID database: (id-utils). Identifier database utilities.
-* mkid: (id-utils)mkid invocation. Creating an ID database.
-* lid: (id-utils)lid invocation. Matching words and patterns.
-* fid: (id-utils)fid invocation. Listing a file's tokens.
-* fnid: (id-utils)fnid invocation. Looking up file names.
-* xtokid: (id-utils)xtokid invocation. Testing mkid scanners.
-END-INFO-DIR-ENTRY
-
- This file documents the `id-utils' database utilities.
-
- Copyright (C) 1996 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.
-
-
-File: id-utils.info, Node: Top, Next: Introduction, Up: (dir)
-
-ID utilities
-************
-
- This manual documents version 3.2 of the ID utilities.
-
-* Menu:
-
-* Introduction:: Overview of the tools with tutorial.
-* Quick start:: Quick start procedure.
-* Common options:: Common command-line options.
-* mkid invocation:: Creating an ID database.
-* lid invocation:: Querying an ID database by token.
-* fid invocation:: Listing a file's tokens.
-* fnid invocation:: Looking up file names.
-* xtokid invocation:: Testing language scanners.
-* Past and Future:: History and future directions.
-* Index:: General index.
-
-
-File: id-utils.info, Node: Introduction, Next: Quick start, Prev: Top, Up: Top
-
-Introduction
-************
-
- An "ID database" is a binary file containing a list of file names, a
-list of tokens, and a sparse matrix indicating which tokens appear in
-which files.
-
- With this database and some tools to query it (described in this
-manual), many text-searching tasks become simpler and faster. For
-example, you can list all files that reference a particular `#include'
-file throughout a huge source hierarchy, search for all the memos
-containing references to a project, or automatically invoke an editor
-on all files containing references to some function or variable.
-Anyone with a large software project to maintain, or a large set of text
-files to organize, can benefit from the ID utilities.
-
- Although the name `ID' is short for `identifier', the ID utilities
-handle more than just identifiers; they also treat other kinds of
-tokens, most notably numeric constants, and the contents of certain
-character strings. Thus, this manual will use the word "token" as a
-term that is inclusive of identifiers, numbers and strings.
-
- There are several programs in the ID utilities family:
-
-`mkid'
- scans files for tokens and builds the ID database file.
-
-`lid'
- queries the ID database for tokens, then reports matching file
- names or matching lines.
-
-`fid'
- lists all tokens recorded in the database for given files, or
- tokens common to two files.
-
-`fnid'
- matches the file names in the database, rather than the tokens.
-
-`xtokid'
- extracts raw tokens--helps with testing of new `mkid' scanners.
-
- In addition, the ID utilities have historically provided several
-query programs which are specializations of `lid':
-
-`gid'
- (alias for `lid -R grep') lists all lines containing the requested
- pattern.
-
-`eid'
- (alias for `lid -R edit') invokes an editor on all files
- containing the requested pattern, and if possible, initiates a
- text search for that pattern.
-
-`aid'
- (alias for `lid -ils') treats the requested pattern as a
- case-insensitive literal substring.
-
- Please report bugs to `bug-gnu-utils@gnu.ai.mit.edu'. Remember to
-include the version number, machine architecture, input files, and any
-other information needed to reproduce the bug: your input, what you
-expected, what you got, and why it is wrong. Diffs are welcome, but
-please include a description of the problem as well, since this is
-sometimes difficult to infer. *Note Bugs: (gcc)Bugs.
-
-
-File: id-utils.info, Node: Quick start, Next: Common options, Prev: Introduction, Up: Top
-
-Quick Start Procedure
-*********************
-
- Unpack the distribution.
-
- Type `./configure'
-
- Type `make'
-
- Type `make install' as a user with the appropriate privileges
- (e.g., `bin' or perhaps even `root').
-
- Type `cd /usr/include; mkid' to build an ID database covering all
- of the system header files.
-
- Type `lid FILE', then `gid strtok', then `aid stdout'.
-
- You have just built, installed and used the most common commands of
-the GNU ID utilities. If you ever need help remembering which system
-header files contain a particular declaration, or reference a
-particular symbol, you'll want to keep the ID file you built in
-`/usr/include' for later use. If your working directory is elsewhere
-at the time, simply provide the `-f /usr/include' option to `lid'
-(*note Reading options::.).
-
-
-File: id-utils.info, Node: Common options, Next: mkid invocation, Prev: Quick start, Up: Top
-
-Common command-line options
-***************************
-
- Certain options, and regular expression syntax, are shared by various
-groupings of the ID utilities. We describe these in the sections below,
-rather than repeating them for each program.
-
-* Menu:
-
-* Universal options:: Options common to all programs.
-* Extraction options:: Options for programs that extract tokens from source files.
-* Walker options:: Options for programs that walk file and directory trees.
-* Reading options:: Options for programs that read ID databases.
-* Writing options:: Options for programs that write ID databases.
-* File listing options:: Options for programs that list file names.
-
-
-File: id-utils.info, Node: Universal options, Next: Extraction options, Up: Common options
-
-Options Common to All Programs
-==============================
-
-`--help'
- Print a usage message listing all available options, then exit
- successfully.
-
-`--version'
- Print the version number, then exit successfully.
-
-
-File: id-utils.info, Node: Reading options, Next: Writing options, Prev: Walker options, Up: Common options
-
-Options for Programs that Read ID Databases
-===========================================
-
-`-f FILENAME'
-`--file=FILENAME'
- FILENAME is the ID database to read when processing queries. At
- present, only a single `--file' option is processed, but in future
- releases, more than one ID database may be named on the command
- line.
-
-`$IDPATH'
- `IDPATH' is an environment variable that contains a
- colon-separated list of ID database names. If this variable is
- present, and no `--file' options are presented on the command
- line, the ID databases named in `IDPATH' are implied.(1)
-
- If no ID databases are specified either on the command line or via
-the `IDPATH' environment variable, then the ID utilities search for a
-file named `ID' in the current working directory, and then in
-successive parent directories.
-
- ---------- Footnotes ----------
-
- (1) At present, this feature is fully implemented, since only the
-first of a list of ID database names is processed.
-
-
-File: id-utils.info, Node: Writing options, Next: File listing options, Prev: Reading options, Up: Common options
-
-Options for Programs that Write ID Databases
-============================================
-
-`-o FILENAME'
-`--output=FILENAME'
- The `--output' option names the file in which to write a new ID
- database. If no `--output' (or `--file') option is present, an
- output file named `ID' is implied.
-
-`-f FILENAME'
-`--file=FILENAME'
- This is a synonym for `--output'
-
-
-File: id-utils.info, Node: Walker options, Next: Reading options, Prev: Extraction options, Up: Common options
-
-Options for Programs that Walk File and Directory Trees.
-========================================================
-
- The programs `mkid' and `xtokid' accept the names of files and
-directories on the command line. Files are scanned if there is a
-scanner available and enabled for the file's source language.
-Directories are recursively descended, searching for files whose names
-match the rules listed in the *language map* file (*note Language
-map::.).
-
- The following option controls the file tree walker:
-
-`-p NAMES'
-`--prune=NAMES'
- One or more file or directory names may appear in NAMES. The file
- tree walker will stop short at these files and directories and
- their contents will not be scanned.
-
-
-File: id-utils.info, Node: File listing options, Prev: Writing options, Up: Common options
-
-Options for Programs that List File Names
-=========================================
-
- The programs `lid' and `fnid' can print lists of file names as the
-result of queries. The following option controls how these lists are
-formatted:
-
-`-S STYLE'
-`--separator=STYLE'
- STYLE may be one of `braces', `space' or `newline'.
-
- The STYLE of `braces' means that file names with common directory
- prefix and common suffix are printed using the shell's brace
- notation in order to compress the output. For example,
- `../src/foo.c ../src/bar.c' can be printed in brace notation as
- `../src/{foo,bar}.c'.
-
- The STYLEs of `space' and `newline' mean that file names are
- separated spaces or by newlines, respectively.
-
- If the list of files is being printed on a terminal, brace
- notation is the default. If not, file names are separated by
- spaces if the KEY is included in the output, and by newlines the
- KEY STYLE is `none' (*note lid invocation::.).
-
-
-File: id-utils.info, Node: Extraction options, Next: Walker options, Prev: Universal options, Up: Common options
-
-Options for Programs that Scan Source Files
-===========================================
-
- `mkid' and `xtokid' walk file trees, select source files by name,
-and extract tokens from source files. They accept the following
-options:
-
-`-m MAPFILE'
-`--lang-map=MAPFILE'
- MAPFILE contains rules for determining the source languages from
- file names. *Note Language map::
-
-`-i LANGUAGES'
-`--include=LANGUAGES'
- The `--include' option names LANGUAGES whose source files should
- be scanned and incorporated into the ID database. By default, all
- languages known to the ID utilities are enabled.
-
-`-x LANGUAGES'
-`--exclude=LANGUAGES'
- The `--exclude' option names LANGUAGES whose source files should
- NOT be scanned. The default list of excluded languages is empty.
- Note that only one of `--include' or `--exclude' may be specified
- on the command line for a single run.
-
-`-l LANGUAGE:OPTIONS'
-`--lang-option=LANGUAGE:OPTIONS'
- Language-specific scanners also accept options. LANGUAGE denotes
- the desired scanner, and OPTION are the command-line options that
- should be passed through to it. For example, to pass the -X
- -COKE-BOTTLE options to the scanner for the language SWIZZLE, pass
- this: -L SWIZZLE:"-X -COKE-BOTTLE", or this:
- -LANG-OPTION=SWIZZLE:"-X -COKE-BOTTLE", or this: -L SWIZZLE-X -L
- SWIZZLE:-COKE-BOTTLE. Use the `--help' option to see the
- command-line option summary for
-
- To determine which tokens to extract from a file and store in the
-database, `mkid' calls a "scanner"; we say a scanner "recognizes" a
-particular language. Scanners for several languages are built-in to
-`mkid'; you can add your own scanners as well, as explained in *Note
-Defining scanners::.
-
- The ID utilities determine which scanner to use for a particular
-file by consulting the language-map file. Scanners for several are
-already built-in to the ID utilities. You can see which languages have
-built-in scanners, and examine their language-specific options by
-invoking `mkid --help' or `xtokid --help'.
-
-* Menu:
-
-* Language map:: Mapping file names to source languages.
-* C/C++ scanner:: For the C and C++ programming language.
-* Assembler scanner:: For assembly language.
-* Text scanner:: For documents or other non-source code.
-* Defining scanners:: Defining new scanners in the source code.
-
-
-File: id-utils.info, Node: Language map, Next: C/C++ scanner, Up: Extraction options
-
-Mapping file names to source languages
---------------------------------------
-
- The file `id-lang.map', installed by default in
-`$(prefix)/share/id-lang.map', contains rules for mapping file names to
-source languages. Each rule comprises three parts: a shell GLOB
-pattern, a language name, and language-specific scanner options.
-
- The special pattern `**' denotes the default source language. This
-is the language that's assigned to file names that don't match any other
-pattern.
-
- The special pattern `***' should be followed by a file name. The
-named file should contain more language-map rules and is included at
-this point.
-
- The order in which rules are presented in a language-map file is
-significant. This order influences the order in which files are
-displayed as the result of queries. For example, the distributed
-language-map file places all rules for C .H files ahead of .C files, so
-that in general, declarations will precede definitions in query output.
-The same thing is done for C++ and its many different source file name
-extensions.
-
- Here is a pared-down version of the `id-lang.map' file distributed
-with the ID utilities:
-
-
- # Default language
- ** IGNORE # Although this is listed first,
- # the default language pattern is
- # logically matched last.
-
- # Backup files
- *~ IGNORE
- *.bak IGNORE
- *.bk[0-9] IGNORE
-
- # SCCS files
- [sp].* IGNORE
-
- # list header files before code files
- *.h C
- *.h.in C
- *.H C++
- *.hh C++
- *.hpp C++
- *.hxx C++
-
- # list C `meta' files next
- *.l C
- *.lex C
- *.y C
- *.yacc C
-
- # list C code files after header files
- *.c C
- *.C C++
- *.cc C++
- *.cpp C++
- *.cxx C++
-
- # list assembly language after C
- *.[sS] asm --comment=;
- *.asm asm --comment=;
-
- # [nt]roff
- *.[0-9] roff
- *.ms roff
- *.me roff
- *.mm roff
-
- # TeX and friends
- *.tex TeX
- *.ltx TeX
- *.texi texinfo
- *.texinfo texinfo
-
-
-File: id-utils.info, Node: C/C++ scanner, Next: Assembler scanner, Prev: Language map, Up: Extraction options
-
-C/C++ Language Scanner
-----------------------
-
- The C scanner is the most commonly used. Files that match the glob
-pattern `*.h', `*.c', as well as `yacc' files that match `*.y' or
-`*.yacc', and `lex' files that match `*.l' or `*.lex', are processed
-with this scanner.
-
- Scanner-specific options (Note, these options are presented WITHOUT
-the required `-l' or `--lang-option=' prefix):
-
-`-k CHARACTER-CLASS'
-`--keep=CHARACTER-CLASS'
- Consider the characters in CHARACTER-CLASS as valid constituents of
- identifier names. For example, if you are indexing C code that
- contains `$' in some of its identifiers, you can include these by
- using `--lang-option=C:--keep=$', or `-l C:"-k $"' (if you don't
- like to type so much).
-
-`-i CHARACTER-CLASS'
-`--ignore=CHARACTER-CLASS'
- x mkiConsider the characters in CHARACTER-CLASS as valid
- constituents of identifier names, but discard all tokens
- containing these characters. For example, if some C code has
- identifiers containing `$', but you don't want these cluttering up
- your ID database, use `--lang-option=C:--ignore=$', or the terser
- equivalent `-l C:"-i $"'.
-
-`-u'
-`--strip-underscore'
- Strip one leading underscore from C identifiers encapsulated as
- character strings. This option is useful if you are indexing C
- code that contains symbol-table name strings for systems that
- prepend an underscore to external symbols. By default, the
- leading underscore is retained.
-
-
-File: id-utils.info, Node: Assembler scanner, Next: Text scanner, Prev: C/C++ scanner, Up: Extraction options
-
-Assembly Language Scanner
--------------------------
-
- Assembly languages use a variety of commenting conventions, and
-allow a variety of special characters to *dirty up* local symbols,
-preventing name space conflicts with symbols defined by higher-level
-languages. Also, some compilation systems prepend an underscore to
-external symbols. The options listed below are designed to address
-these differences.
-
-`-c CHARACTER-CLASS'
-`--comment=CHARACTER-CLASS'
- The characters in CHARACTER-CLASS are considered left delimiters
- for comments that extend until the end of the current line.
-
-`-k CHARACTER-CLASS'
-`--keep=CHARACTER-CLASS'
- Consider the characters of CHARACTER-CLASS as valid constituents of
- identifier names. For example, if you are indexing assembly code
- that prepends `.' to assembler directives, and prepends `%' to
- register names, you can keep these characters in the tokens by
- specifying `--lang-option=asm:--keep=.%', or `-l asm:"-k .%"'.
-
-`-i CHARACTER-CLASS'
-`--ignore=CHARACTER-CLASS'
- Consider the characters of CHARACTER-CLASS as valid consituents of
- identifier names, but discard all tokens containing these
- characters. For example, if you don't want to clutter your ID
- database with assembler directives that begin with a leading `.'
- or with assembler labels that contain `@', use
- `--lang-option=asm:--ignore=.@', or `-l asm:"-i .@"'.
-
-`-u'
-`--strip-underscore'
- Strip one leading underscore from identifiers. This option is
- useful if your compilation system prepends an underscore to
- external symbols. By stripping the underscore, you can
- canonicalize such names and bring them into conformance the way
- they are expressed in the C language. By default, the leading
- underscore is retained.
-
-`-n'
-`--no-cpp'
- Do not recognize C preprocessor directives. By default, such
- lines are handled in the same way as they are by the C language
- scanner.
-
-
-File: id-utils.info, Node: Text scanner, Next: Defining scanners, Prev: Assembler scanner, Up: Extraction options
-
-Text Scanner
-------------
-
- The plain text scanner is intended for human-language documents, or
-as the scanner of last resort for files that have no scanner that is
-more specific. It is customizable to the extent that character classes
-can be designated as token constituents or as token delimiters. The
-default token constituents are the alpha-numerics; all other characters
-are considered token delimiters.
-
-`-i CHARACTER-CLASS'
-`--include=CHARACTER-CLASS'
- Include characters belonging to CHARACTER-CLASS in tokens.
-
-`-x CHARACTER-CLASS'
-`--exclude=CHARACTER-CLASS'
- Exclude characters belonging to CHARACTER-CLASS from tokens, i.e.,
- treat them as token delimiters.
-
-
-File: id-utils.info, Node: Defining scanners, Prev: Text scanner, Up: Extraction options
-
-Defining New Scanners in the Source Code
-----------------------------------------
-
- To add a new scanner in source code, you should add a new section to
-the file `scanners.c'. It might be easiest to clone one of the
-existing scanners and modify it as necessary. For the hypothetical
-language FOO, you must define the functions `get_token_foo',
-`parse_args_foo', `help_me_foo', as well as the tables
-`long_options_foo' and `args_foo'. If your scanner is modelled after
-one of the existing scanners, you'll also need a character-attribute
-table `ctype_foo'.
-
- This is not a terribly difficult programming task, but it requires
-recompiling and installing the new version of `mkid' and `xtokid'. You
-should use `xtokid' to test the operation of the new scanner.
-
- Once these functions and tables are ready, add function prototypes
-and an entry to to the `languages_0' table near the beginning of the
-file.
-
- Be warned that the existing scanners are built for speed, not
-elegance or readability. You might wish to create a new scanner that's
-easier to read and understand if you don't feel that speed is so
-important.
-
-
-File: id-utils.info, Node: mkid invocation, Next: lid invocation, Prev: Common options, Up: Top
-
-`mkid': Creating an ID Database
-*******************************
-
- `mkid' builds an ID database. It accepts the names of files and/or
-directories on the command line, selects files that have an enabled
-scanner, then extracts and stores tokens from those files. The
-resulting ID database is architecture- and byte-order-independent so it
-can be shared among all systems.
-
- The primary virtues of `mkid' are speed and high capacity. The size
-of the source trees it can index is limited only by available system
-memory. `mkid''s indexing algorithm is very space-efficient and
-exhibits excellent locality-of-reference, and so is capable of
-operating with a working-set size that is only half the size of its
-virtual address space. A typical UNIX-like operating system with 16
-megabytes of system memory should be able to build an ID database
-covering approximately 12,000-14,000 source files totalling
-approximately 50-100 Megabytes. A 66 Mhz 486 computer can build such a
-large ID database in approximately 10-15 minutes.
-
- In a future release, `mkid' will be able to incrementally update an
-ID database much faster than it can build one from scratch. Until this
-feature becomes available, it might be a good idea to schedule a `cron'
-job to regularly update large ID databases during off-hours.
-
- `mkid' writes the ID file, therefore it accepts the `--output' (and
-`--file') options as described in *Note Writing options::. `mkid'
-extracts tokens from source files, therefore it accepts the
-`--lang-map', `--include', `--exclude', and `--lang-option' options, as
-well as the language-specific scanner options, all of which are
-described in *Note Extraction options::. `mkid' walks file trees,
-therefore it handles file and directory names on its command line and
-the `--prune' option as described in *Note Walker options::.
-
- In addition, `mkid' accepts the following command-line options:
-
-`-s'
-`--statistics'
- `mkid' reports statistics about resource usage at the end of its
- run.
-
-`-v'
-`--verbose'
- `mkid' reports statistics about each file as it is scanned, and
- about the resource usage of its indexing algorithm at regular
- intervals.
-
-
-File: id-utils.info, Node: lid invocation, Next: fid invocation, Prev: mkid invocation, Up: Top
-
-`lid': Querying an ID Database by Token
-***************************************
-
- The `lid' program accepts PATTERNS on the command line which it
-matches against the tokens stored in an ID database. The
-interpretation of a PATTERN is determined by the makeup of the PATTERN
-string itself, or can be overridden by command-line options. If a
-PATTERN contains regular expression meta-characters, it is used to
-perform a regular-expression substring search. If no such
-meta-characters are present, PATTERN is used to perform a literal word
-search. (By default, all searches are sensitive to alphabetic case.)
-If no PATTERN is supplied on the command line, `lid' lists every entry
-in the ID database.
-
- `lid' reads the ID database, therefore it accepts the `--file'
-option, and consults the `IDPATH' environment variable, as described in
-*Note Reading options::. `lid' lists file names, therefore it accepts
-the `--separator' option, as described in *Note File listing options::.
-
- In addition, `lid' accepts the following command-line options:
-
-`-i'
-`--ignore-case'
- Ignoring differences in alphabetic case between the PATTERN and
- the tokens in the ID database.
-
-`-l'
-`--literal'
- Match PATTERN as a literal string. Use this option if PATTERN
- contains regular-expression meta-characters, but you don't wish to
- perform a regular-expression search.
-
-`-r'
-`--regexp'
- Match PATTERN as an *extended* regular expression(1). Use this
- option if no regular-expression expression meta-characters are
- present in PATTERN, but you wish to force a regular-expression
- search (note: in this case, a *literal substring* search might be
- faster).
-
-`-w'
-`--word'
- Match PATTERN using a word-delimited (non substring) search. This
- is the default for literal searches.
-
-`-s'
-`--substring'
- Match PATTERN using a substring (non word-delimited) search. This
- is the default for regular expression searches.
-
-`-k STYLE'
-`--key=STYLE'
- STYLE can be one of `token', `pattern' or `none'. This option
- controls how the subject of the query is presented. This is best
- illustrated by example:
-
- $ lid --key=token '^dest.'
- destaddr libsys/memcpy.c
- destination libsys/regex.c
- destlst libsys/rx.c
- destpos libsys/rx.c
- destset libsys/rx.h libsys/rx.c
-
- $ lid --key=pattern '^dest.'
- ^dest. libsys/rx.h libsys/{memcpy,regex,rx}.c
-
- $ lid --key=none '^dest.'
- libsys/rx.h libsys/{memcpy,regex,rx}.c
-
- When `--key' is either `token' or `pattern', the first column of
- output is a TOKEN or PATTERN, respectively. When `--key' is
- `none', neither of these is printed, and the file name list begins
- immediately. The default is `token'.
-
-`-R STYLE'
-`--result=STYLE'
- STYLE can be one of `filenames', `grep', `edit' or `none'. This
- option controls how the value associated with the query's KEY
- presented. When STYLE is `filenames', a list of file names is
- printed (this is the default). When STYLE is `grep', the lines
- that match PATTERN are printed in the same format as `egrep -n'.
- When STYLE is `edit', the file names are passed to an editor, and
- if possible PATTERN is passed as an initial search string (*note
- eid invocation::.). When STYLE is `none', the file names are not
- processed in any way. This can be useful if you wish to see what
- tokens match a PATTERN, but don't care about where they reside.
-
-`-d'
-`-o'
-`-x'
- These options may be used in any combination to specify the radix
- of numeric matches. `-d' allows matching on decimal numbers, `-o'
- on octal numbers, and `-x' on hexadecimal numbers. Any
- combination of these options may be used. The default is to match
- all three radixes.
-
-`-F RANGE'
-`--frequency=RANGE'
- Match tokens whose occurrence count falls in RANGE. RANGE may be
- expressed as a single number N, or as a range N`..'M. Either
- limit of the range may be omitted (e.g., `..'M, or N..`..'). If
- the lower limit N is omitted, it defaults to `1'. If the upper
- limit is omitted, it defaults in the present implementation to
- `65535', the maximum value of an unsigned 16-bit integer.
-
- Particularly useful queries are `lid -F1', which helps locate
- identifiers that are defined but never used, or are used but never
- defined. Similarly, `lid -F2' can help find functions that possess
- a prototype declaration and a definition, but are never called.
-
-`-a NUMBER'
-`--ambiguous=NUMBER'
- List identifiers (not numbers) that are ambiguous for the first
- NUMBER characters. This feature might be in useful when porting
- programs to ancient pea-brained compilers that don't support long
- identifier names. However, the best long-term option is to set
- such systems on fire.
-
-* Menu:
-
-* lid aliases:: Aliases for specialized lid queries
-* Emacs gid interface:: GNU Emacs query interface
-* eid invocation:: Invoking an editor on query results
-
- ---------- Footnotes ----------
-
- (1) Extended regular expressions are the same as those accepted by
-`egrep'.
-
-
-File: id-utils.info, Node: lid aliases, Next: Emacs gid interface, Up: lid invocation
-
-Aliases for Specialized `lid' Queries
-=====================================
-
- Historically, the ID utilities have provided several query interfaces
-which are specializations of `lid' (*note lid invocation::.).
-
-`gid'
- (alias for `lid -R grep') lists all lines containing the requested
- pattern.
-
-`eid'
- (alias for `lid -R edit') invokes an editor on all files
- containing the requested pattern, and optionally initiates a text
- search for that pattern.
-
-`aid'
- (alias for `lid -ils') treats the requested pattern as a
- case-insensitive literal substring.
-
-
-File: id-utils.info, Node: Emacs gid interface, Next: eid invocation, Prev: lid aliases, Up: lid invocation
-
-GNU Emacs query interface
-=========================
-
- The `id-utils' source distribution comes with a file `id-utils.el',
-which defines a GNU Emacs interface to `gid'. To install it, put
-`id-utils.el' somewhere that Emacs will find it (i.e., in your
-`load-path') and put
-
- (autoload 'gid "gid" nil t)
-
-in one of Emacs' initialization files, e.g., `~/.emacs'. You will then
-be able to use `M-x gid' to run the command.
-
- The `gid' function prompts you with the word around point. If you
-want to search for something else, simply delete the line and type the
-pattern of interest.
-
- The function then runs the `gid' program in a `*compilation*'
-buffer, so the normal `next-error' function can be used to visit all
-the places the identifier is found (*note Compilation:
-(emacs)Compilation.).
-
-
-File: id-utils.info, Node: eid invocation, Prev: Emacs gid interface, Up: lid invocation
-
-`eid': Invoking an Editor on Query Results
-==========================================
-
- `lid -R edit' is an editing interface for the ID utilities that is
-most commonly used with `vi'. Emacs users should use the interface
-defined in `id-utils.el' (*note Emacs gid interface::.). The ID
-utilities include an alias called `eid', and for the sake of brevity,
-we'll use this alias for the remainder of this section. `eid' performs
-a `lid'-style, then asks if you wish to edit the files. If your query
-yields more than one line of output, you will be prompted after each
-line. This is the prompt you'll see:
-
- Edit? [y1-9^S/nq]
-
-You may respond with:
-
-`y'
- Edit all files listed.
-
-`1...9'
- Edit all files starting at the N + 1'st file.
-
-`/STRING or `CTRL-S'REGEXP'
- Search into the file list, and begin editing with the first file
- name that matches the regular expression REGEXP.
-
-`n'
- Don't edit any files. If another line of query output is pending,
- advance to that line, for which another `Edit?' prompt will appear.
-
-`q'
- Quit--don't edit any files, and don't process any more lines of
- query output.
-
- Here is an example:
-
- prompt$ eid FILE \^print
- FILE {ansi2knr,fid,filenames,idfile,idx,lid,misc,...}.c
- Edit? [y1-9^S/nq] n
- ^print {ansi2knr,fid,getopt,getopt1,lid,mkid,regex,scanners}.c
- Edit? [y1-9^S/nq] 2
-
-This will start editing at `getopt'.c.
-
- `eid' invokes the editor defined by the environment variable
-`VISUAL'. If `VISUAL' is undefined, it uses the environment variable
-`EDITOR' instead. If `EDITOR' is undefined, it defaults to `vi'. It
-is possible for `eid' to pass the editor an initial search pattern so
-that your cursor will immediately alight on the token of interest.
-This feature is controlled by the following environment variables:
-
-`EIDARG'
- A printf(3) format string for the editor argument to search for the
- matching token. For `vi', this should be `+/%s/'.
-
-`EIDLDEL'
- The regular-expression meta-character(s) for delimiting the
- beginning of a word (the ``eid' Left DELimiter'). `eid' inserts
- this in front of the matching token when a word-search is desired.
- For `vi', this should be `\<'.
-
-`EIDRDEL'
- The regular-expression meta-character(s) for delimiting the end of
- a word (the ``eid' Right DELimiter'). `eid' inserts this in end
- of the matching token when a word-search is desired. For `vi',
- this should be `\>'.
-
-
-File: id-utils.info, Node: fid invocation, Next: fnid invocation, Prev: lid invocation, Up: Top
-
-`fid': Listing a file's tokens
-******************************
-
- `fid' prints the tokens found in a given file. If two file names
-are passed on the command line, `fid' prints the tokens that are common
-to both files (i.e., the *set intersection* of the two token sets).
-
- `lid' reads the ID database, therefore it accepts the `--file'
-option, and consults the `IDPATH' environment variable, as described in
-*Note Reading options::.
-
- If the standard output is attached to a terminal, the printed tokens
-are separated by spaces. Otherwise, the tokens are printed one per
-line.
-
-
-File: id-utils.info, Node: fnid invocation, Next: xtokid invocation, Prev: fid invocation, Up: Top
-
-`fnid': Looking up filenames
-****************************
-
- `fnid' queries the list of file names stored in the ID database. It
-accepts shell *wildcard* patterns on the command line. If no pattern
-is supplied, `*' is implied. `fnid' prints the file names that match
-the given patterns.
-
- `fnid' prints file names, and as such accepts the `--separator'
-option as described in *Note File listing options::.
-
- For example, the command:
-
- fnid \*.c
-
-lists all the `.c' files in the database. (The `\' here protects the
-`*' from being expanded by the shell.)
-
-
-File: id-utils.info, Node: xtokid invocation, Next: Past and Future, Prev: fnid invocation, Up: Top
-
-`xtokid': Testing Language Scanners
-***********************************
-
- `xtokid' accepts the names of files and/or directories on the
-command line, then extracts and prints a stream of tokens from those
-files for which it has a valid, enabled scanner. This is useful
-primarily for debugging new `mkid' scanners (*note Defining
-scanners::.).
-
- `xtokid' extracts tokens from source files, therefore it accepts the
-`--lang-map', `--include', `--exclude', and `--lang-option' options, as
-well as the language-specific scanner options, all of which are
-described in *Note Extraction options::. `xtokid' walks file trees,
-therefore it handles file and directory names on its command line and
-the `--prune' option as described in *Note Walker options::.
-
- The name `xtokid' indicates that it is the "eXtract TOKens ID
-utility".
-
-
-File: id-utils.info, Node: Past and Future, Next: Index, Prev: xtokid invocation, Up: Top
-
-Past and Future
-***************
-
- Greg McGary conceived of the ideas behind the ID utilities when he
-began working on the Unix kernel in 1984. He needed a navigation tool
-to help him find his way around the expansive, unfamiliar landscape.
-The first `id-utils'-like tools were shell scripts, and produced an
-ASCII database that looks much like the output of `lid ".*"'. It took
-over an hour on a VAX 11/750 to build a database for a 4.1BSD derived
-kernel. The first version of `lid' used the UNIX system utility
-`look', modified to handle very long lines.
-
- In 1986, Greg rewrote the shell scripts in C to improve performance.
-Build times for the ID file were shortened by an order of magnitude.
-The ID utilities were first posted to `comp.sources.unix' in September
-1987 under the name `id'.
-
- Over the next few years, several versions diverged from the original
-source. Tom Horsley at Harris Computer Systems Division stepped forward
-to take over maintenance and integrated some of the fixes from divergent
-versions. A first release of the renamed `mkid' version 2 was posted
-to `alt.sources' near the end of 1990. At that time, Tom wrote a
-Texinfo manual with the encouragement the net community. (Tom
-especially thanks Doug Scofield and Bill Leonard whom he dragooned into
-helping poorfraed and edit--they found several problems in the initial
-version.) Karl Berry revamped the manual for Texinfo style, indexing,
-and organization in 1995.
-
- In January 1995, Greg McGary reemerged as the primary maintainer and
-launched development of `mkid' version 3, whose primary new feature is
-an efficient algorithm for building databases that is linear in both
-time and space over the size of the input text. (The old algorithm was
-quadratic in space so it was incapable of handling very large source
-trees.) For the first time, the code was released under the GNU Public
-License.
-
- In June 1996, the package was renamed again to `id-utils' and was
-released for the first time under FSF copyright as part of the GNU
-system. All programs had their command-line arguments completely
-revised. The `mkid' and `xtokid' programs also gained a file-tree
-walker, so that directory names can be passed on the command line
-instead of the names of every individual file. Greg reorganized and
-rewrote most of the Texinfo manual to reflect these changes.
-
- Future releases of `id-utils' might include:
-
- an optional coupling with GNU `grep', so that `grep' can use an ID
- database for hints
-
- a `cscope' work-alike query interface
-
- incremental update of the ID database.
-
-
-File: id-utils.info, Node: Index, Prev: Past and Future, Up: Top
-
-Index
-*****
-
-* Menu:
-
-* *compilation* Emacs buffer: Emacs gid interface.
-* -ambiguous: lid invocation.
-* -comment: Assembler scanner.
-* -exclude <1>: Text scanner.
-* -exclude: Extraction options.
-* -file <1>: Writing options.
-* -file: Reading options.
-* -frequency: lid invocation.
-* -help: Universal options.
-* -ignore <1>: Assembler scanner.
-* -ignore: C/C++ scanner.
-* -ignore-case: lid invocation.
-* -include <1>: Text scanner.
-* -include: Extraction options.
-* -keep <1>: Assembler scanner.
-* -keep: C/C++ scanner.
-* -lang-map: Extraction options.
-* -lang-option: Extraction options.
-* -lang-option=asm:-comment: Assembler scanner.
-* -lang-option=asm:-ignore: Assembler scanner.
-* -lang-option=asm:-keep: Assembler scanner.
-* -lang-option=asm:-no-cpp: Assembler scanner.
-* -lang-option=asm:-strip-underscore: Assembler scanner.
-* -lang-option=asm:-c: Assembler scanner.
-* -lang-option=asm:-i: Assembler scanner.
-* -lang-option=asm:-k: Assembler scanner.
-* -lang-option=asm:-n: Assembler scanner.
-* -lang-option=asm:-u: Assembler scanner.
-* -lang-option=C:-ignore: C/C++ scanner.
-* -lang-option=C:-keep: C/C++ scanner.
-* -lang-option=C:-strip-underscore: C/C++ scanner.
-* -lang-option=C:-i: C/C++ scanner.
-* -lang-option=C:-k: C/C++ scanner.
-* -lang-option=C:-u: C/C++ scanner.
-* -lang-option=text:-exclude: Text scanner.
-* -lang-option=text:-include: Text scanner.
-* -lang-option=text:-i: Text scanner.
-* -lang-option=text:-x: Text scanner.
-* -literal: lid invocation.
-* -no-cpp: Assembler scanner.
-* -output: Writing options.
-* -prune: Walker options.
-* -regexp: lid invocation.
-* -result: lid invocation.
-* -separator: File listing options.
-* -statistics: mkid invocation.
-* -strip-underscore <1>: Assembler scanner.
-* -strip-underscore: C/C++ scanner.
-* -substring: lid invocation.
-* -verbose: mkid invocation.
-* -version: Universal options.
-* -word: lid invocation.
-* -a: lid invocation.
-* -c: Assembler scanner.
-* -d: lid invocation.
-* -F: lid invocation.
-* -f <1>: Writing options.
-* -f: Reading options.
-* -i <1>: lid invocation.
-* -i <1>: Text scanner.
-* -i <1>: Assembler scanner.
-* -i <1>: C/C++ scanner.
-* -i: Extraction options.
-* -k <1>: lid invocation.
-* -k <1>: Assembler scanner.
-* -k: C/C++ scanner.
-* -l <1>: lid invocation.
-* -l: Extraction options.
-* -l asm:-comment: Assembler scanner.
-* -l asm:-ignore: Assembler scanner.
-* -l asm:-keep: Assembler scanner.
-* -l asm:-no-cpp: Assembler scanner.
-* -l asm:-strip-underscore: Assembler scanner.
-* -l asm:-c: Assembler scanner.
-* -l asm:-i: Assembler scanner.
-* -l asm:-k: Assembler scanner.
-* -l asm:-n: Assembler scanner.
-* -l asm:-u: Assembler scanner.
-* -l C:-ignore: C/C++ scanner.
-* -l C:-keep: C/C++ scanner.
-* -l C:-strip-underscore: C/C++ scanner.
-* -l C:-i: C/C++ scanner.
-* -l C:-k: C/C++ scanner.
-* -l C:-u: C/C++ scanner.
-* -l text:-exclude: Text scanner.
-* -l text:-include: Text scanner.
-* -l text:-i: Text scanner.
-* -l text:-x: Text scanner.
-* -m: Extraction options.
-* -n: Assembler scanner.
-* -o <1>: lid invocation.
-* -o: Writing options.
-* -p: Walker options.
-* -r: lid invocation.
-* -s <1>: lid invocation.
-* -s: mkid invocation.
-* -S: File listing options.
-* -u <1>: Assembler scanner.
-* -u: C/C++ scanner.
-* -v: mkid invocation.
-* -w: lid invocation.
-* -x <1>: lid invocation.
-* -x <1>: Text scanner.
-* -x: Extraction options.
-* mkid progress: mkid invocation.
-* alphabetic case, ignoring differences in: lid invocation.
-* ambiguous identifier names, finding: lid invocation.
-* architecture-independence: mkid invocation.
-* assembler scanner: Assembler scanner.
-* assembly language scanner: Assembler scanner.
-* beginning-of-word editor argument: eid invocation.
-* Berry, Karl: Past and Future.
-* bugs, reporting: Introduction.
-* C scanner, predefined: C/C++ scanner.
-* common command-line options: Common options.
-* creating databases: mkid invocation.
-* cron: mkid invocation.
-* cscope: Past and Future.
-* databases, creating: mkid invocation.
-* eid: eid invocation.
-* EIDARG: eid invocation.
-* EIDLDEL: eid invocation.
-* EIDRDEL: eid invocation.
-* Emacs interface to gid: Emacs gid interface.
-* end-of-word editor argument: eid invocation.
-* exclude languages: Extraction options.
-* fid: fid invocation.
-* file name separator: File listing options.
-* file tree pruning: Walker options.
-* filenames, matching: fnid invocation.
-* fnid: fnid invocation.
-* future: Past and Future.
-* gid Emacs function: Emacs gid interface.
-* grep: Past and Future.
-* help, online: Universal options.
-* history: Past and Future.
-* Horsley, Tom: Past and Future.
-* ID database file name <1>: Writing options.
-* ID database file name: Reading options.
-* ID database, definition of: Introduction.
-* ID file format: mkid invocation.
-* id-utils.el interface to Emacs: Emacs gid interface.
-* ignoring differences in alphabetic case: lid invocation.
-* include languages: Extraction options.
-* introduction: Introduction.
-* language map file: Extraction options.
-* language-specific option: Extraction options.
-* languages_0: Defining scanners.
-* left delimiter editor argument: eid invocation.
-* Leonard, Bill: Past and Future.
-* load-path: Emacs gid interface.
-* look and mkid 1: Past and Future.
-* matching filenames: fnid invocation.
-* McGary, Greg: Past and Future.
-* numeric matches, specifying radix of: lid invocation.
-* overview: Introduction.
-* radix of numeric matches, specifying: lid invocation.
-* right delimiter editor argument: eid invocation.
-* scanners: Extraction options.
-* scanners, defining in source code: Defining scanners.
-* scanners.c: Defining scanners.
-* Scofield, Doug: Past and Future.
-* search for token, initial: eid invocation.
-* sharing ID files: mkid invocation.
-* single matches, showing: lid invocation.
-* statistics: mkid invocation.
-* text scanner: Text scanner.
-* tokens common to two files: fid invocation.
-* tokens in a file: fid invocation.
-* version number, finding: Universal options.
-
-
-
-Tag Table:
-Node: Top1278
-Node: Introduction2031
-Node: Quick start4560
-Node: Common options5485
-Node: Universal options6283
-Node: Reading options6608
-Node: Writing options7725
-Node: Walker options8221
-Node: File listing options9060
-Node: Extraction options10151
-Node: Language map12701
-Node: C/C++ scanner14907
-Node: Assembler scanner16522
-Node: Text scanner18618
-Node: Defining scanners19426
-Node: mkid invocation20648
-Node: lid invocation22929
-Node: lid aliases28314
-Node: Emacs gid interface28992
-Node: eid invocation29909
-Node: fid invocation32493
-Node: fnid invocation33180
-Node: xtokid invocation33855
-Node: Past and Future34794
-Node: Index37486
-
-End Tag Table
diff -rup --new-file baseline/fsf/id-utils/manifests/bin amiga/fsf/id-utils/manifests/bin
--- baseline/fsf/id-utils/manifests/bin Wed Dec 31 17:00:00 1969
+++ amiga/fsf/id-utils/manifests/bin Sat Sep 28 00:00:00 1996
@@ -0,0 +1,17 @@
+bin/aid
+bin/defid
+bin/eid
+bin/fid
+bin/fnid
+bin/gid
+bin/lid
+bin/mkid
+bin/xtokid
+dvi/id-utils.dvi
+guide/id-utils.guide
+info/id-utils.info
+lib/emacs/site-lisp/id-utils.elc
+ps/id-utils.ps
+share/id-lang.map
+share/locale/de/LC_MESSAGES/id-utils.mo
+share/locale/fr/LC_MESSAGES/id-utils.mo
diff -rup --new-file baseline/fsf/id-utils/manifests/src amiga/fsf/id-utils/manifests/src
--- baseline/fsf/id-utils/manifests/src Wed Dec 31 17:00:00 1969
+++ amiga/fsf/id-utils/manifests/src Sat Sep 28 00:00:00 1996
@@ -0,0 +1,138 @@
+fsf/id-utils/ABOUT-NLS
+fsf/id-utils/AUTHORS
+fsf/id-utils/COPYING
+fsf/id-utils/ChangeLog
+fsf/id-utils/INSTALL
+fsf/id-utils/Makefile.am
+fsf/id-utils/Makefile.in
+fsf/id-utils/NEWS
+fsf/id-utils/Product-Info
+fsf/id-utils/README
+fsf/id-utils/THANKS
+fsf/id-utils/TODO
+fsf/id-utils/acconfig.h
+fsf/id-utils/aclocal.m4
+fsf/id-utils/config.h.in
+fsf/id-utils/configure
+fsf/id-utils/configure.in
+fsf/id-utils/doc/Makefile.am
+fsf/id-utils/doc/Makefile.in
+fsf/id-utils/doc/id-utils.texi
+fsf/id-utils/doc/mdate-sh
+fsf/id-utils/doc/stamp-vti
+fsf/id-utils/doc/texinfo.tex
+fsf/id-utils/doc/version.texi
+fsf/id-utils/install-sh
+fsf/id-utils/intl/ChangeLog
+fsf/id-utils/intl/Makefile.in
+fsf/id-utils/intl/VERSION
+fsf/id-utils/intl/bindtextdom.c
+fsf/id-utils/intl/cat-compat.c
+fsf/id-utils/intl/dcgettext.c
+fsf/id-utils/intl/dgettext.c
+fsf/id-utils/intl/explodename.c
+fsf/id-utils/intl/finddomain.c
+fsf/id-utils/intl/gettext.c
+fsf/id-utils/intl/gettext.h
+fsf/id-utils/intl/gettextP.h
+fsf/id-utils/intl/hash-string.h
+fsf/id-utils/intl/intl-compat.c
+fsf/id-utils/intl/l10nflist.c
+fsf/id-utils/intl/libgettext.h
+fsf/id-utils/intl/linux-msg.sed
+fsf/id-utils/intl/loadinfo.h
+fsf/id-utils/intl/loadmsgcat.c
+fsf/id-utils/intl/localealias.c
+fsf/id-utils/intl/po2tbl.sed.in
+fsf/id-utils/intl/textdomain.c
+fsf/id-utils/intl/xopen-msg.sed
+fsf/id-utils/lib/Makefile.am
+fsf/id-utils/lib/Makefile.in
+fsf/id-utils/lib/alloca.c
+fsf/id-utils/lib/ansidecl.h
+fsf/id-utils/lib/basename.c
+fsf/id-utils/lib/dirname.c
+fsf/id-utils/lib/error.c
+fsf/id-utils/lib/error.h
+fsf/id-utils/lib/fnmatch.c
+fsf/id-utils/lib/fnmatch.h
+fsf/id-utils/lib/getopt.c
+fsf/id-utils/lib/getopt.h
+fsf/id-utils/lib/getopt1.c
+fsf/id-utils/lib/memcpy.c
+fsf/id-utils/lib/memset.c
+fsf/id-utils/lib/obstack.c
+fsf/id-utils/lib/obstack.h
+fsf/id-utils/lib/pathmax.h
+fsf/id-utils/lib/regex.c
+fsf/id-utils/lib/regex.h
+fsf/id-utils/lib/rx.c
+fsf/id-utils/lib/rx.h
+fsf/id-utils/lib/strcasecmp.c
+fsf/id-utils/lib/strcspn.c
+fsf/id-utils/lib/strdup.c
+fsf/id-utils/lib/strndup.c
+fsf/id-utils/lib/strpbrk.c
+fsf/id-utils/lib/strspn.c
+fsf/id-utils/lib/strstr.c
+fsf/id-utils/lib/strtok.c
+fsf/id-utils/lib/xalloca.h
+fsf/id-utils/lib/xdirent.h
+fsf/id-utils/lib/xfnmatch.h
+fsf/id-utils/lib/xgetcwd.c
+fsf/id-utils/lib/xmalloc.c
+fsf/id-utils/lib/xmalloc.h
+fsf/id-utils/lib/xobstack.h
+fsf/id-utils/lib/xstddef.h
+fsf/id-utils/lib/xstdlib.h
+fsf/id-utils/lib/xstring.h
+fsf/id-utils/lib/xsysstat.h
+fsf/id-utils/lib/xunistd.h
+fsf/id-utils/libidu/Makefile.am
+fsf/id-utils/libidu/Makefile.in
+fsf/id-utils/libidu/ansi2knr.1
+fsf/id-utils/libidu/ansi2knr.c
+fsf/id-utils/libidu/dynvec.c
+fsf/id-utils/libidu/dynvec.h
+fsf/id-utils/libidu/fnprint.c
+fsf/id-utils/libidu/hash.c
+fsf/id-utils/libidu/hash.h
+fsf/id-utils/libidu/id-lang.map
+fsf/id-utils/libidu/idfile.c
+fsf/id-utils/libidu/idfile.h
+fsf/id-utils/libidu/idread.c
+fsf/id-utils/libidu/idwrite.c
+fsf/id-utils/libidu/scanners.c
+fsf/id-utils/libidu/scanners.h
+fsf/id-utils/libidu/tokflags.h
+fsf/id-utils/libidu/walker.c
+fsf/id-utils/libidu/xnls.h
+fsf/id-utils/lisp/Makefile.am
+fsf/id-utils/lisp/Makefile.in
+fsf/id-utils/lisp/elisp-comp
+fsf/id-utils/lisp/id-utils.el
+fsf/id-utils/manifests/bin
+fsf/id-utils/manifests/src
+fsf/id-utils/mkinstalldirs
+fsf/id-utils/po/ChangeLog
+fsf/id-utils/po/Makefile.in.in
+fsf/id-utils/po/POTFILES.in
+fsf/id-utils/po/de.po
+fsf/id-utils/po/fr.po
+fsf/id-utils/src/Makefile.am
+fsf/id-utils/src/Makefile.in
+fsf/id-utils/src/aid
+fsf/id-utils/src/ansi2knr.1
+fsf/id-utils/src/ansi2knr.c
+fsf/id-utils/src/defid
+fsf/id-utils/src/eid
+fsf/id-utils/src/fid.c
+fsf/id-utils/src/fnid.c
+fsf/id-utils/src/gid
+fsf/id-utils/src/lid.c
+fsf/id-utils/src/mkid.c
+fsf/id-utils/src/xtokid.c
+fsf/id-utils/stamp-h.in
+fsf/id-utils/testsuite/Makefile.am
+fsf/id-utils/testsuite/Makefile.in
+fsf/id-utils/testsuite/consistency
diff -rup --new-file baseline/fsf/id-utils/po/Makefile.in.in amiga/fsf/id-utils/po/Makefile.in.in
--- baseline/fsf/id-utils/po/Makefile.in.in Wed Jul 17 14:37:14 1996
+++ amiga/fsf/id-utils/po/Makefile.in.in Sat Sep 28 00:00:00 1996
@@ -72,13 +72,13 @@ INSTOBJEXT = @INSTOBJEXT@
.po.pox:
$(MAKE) $(PACKAGE).pot
- $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
+ $(MSGMERGE) $< $(PACKAGE).pot -o $*.pox
.po.mo:
$(MSGFMT) -o $@ $<
.po.gmo:
- file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+ file=`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
@@ -91,31 +91,32 @@ all: all-@USE_NLS@
all-yes: cat-id-tbl.c $(CATALOGS)
all-no:
+# Build the .pot file only in the build directory.
$(PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
--add-comments --keyword=_ --keyword=N_ \
--files-from=$(srcdir)/POTFILES.in
if [ ! -s $(PACKAGE).po ] \
- || cmp -s $(PACKAGE).po $(srcdir)/$(PACKAGE).pot; then \
+ || cmp -s $(PACKAGE).po $(PACKAGE).pot; then \
rm -f $(PACKAGE).po; \
else \
- rm -f $(srcdir)/$(PACKAGE).pot \
- && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot; \
+ rm -f $(PACKAGE).pot \
+ && mv $(PACKAGE).po $(PACKAGE).pot; \
fi
cat-id-tbl.c: stamp-cat-id
stamp-cat-id: $(PACKAGE).pot
rm -f cat-id-tbl.tmp
- sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
+ sed -f ../intl/po2tbl.sed $(PACKAGE).pot \
| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
- if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
+ if cmp -s cat-id-tbl.tmp cat-id-tbl.c; then \
rm cat-id-tbl.tmp; \
else \
echo cat-id-tbl.c changed; \
- rm -f $(srcdir)/cat-id-tbl.c; \
- mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
+ rm -f cat-id-tbl.c; \
+ mv cat-id-tbl.tmp cat-id-tbl.c; \
fi
- cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
+ rm -f stamp-cat-id && echo timestamp > stamp-cat-id
install: install-exec install-data
diff -rup --new-file baseline/fsf/id-utils/po/cat-id-tbl.c amiga/fsf/id-utils/po/cat-id-tbl.c
--- baseline/fsf/id-utils/po/cat-id-tbl.c Wed Jul 17 14:58:24 1996
+++ amiga/fsf/id-utils/po/cat-id-tbl.c Wed Dec 31 17:00:00 1969
@@ -1,206 +0,0 @@
-/* Automatically generated by po2tbl.sed from id-utils.pot. */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "libgettext.h"
-
-const struct _msg_ent _msg_tbl[] = {
- {"", 1},
- {"can't allocate %ld bytes for hash table: memory exhausted", 2},
- {"Load=%ld/%ld=%.0f%%, ", 3},
- {"Rehash=%d, ", 4},
- {"Collisions=%ld/%ld=%.0f%%", 5},
- {"can't determine the io_size of a string!", 6},
- {"can't open `%s'", 7},
- {"`%s' is not an ID file! (bad magic #)", 8},
- {"`%s' is version %d, but I only grok version %d", 9},
- {"unsupported size in io_read (): %d", 10},
- {"unknown I/O type: %d", 11},
- {"unsupported size in io_write (): %d", 12},
- {"unrecognized language: `%s'", 13},
- {"can't allocate language args obstack: memory exhausted", 14},
- {"can't allocate language args: memory exhausted", 15},
- {"language name expected following `%s' in file `%s'", 16},
- {"can't open language map file `%s'", 17},
- {"can't get size of map file `%s'", 18},
- {"can't read language map file `%s'", 19},
- {"can't read entire language map file `%s'", 20},
- {"\
-C language:\n\
- -k,--keep=CHARS Allow CHARS in single-token strings, keep the \
-result\n\
- -i,--ignore=CHARS Allow CHARS in single-token strings, toss the \
-result\n\
- -u,--strip-underscore Strip a leading underscore from single-token \
-strings\n", 21},
- {"junk: `%c'", 22},
- {"junk: `\\%03o'", 23},
- {"\
-Assembly language:\n\
- -c,--comment=CHARS Any of CHARS starts a comment until end-of-line\n\
- -k,--keep=CHARS Allow CHARS in tokens, and keep the result\n\
- -i,--ignore=CHARS Allow CHARS in tokens, and toss the result\n\
- -u,--strip-underscore Strip a leading underscore from tokens\n\
- -n,--no-cpp Don't handle C pre-processor directives\n", 24},
- {"\
-Text language:\n\
- -i,--include=CHAR-CLASS Treat characters of CHAR-CLASS as token \
-constituents\n\
- -x,--exclude=CHAR-CLASS Treat characters of CHAR-CLASS as token \
-delimiters\n", 25},
- {"can't read directory `%s' (`.' from `%s')", 26},
- {"notice: `%s' was a %s, but is now a %s!", 27},
- {"file", 28},
- {"directory", 29},
- {"warning: `%s' and `%s' are the same file, but yield different scans!", 30},
- {"notice: scan parameters changed for `%s'", 31},
- {"can't get working directory", 32},
- {"can't chdir to `%s'", 33},
- {"can't chdir to `%s' from `%s'", 34},
- {"can't lstat `%s' from `%s'", 35},
- {"can't stat `%s' from `%s'", 36},
- {"%s: option `%s' is ambiguous\n", 37},
- {"%s: option `--%s' doesn't allow an argument\n", 38},
- {"%s: option `%c%s' doesn't allow an argument\n", 39},
- {"%s: option `%s' requires an argument\n", 40},
- {"%s: unrecognized option `--%s'\n", 41},
- {"%s: unrecognized option `%c%s'\n", 42},
- {"%s: illegal option -- %c\n", 43},
- {"%s: invalid option -- %c\n", 44},
- {"%s: option requires an argument -- %c\n", 45},
- {"Try `%s --help' for more information.\n", 46},
- {"Usage: %s [OPTION] FILENAME [FILENAME2]\n", 47},
- {"\
-List identifiers that occur in FILENAME, or if FILENAME2 is\n\
-also given list the identifiers that occur in both files.\n\
-\n\
- -f, --file=FILE file name of ID database\n\
- --help display this help and exit\n\
- --version output version information and exit\n", 48},
- {"no file name arguments", 49},
- {"too many file name arguments", 50},
- {"can't locate `ID'", 51},
- {"`%s' is ambiguous", 52},
- {"`%s' not found", 53},
- {"Usage: %s [OPTION]... [PATTERN]...\n", 54},
- {"\
-Print constituent file names that match PATTERN,\n\
-using shell-style wildcards.\n\
- -f, --file=FILE file name of ID database\n\
- -S, --separator=STYLE STYLE is one of `braces', `space' or `newline'\n\
- --help display this help and exit\n\
- --version output version information and exit\n", 55},
- {"Usage: %s [OPTION]... PATTERN...\n", 56},
- {"\
-Query ID database and report results.\n\
-By default, output consists of multiple lines, each line containing the\n\
-matched identifier followed by the list of file names in which it occurs.\n\
-\n\
- -f, --file=FILE file name of ID database\n\
-\n\
- -i, --ignore-case match PATTERN case insensitively\n\
- -l, --literal match PATTERN as a literal string\n\
- -r, --regexp match PATTERN as a regular expression\n\
- -w, --word match PATTERN as a delimited word\n\
- -s, --substring match PATTERN as a substring\n\
- Note: If PATTERN contains extended regular expression meta-\n\
- characters, it is interpreted as a regular expression \
-substring.\n\
- Otherwise, PATTERN is interpreted as a literal word.\n\
-\n\
- -k, --key=STYLE STYLE is one of `token', `pattern' or `none'\n\
- -R, --result=STYLE STYLE is one of `filenames', `grep', `edit' or \
-`none'\n\
- -S, --separator=STYLE STYLE is one of `braces', `space' or `newline' and\n\
- only applies to file names when \
-`--result=filenames'\n\
- The above STYLE options control how query results are \
-presented.\n\
- Defaults are --key=token --result=filenames --separator=%s\n\
-\n\
- -F, --frequency=FREQ find tokens that occur FREQ times, where FREQ\n\
- is a range expressed as `N..M'. If N is omitted, \
-it\n\
- defaults to 1, if M is omitted it defaults to \
-MAX_USHRT\n\
- -a, --ambiguous=LEN find tokens whose names are ambiguous for LEN chars\n\
-\n\
- -x, --hex only find numbers expressed as hexadecimal\n\
- -d, --decimal only find numbers expressed as decimal\n\
- -o, --octal only find numbers expressed as octal\n\
- By default, searches match numbers of any radix.\n\
-\n\
- --help display this help and exit\n\
- --version output version information and exit\n", 57},
- {"braces", 58},
- {"space", 59},
- {"notice: use of `-e' is deprecated, use `-r' instead", 60},
- {"All identifiers are non-ambiguous within the first %d characters\n", 61},
- {"invalid `--key' style: `%s'", 62},
- {"invalid `--result' style: `%s'", 63},
- {"edit? [y1-9^S/nq] ", 64},
- {"can't fork", 65},
- {"can't exec `%s'", 66},
- {"can't match regular-expression: memory exhausted", 67},
- {"Usage: %s [OPTION]... [FILE]...\n", 68},
- {"\
-Build an identifier database.\n\
- -o, --output=OUTFILE file name of ID database output\n\
- -f, --file=OUTFILE synonym for --output\n\
- -i, --include=LANGS include languages in LANGS (default: \"C C++ \
-asm\")\n\
- -x, --exclude=LANGS exclude languages in LANGS\n\
- -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n\
- -m, --lang-map=MAPFILE use MAPFILE to map file names onto source \
-language\n\
- -d, --default-lang=LANG make LANG the default source language\n\
- -p, --prune=NAMES exclude the named files and/or directories\n\
- -v, --verbose report per file statistics\n\
- -s, --statistics report statistics at end of run\n\
-\n\
- --help display this help and exit\n\
- --version output version information and exit\n\
-\n\
-FILE may be a file name, or a directory name to recursively search.\n\
-If no FILE is given, the current directory is searched by default.\n\
-Note that the `--include' and `--exclude' options are mutually-exclusive.\n\
-\n\
-The following arguments apply to the language-specific scanners:\n", 69},
- {"can't create `%s' in `%s'", 70},
- {"can't modify `%s'", 71},
- {"can't stat `%s'", 72},
- {" new = %d/%d", 73},
- {"Name=%ld, ", 74},
- {"Number=%ld, ", 75},
- {"String=%ld, ", 76},
- {"Literal=%ld, ", 77},
- {"Comment=%ld\n", 78},
- {"Files=%d, ", 79},
- {"Tokens=%ld, ", 80},
- {"Bytes=%ld Kb, ", 81},
- {"Heap=%ld+%ld Kb, ", 82},
- {"Output=%ld (%ld tok, %ld hit)\n", 83},
- {", Freq=%ld/%ld=%.2f\n", 84},
- {"Sorting tokens...\n", 85},
- {"Writing `%s'...\n", 86},
- {"can't create `%s'", 87},
- {"level %d: %ld/%ld = %.0f%%\n", 88},
- {"\
-Print all tokens found in a source file.\n\
- -i, --include=LANGS include languages in LANGS (default: \"C C++ \
-asm\")\n\
- -x, --exclude=LANGS exclude languages in LANGS\n\
- -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n\
- -m, --lang-map=MAPFILE use MAPFILE to map file names onto source \
-language\n\
- -d, --default-lang=LANG make LANG the default source language\n\
- -p, --prune=NAMES exclude the named files and/or directories\n\
- --help display this help and exit\n\
- --version output version information and exit\n\
-\n\
-The following arguments apply to the language-specific scanners:\n", 89},
-};
-
-int _msg_tbl_length = 89;
Binary files baseline/fsf/id-utils/po/de.gmo and amiga/fsf/id-utils/po/de.gmo differ
Binary files baseline/fsf/id-utils/po/fr.gmo and amiga/fsf/id-utils/po/fr.gmo differ
diff -rup --new-file baseline/fsf/id-utils/po/id-utils.pot amiga/fsf/id-utils/po/id-utils.pot
--- baseline/fsf/id-utils/po/id-utils.pot Tue Aug 6 20:24:27 1996
+++ amiga/fsf/id-utils/po/id-utils.pot Wed Dec 31 17:00:00 1969
@@ -1,538 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1996-08-06 23:24-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: libidu/hash.c:52
-#, c-format
-msgid "can't allocate %ld bytes for hash table: memory exhausted"
-msgstr ""
-
-#: libidu/hash.c:247
-msgid "Load=%ld/%ld=%.0f%%, "
-msgstr ""
-
-#: libidu/hash.c:249
-#, c-format
-msgid "Rehash=%d, "
-msgstr ""
-
-#: libidu/hash.c:250
-msgid "Collisions=%ld/%ld=%.0f%%"
-msgstr ""
-
-#: libidu/idfile.c:106
-msgid "can't determine the io_size of a string!"
-msgstr ""
-
-#: libidu/idread.c:45 src/mkid.c:386 src/xtokid.c:214
-#, c-format
-msgid "can't open `%s'"
-msgstr ""
-
-#: libidu/idread.c:64
-#, c-format
-msgid "`%s' is not an ID file! (bad magic #)"
-msgstr ""
-
-#: libidu/idread.c:66
-#, c-format
-msgid "`%s' is version %d, but I only grok version %d"
-msgstr ""
-
-#: libidu/idread.c:186
-#, c-format
-msgid "unsupported size in io_read (): %d"
-msgstr ""
-
-#: libidu/idread.c:194 libidu/idwrite.c:167
-#, c-format
-msgid "unknown I/O type: %d"
-msgstr ""
-
-#: libidu/idwrite.c:156
-#, c-format
-msgid "unsupported size in io_write (): %d"
-msgstr ""
-
-#: libidu/scanners.c:93
-#, c-format
-msgid "unrecognized language: `%s'"
-msgstr ""
-
-#: libidu/scanners.c:139
-msgid "can't allocate language args obstack: memory exhausted"
-msgstr ""
-
-#: libidu/scanners.c:193 libidu/scanners.c:262
-msgid "can't allocate language args: memory exhausted"
-msgstr ""
-
-#: libidu/scanners.c:201
-#, c-format
-msgid "language name expected following `%s' in file `%s'"
-msgstr ""
-
-#: libidu/scanners.c:256
-#, c-format
-msgid "can't open language map file `%s'"
-msgstr ""
-
-#: libidu/scanners.c:258
-#, c-format
-msgid "can't get size of map file `%s'"
-msgstr ""
-
-#: libidu/scanners.c:268
-#, c-format
-msgid "can't read language map file `%s'"
-msgstr ""
-
-#: libidu/scanners.c:271
-#, c-format
-msgid "can't read entire language map file `%s'"
-msgstr ""
-
-#: libidu/scanners.c:412
-msgid ""
-"C language:\n"
-" -k,--keep=CHARS Allow CHARS in single-token strings, keep the "
-"result\n"
-" -i,--ignore=CHARS Allow CHARS in single-token strings, toss the "
-"result\n"
-" -u,--strip-underscore Strip a leading underscore from single-token "
-"strings\n"
-msgstr ""
-
-#: libidu/scanners.c:681 libidu/scanners.c:986 libidu/scanners.c:1190
-#, c-format
-msgid "junk: `%c'"
-msgstr ""
-
-#: libidu/scanners.c:683 libidu/scanners.c:988 libidu/scanners.c:1192
-#, c-format
-msgid "junk: `\\%03o'"
-msgstr ""
-
-#: libidu/scanners.c:787
-msgid ""
-"Assembly language:\n"
-" -c,--comment=CHARS Any of CHARS starts a comment until end-of-line\n"
-" -k,--keep=CHARS Allow CHARS in tokens, and keep the result\n"
-" -i,--ignore=CHARS Allow CHARS in tokens, and toss the result\n"
-" -u,--strip-underscore Strip a leading underscore from tokens\n"
-" -n,--no-cpp Don't handle C pre-processor directives\n"
-msgstr ""
-
-#: libidu/scanners.c:1092
-msgid ""
-"Text language:\n"
-" -i,--include=CHAR-CLASS Treat characters of CHAR-CLASS as token "
-"constituents\n"
-" -x,--exclude=CHAR-CLASS Treat characters of CHAR-CLASS as token "
-"delimiters\n"
-msgstr ""
-
-#: libidu/walker.c:103
-#, c-format
-msgid "can't read directory `%s' (`.' from `%s')"
-msgstr ""
-
-#: libidu/walker.c:170
-#, c-format
-msgid "notice: `%s' was a %s, but is now a %s!"
-msgstr ""
-
-#: libidu/walker.c:171 libidu/walker.c:172
-msgid "file"
-msgstr ""
-
-#: libidu/walker.c:171 libidu/walker.c:172
-msgid "directory"
-msgstr ""
-
-#: libidu/walker.c:291
-#, c-format
-msgid "warning: `%s' and `%s' are the same file, but yield different scans!"
-msgstr ""
-
-#: libidu/walker.c:385
-#, c-format
-msgid "notice: scan parameters changed for `%s'"
-msgstr ""
-
-#: libidu/walker.c:580
-msgid "can't get working directory"
-msgstr ""
-
-#: libidu/walker.c:637
-#, c-format
-msgid "can't chdir to `%s'"
-msgstr ""
-
-#: libidu/walker.c:642
-#, c-format
-msgid "can't chdir to `%s' from `%s'"
-msgstr ""
-
-#: libidu/walker.c:696
-#, c-format
-msgid "can't lstat `%s' from `%s'"
-msgstr ""
-
-#: libidu/walker.c:704
-#, c-format
-msgid "can't stat `%s' from `%s'"
-msgstr ""
-
-#: lib/getopt.c:527
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: lib/getopt.c:550
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: lib/getopt.c:555
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: lib/getopt.c:598
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: lib/getopt.c:602
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:627
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: lib/getopt.c:630
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: lib/getopt.c:666
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: src/fid.c:70 src/fnid.c:49 src/lid.c:237 src/mkid.c:120 src/xtokid.c:43
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr ""
-
-#: src/fid.c:78
-#, c-format
-msgid "Usage: %s [OPTION] FILENAME [FILENAME2]\n"
-msgstr ""
-
-#: src/fid.c:81
-msgid ""
-"List identifiers that occur in FILENAME, or if FILENAME2 is\n"
-"also given list the identifiers that occur in both files.\n"
-"\n"
-" -f, --file=FILE file name of ID database\n"
-" --help display this help and exit\n"
-" --version output version information and exit\n"
-msgstr ""
-
-#: src/fid.c:141
-msgid "no file name arguments"
-msgstr ""
-
-#: src/fid.c:146
-msgid "too many file name arguments"
-msgstr ""
-
-#: src/fid.c:153 src/fnid.c:147 src/lid.c:410
-msgid "can't locate `ID'"
-msgstr ""
-
-#: src/fid.c:235
-#, c-format
-msgid "`%s' is ambiguous"
-msgstr ""
-
-#: src/fid.c:241
-#, c-format
-msgid "`%s' not found"
-msgstr ""
-
-#: src/fnid.c:66
-#, c-format
-msgid "Usage: %s [OPTION]... [PATTERN]...\n"
-msgstr ""
-
-#: src/fnid.c:70
-msgid ""
-"Print constituent file names that match PATTERN,\n"
-"using shell-style wildcards.\n"
-" -f, --file=FILE file name of ID database\n"
-" -S, --separator=STYLE STYLE is one of `braces', `space' or `newline'\n"
-" --help display this help and exit\n"
-" --version output version information and exit\n"
-msgstr ""
-
-#: src/lid.c:245
-#, c-format
-msgid "Usage: %s [OPTION]... PATTERN...\n"
-msgstr ""
-
-#: src/lid.c:249
-#, c-format
-msgid ""
-"Query ID database and report results.\n"
-"By default, output consists of multiple lines, each line containing the\n"
-"matched identifier followed by the list of file names in which it occurs.\n"
-"\n"
-" -f, --file=FILE file name of ID database\n"
-"\n"
-" -i, --ignore-case match PATTERN case insensitively\n"
-" -l, --literal match PATTERN as a literal string\n"
-" -r, --regexp match PATTERN as a regular expression\n"
-" -w, --word match PATTERN as a delimited word\n"
-" -s, --substring match PATTERN as a substring\n"
-" Note: If PATTERN contains extended regular expression meta-\n"
-" characters, it is interpreted as a regular expression "
-"substring.\n"
-" Otherwise, PATTERN is interpreted as a literal word.\n"
-"\n"
-" -k, --key=STYLE STYLE is one of `token', `pattern' or `none'\n"
-" -R, --result=STYLE STYLE is one of `filenames', `grep', `edit' or "
-"`none'\n"
-" -S, --separator=STYLE STYLE is one of `braces', `space' or `newline' and\n"
-" only applies to file names when "
-"`--result=filenames'\n"
-" The above STYLE options control how query results are "
-"presented.\n"
-" Defaults are --key=token --result=filenames --separator=%s\n"
-"\n"
-" -F, --frequency=FREQ find tokens that occur FREQ times, where FREQ\n"
-" is a range expressed as `N..M'. If N is omitted, "
-"it\n"
-" defaults to 1, if M is omitted it defaults to "
-"MAX_USHRT\n"
-" -a, --ambiguous=LEN find tokens whose names are ambiguous for LEN chars\n"
-"\n"
-" -x, --hex only find numbers expressed as hexadecimal\n"
-" -d, --decimal only find numbers expressed as decimal\n"
-" -o, --octal only find numbers expressed as octal\n"
-" By default, searches match numbers of any radix.\n"
-"\n"
-" --help display this help and exit\n"
-" --version output version information and exit\n"
-msgstr ""
-
-#: src/lid.c:285
-msgid "braces"
-msgstr ""
-
-#: src/lid.c:285
-msgid "space"
-msgstr ""
-
-#: src/lid.c:351
-msgid "notice: use of `-e' is deprecated, use `-r' instead"
-msgstr ""
-
-#: src/lid.c:431
-#, c-format
-msgid "All identifiers are non-ambiguous within the first %d characters\n"
-msgstr ""
-
-#: src/lid.c:466
-#, c-format
-msgid "invalid `--key' style: `%s'"
-msgstr ""
-
-#: src/lid.c:478
-#, c-format
-msgid "invalid `--result' style: `%s'"
-msgstr ""
-
-#. FIXME: i18n of responses
-#: src/lid.c:634
-msgid "edit? [y1-9^S/nq] "
-msgstr ""
-
-#: src/lid.c:703
-msgid "can't fork"
-msgstr ""
-
-#: src/lid.c:721
-#, c-format
-msgid "can't exec `%s'"
-msgstr ""
-
-#: src/lid.c:851
-msgid "can't match regular-expression: memory exhausted"
-msgstr ""
-
-#: src/mkid.c:145 src/xtokid.c:64
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]...\n"
-msgstr ""
-
-#: src/mkid.c:149
-msgid ""
-"Build an identifier database.\n"
-" -o, --output=OUTFILE file name of ID database output\n"
-" -f, --file=OUTFILE synonym for --output\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
-" -x, --exclude=LANGS exclude languages in LANGS\n"
-" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
-" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
-"language\n"
-" -d, --default-lang=LANG make LANG the default source language\n"
-" -p, --prune=NAMES exclude the named files and/or directories\n"
-" -v, --verbose report per file statistics\n"
-" -s, --statistics report statistics at end of run\n"
-"\n"
-" --help display this help and exit\n"
-" --version output version information and exit\n"
-"\n"
-"FILE may be a file name, or a directory name to recursively search.\n"
-"If no FILE is given, the current directory is searched by default.\n"
-"Note that the `--include' and `--exclude' options are mutually-exclusive.\n"
-"\n"
-"The following arguments apply to the language-specific scanners:\n"
-msgstr ""
-
-#: src/mkid.c:311
-#, c-format
-msgid "can't create `%s' in `%s'"
-msgstr ""
-
-#: src/mkid.c:315
-#, c-format
-msgid "can't modify `%s'"
-msgstr ""
-
-#: src/mkid.c:368
-#, c-format
-msgid "can't stat `%s'"
-msgstr ""
-
-#: src/mkid.c:435
-#, c-format
-msgid " new = %d/%d"
-msgstr ""
-
-#: src/mkid.c:444
-#, c-format
-msgid "Name=%ld, "
-msgstr ""
-
-#: src/mkid.c:445
-#, c-format
-msgid "Number=%ld, "
-msgstr ""
-
-#: src/mkid.c:446
-#, c-format
-msgid "String=%ld, "
-msgstr ""
-
-#: src/mkid.c:447
-#, c-format
-msgid "Literal=%ld, "
-msgstr ""
-
-#: src/mkid.c:448
-#, c-format
-msgid "Comment=%ld\n"
-msgstr ""
-
-#: src/mkid.c:450
-#, c-format
-msgid "Files=%d, "
-msgstr ""
-
-#: src/mkid.c:451
-#, c-format
-msgid "Tokens=%ld, "
-msgstr ""
-
-#: src/mkid.c:452
-#, c-format
-msgid "Bytes=%ld Kb, "
-msgstr ""
-
-#: src/mkid.c:453
-#, c-format
-msgid "Heap=%ld+%ld Kb, "
-msgstr ""
-
-#: src/mkid.c:455
-#, c-format
-msgid "Output=%ld (%ld tok, %ld hit)\n"
-msgstr ""
-
-#: src/mkid.c:458
-#, c-format
-msgid ", Freq=%ld/%ld=%.2f\n"
-msgstr ""
-
-#: src/mkid.c:481
-msgid "Sorting tokens...\n"
-msgstr ""
-
-#: src/mkid.c:487
-#, c-format
-msgid "Writing `%s'...\n"
-msgstr ""
-
-#: src/mkid.c:490
-#, c-format
-msgid "can't create `%s'"
-msgstr ""
-
-#: src/mkid.c:636
-msgid "level %d: %ld/%ld = %.0f%%\n"
-msgstr ""
-
-#: src/xtokid.c:68
-msgid ""
-"Print all tokens found in a source file.\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
-" -x, --exclude=LANGS exclude languages in LANGS\n"
-" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
-" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
-"language\n"
-" -d, --default-lang=LANG make LANG the default source language\n"
-" -p, --prune=NAMES exclude the named files and/or directories\n"
-" --help display this help and exit\n"
-" --version output version information and exit\n"
-"\n"
-"The following arguments apply to the language-specific scanners:\n"
-msgstr ""
diff -rup --new-file baseline/fsf/id-utils/po/stamp-cat-id amiga/fsf/id-utils/po/stamp-cat-id
--- baseline/fsf/id-utils/po/stamp-cat-id Tue Aug 6 20:24:28 1996
+++ amiga/fsf/id-utils/po/stamp-cat-id Wed Dec 31 17:00:00 1969
@@ -1 +0,0 @@
-timestamp
diff -rup --new-file baseline/fsf/id-utils/src/mkid.c amiga/fsf/id-utils/src/mkid.c
--- baseline/fsf/id-utils/src/mkid.c Mon Jul 8 21:19:09 1996
+++ amiga/fsf/id-utils/src/mkid.c Sat Sep 28 00:00:00 1996
@@ -172,15 +172,19 @@ The following arguments apply to the lan
exit (0);
}
+#ifdef HAVE_SBRK
char const *heap_initial;
char const *heap_after_walk;
char const *heap_after_scan;
+#endif
int
main (int argc, char **argv)
{
program_name = argv[0];
+#ifdef HAVE_SBRK
heap_initial = (char const *) sbrk (0);
+#endif
idh.idh_file_name = DEFAULT_ID_FILE_NAME;
/* Set locale according to user's wishes. */
@@ -276,13 +280,17 @@ main (int argc, char **argv)
if (flink)
walk_flink (flink, 0);
}
+#ifdef HAVE_SBRK
heap_after_walk = (char const *) sbrk (0);
+#endif
mark_member_file_links (&idh);
if (idh.idh_member_file_table.ht_fill)
{
scan_files (&idh);
+#ifdef HAVE_SBRK
heap_after_scan = sbrk (0);
+#endif
free_summary_tokens ();
free (token_table.ht_vec);
@@ -450,8 +458,10 @@ report_statistics (void)
printf (_("Files=%d, "), idh.idh_files);
printf (_("Tokens=%ld, "), occurrences);
printf (_("Bytes=%ld Kb, "), input_chars / 1024);
+#ifdef HAVE_SBRK
printf (_("Heap=%ld+%ld Kb, "), (heap_after_scan - heap_after_walk) / 1024,
(heap_after_walk - heap_initial) / 1024);
+#endif
printf (_("Output=%ld (%ld tok, %ld hit)\n"), output_length, tokens_length, hits_length);
hash_print_stats (&token_table, stdout);