[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs ChangeLog Makefile.in aclocal.m4 config.h....
|
From: |
Mark D. Baushke |
|
Subject: |
[Cvs-cvs] ccvs ChangeLog Makefile.in aclocal.m4 config.h.... |
|
Date: |
Fri, 22 Sep 2006 17:54:43 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Mark D. Baushke <mdb> 06/09/22 17:54:41
Modified files:
. : ChangeLog Makefile.in aclocal.m4 config.h.in
configure configure.in
contrib : Makefile.in
contrib/pam : Makefile.in
diff : Makefile.in
doc : Makefile.in
doc/i18n : Makefile.in
doc/i18n/pt_BR : Makefile.in
lib : ChangeLog Makefile.am Makefile.gnulib
Makefile.in __fpending.c alloca.c allocsa.c
asnprintf.c asprintf.c atexit.c basename.c
canon-host.c canonicalize.c chdir-long.c
chown.c close-stream.c closeout.c creat-safer.c
cycle-check.c dirname.c dup-safer.c dup2.c
error.c exitfail.c fchmodat.c fchown-stub.c
fd-safer.c filenamecat.c fnmatch.c ftruncate.c
gai_strerror.c getaddrinfo.c getcwd.c getdate.c
getdate.y gethostname.c getlogin_r.c
getndelim2.c getnline.c getopt.c getopt1.c
getpass.c gettime.c gettimeofday.c glob.c
inet_ntop.c lchown.c libcvs.dep libcvs.dsp
libcvs.mak lstat.c malloc.c mbchar.c md5.c
memchr.c memmove.c memrchr.c mkdir.c mkdirat.c
mkstemp.c mktime.c nanosleep.c open-safer.c
openat-die.c openat.c pipe-safer.c
printf-args.c printf-parse.c quotearg.c
readlink.c realloc.c regex.c regex_internal.c
rename.c rpmatch.c save-cwd.c setenv.c
snprintf.c strcasecmp.c strdup.c strerror.c
strftime.c stripslash.c strncasecmp.c strndup.c
strnlen.c strnlen1.c strstr.c strtoimax.c
strtol.c tempname.c time_r.c unsetenv.c
vasnprintf.c vasprintf.c xalloc-die.c xgetcwd.c
xgethostname.c xmalloc.c xreadlink.c yesno.c
m4 : ChangeLog getdate.m4 gettext.m4 gnulib-cache.m4
gnulib-comp.m4 inttypes-h.m4 inttypes-pri.m4
inttypes.m4 lib-link.m4 mkstemp.m4 mktime.m4
regex.m4 rename.m4
maint-aux : Makefile.in gnulib-filelist.txt
man : Makefile.in
src : Makefile.in
tools : Makefile.in
vms : Makefile.in
windows-NT : ChangeLog Makefile.in config.h config.h.in
config.h.in.in stamp-chi
windows-NT/SCC : Makefile.in
Added files:
lib : mkstemp.h
Removed files:
lib : pagealign_alloc.c pagealign_alloc.h
m4 : mmap-anon.m4 pagealign_alloc.m4
Log message:
* configure.in: Drop gl_FUNC_MMAP_ANON requirement.
* Makefile.in, configure, aclocal.m4, config.h.in, configure:
Regenerated.
* contrib/Makefile.in: Regenerated.
* contrib/pam/Makefile.in: Ditto.
* diff/Makefile.in: Ditto.
* doc/Makefile.in: Ditto.
* doc/i18n/Makefile.in: Ditto.
* doc/i18n/pt_BR/Makefile.in: Ditto.
* lib/pagealign_alloc.c, lib/pagealign_alloc.h: Removed as no longer
needed.
* lib/Makefile.am: Import changes from...
* lib/Makefile.gnulib: ...this regenerated file.
* lib/Makefile.in, lib/getdate.c: Regenerated.
* lib/libcvs.dep (mkstemp.c): Depends on mkstemp.h now.
(pagealign_alloc.c): Removed.
(openat.c): Added.
* lib/libcvs.dsp (pagealign_alloc.c, lib/pagealign_alloc.h): Ditto.
(mkstemp.h): Added.
(alloca.c, allocsa.c, atexit.c, canonicalize.c, chdir-long.c, chown.c,
creat-safer.c, dup2.c, fchmodat.c, fchown-stub.c, filenamecat.c,
fnmatch_loop.c, ftruncate.c, getnline.c, getpass.c, gettimeofday.c,
lchown.c, memchr.c, memmove.c, mempcpy.c, memrchr.c, mkdir.c,
mkdirat.c, mkstime.c, openat.c, openat-die.c, open-safer.c,
pipe-safer.c, strdup.c, strncasecmp.c, strstr.c, strtoimax.c,
strtol.c, strtoll.c, strtoul.c, strtoull.c, strtoumax.c, waitpid.c,
at-func.c, close-stream.h, fcntl--.h, fcntl-safer.h, getnline.h,
getpass.h, intprops.h, lchown.h, lstat.h, memrchr.h, minmax.h,
openat.h, openat-priv.h, same-inode.h, size_max.h, strftime.h,
strstr.h, verify.h, wait.h, wcwidth.h, xselect.h): Add SOURCE lines.
* lib/libcvs.mak (pagealign_alloc.obj, pagealign_alloc.c): Remove.
* lib/mkstemp.h: New from GNULIB.
* lib/__fpending.c, lib/alloca.c, lib/allocsa.c, lib/asnprintf.c,
lib/asprintf.c, lib/atexit.c, lib/basename.c, lib/canon-host.c,
lib/canonicalize.c, lib/chdir-long.c, lib/chown.c, lib/close-stream.c,
lib/closeout.c, lib/creat-safer.c, lib/cycle-check.c, lib/dirname.c,
lib/dup-safer.c, lib/dup2.c, lib/error.c, lib/exitfail.c,
lib/fchmodat.c, lib/fchown-stub.c, lib/fd-safer.c, lib/filenamecat.c,
lib/fnmatch.c, lib/ftruncate.c, lib/gai_strerror.c, lib/getaddrinfo.c,
lib/getcwd.c, lib/getdate.y, lib/gethostname.c, lib/getlogin_r.c,
lib/getndelim2.c, lib/getnline.c, lib/getopt.c, lib/getopt1.c,
lib/getpass.c, lib/gettime.c, lib/gettimeofday.c, lib/glob.c,
lib/inet_ntop.c, lib/lchown.c, lib/lstat.c, lib/malloc.c,
lib/mbchar.c, lib/md5.c, lib/memchr.c, lib/memmove.c, lib/memrchr.c,
lib/mkdir.c, lib/mkdirat.c, lib/mkstemp.c, lib/mktime.c,
lib/nanosleep.c, lib/open-safer.c, lib/openat-die.c, lib/openat.c,
lib/pipe-safer.c, lib/printf-args.c, lib/printf-parse.c,
lib/quotearg.c, lib/readlink.c, lib/realloc.c, lib/regex.c,
lib/regex_internal.c, lib/rename.c, lib/rpmatch.c, lib/save-cwd.c,
lib/setenv.c, lib/snprintf.c, lib/strcasecmp.c, lib/strdup.c,
lib/strerror.c, lib/strftime.c, lib/stripslash.c, lib/strncasecmp.c,
lib/strndup.c, lib/strnlen.c, lib/strnlen1.c, lib/strstr.c,
lib/strtoimax.c, lib/strtol.c, lib/tempname.c, lib/time_r.c,
lib/unsetenv.c, lib/vasnprintf.c, lib/vasprintf.c, lib/xalloc-die.c,
lib/xgetcwd.c, lib/xgethostname.c, lib/xmalloc.c, lib/xreadlink.c,
lib/yesno.c: Update from GNULIB.
* m4/mmap-anon.m4, m4/pagealign_alloc.m4: Remove as no longer needed.
* m4/getdate.m4, m4/gettext.m4, m4/gnulib-cache.m4, m4/gnulib-comp.m4,
m4/inttypes-h.m4, m4/inttypes-pri.m4, m4/inttypes.m4, m4/lib-link.m4,
m4/mkstemp.m4, m4/mktime.m4, m4/regex.m4, m4/rename.m4: Update from
GNULIB.
* maint-aux/Makefile.in: Regenerated.
* maint-aux/gnulib-filelist.txt: Update from GNULIB.
* man/Makefile.in: Regenerated.
* src/Makefile.in: Ditto.
* tools/Makefile.in: Ditto.
vms/Makefile.in: Ditto.
* windows-NT/config.h.in.in (HAVE_MAP_ANONYMOUS, HAVE_MMAP,
HAVE_POSIX_MEMALIGN, MAP_ANONYMOUS, mkstemp): Remove as unused.
(__MKSTEMP_PREFIX): New define as rpl_.
(getpass): Define as gnu_getpass.
* windows-NT/Makefile, windows-NT/stamp-chi, windows-NT/config.h.in,
windows-NT/config.h: Regenerated.
* windows-NT/SCC/Makefile.in: Ditto.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&r1=1.1345&r2=1.1346
http://cvs.savannah.gnu.org/viewcvs/ccvs/Makefile.in?cvsroot=cvs&r1=1.201&r2=1.202
http://cvs.savannah.gnu.org/viewcvs/ccvs/aclocal.m4?cvsroot=cvs&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/ccvs/config.h.in?cvsroot=cvs&r1=1.221&r2=1.222
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure?cvsroot=cvs&r1=1.478&r2=1.479
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure.in?cvsroot=cvs&r1=1.377&r2=1.378
http://cvs.savannah.gnu.org/viewcvs/ccvs/contrib/Makefile.in?cvsroot=cvs&r1=1.140&r2=1.141
http://cvs.savannah.gnu.org/viewcvs/ccvs/contrib/pam/Makefile.in?cvsroot=cvs&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/ccvs/diff/Makefile.in?cvsroot=cvs&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/Makefile.in?cvsroot=cvs&r1=1.156&r2=1.157
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/i18n/Makefile.in?cvsroot=cvs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/i18n/pt_BR/Makefile.in?cvsroot=cvs&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/ChangeLog?cvsroot=cvs&r1=1.548&r2=1.549
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.am?cvsroot=cvs&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.gnulib?cvsroot=cvs&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.in?cvsroot=cvs&r1=1.223&r2=1.224
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/__fpending.c?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/alloca.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/allocsa.c?cvsroot=cvs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/asnprintf.c?cvsroot=cvs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/asprintf.c?cvsroot=cvs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/atexit.c?cvsroot=cvs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/basename.c?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/canon-host.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/canonicalize.c?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/chdir-long.c?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/chown.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/close-stream.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/closeout.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/creat-safer.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/cycle-check.c?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/dirname.c?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/dup-safer.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/dup2.c?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/error.c?cvsroot=cvs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/exitfail.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/fchmodat.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/fchown-stub.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/fd-safer.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/filenamecat.c?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/fnmatch.c?cvsroot=cvs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/ftruncate.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/gai_strerror.c?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getaddrinfo.c?cvsroot=cvs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getcwd.c?cvsroot=cvs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getdate.c?cvsroot=cvs&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getdate.y?cvsroot=cvs&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/gethostname.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getlogin_r.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getndelim2.c?cvsroot=cvs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getnline.c?cvsroot=cvs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getopt.c?cvsroot=cvs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getopt1.c?cvsroot=cvs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getpass.c?cvsroot=cvs&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/gettime.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/gettimeofday.c?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/glob.c?cvsroot=cvs&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/inet_ntop.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/lchown.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/libcvs.dep?cvsroot=cvs&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/libcvs.dsp?cvsroot=cvs&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/libcvs.mak?cvsroot=cvs&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/lstat.c?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/malloc.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/mbchar.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/md5.c?cvsroot=cvs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/memchr.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/memmove.c?cvsroot=cvs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/memrchr.c?cvsroot=cvs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/mkdir.c?cvsroot=cvs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/mkdirat.c?cvsroot=cvs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/mkstemp.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/mktime.c?cvsroot=cvs&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/nanosleep.c?cvsroot=cvs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/open-safer.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/openat-die.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/openat.c?cvsroot=cvs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/pipe-safer.c?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/printf-args.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/printf-parse.c?cvsroot=cvs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/quotearg.c?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/readlink.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/realloc.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/regex.c?cvsroot=cvs&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/regex_internal.c?cvsroot=cvs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/rename.c?cvsroot=cvs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/rpmatch.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/save-cwd.c?cvsroot=cvs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/setenv.c?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/snprintf.c?cvsroot=cvs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strcasecmp.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strdup.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strerror.c?cvsroot=cvs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strftime.c?cvsroot=cvs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/stripslash.c?cvsroot=cvs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strncasecmp.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strndup.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strnlen.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strnlen1.c?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strstr.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strtoimax.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strtol.c?cvsroot=cvs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/tempname.c?cvsroot=cvs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/time_r.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/unsetenv.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/vasnprintf.c?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/vasprintf.c?cvsroot=cvs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/xalloc-die.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/xgetcwd.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/xgethostname.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/xmalloc.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/xreadlink.c?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/yesno.c?cvsroot=cvs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/mkstemp.h?cvsroot=cvs&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/pagealign_alloc.c?cvsroot=cvs&r1=1.5&r2=0
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/pagealign_alloc.h?cvsroot=cvs&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/ChangeLog?cvsroot=cvs&r1=1.188&r2=1.189
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/getdate.m4?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/gettext.m4?cvsroot=cvs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/gnulib-cache.m4?cvsroot=cvs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/gnulib-comp.m4?cvsroot=cvs&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/inttypes-h.m4?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/inttypes-pri.m4?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/inttypes.m4?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/lib-link.m4?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/mkstemp.m4?cvsroot=cvs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/mktime.m4?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/regex.m4?cvsroot=cvs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/rename.m4?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/mmap-anon.m4?cvsroot=cvs&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/pagealign_alloc.m4?cvsroot=cvs&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/ccvs/maint-aux/Makefile.in?cvsroot=cvs&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/ccvs/maint-aux/gnulib-filelist.txt?cvsroot=cvs&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/ccvs/man/Makefile.in?cvsroot=cvs&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/Makefile.in?cvsroot=cvs&r1=1.183&r2=1.184
http://cvs.savannah.gnu.org/viewcvs/ccvs/tools/Makefile.in?cvsroot=cvs&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/ccvs/vms/Makefile.in?cvsroot=cvs&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/ChangeLog?cvsroot=cvs&r1=1.390&r2=1.391
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/Makefile.in?cvsroot=cvs&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h?cvsroot=cvs&r1=1.211&r2=1.212
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h.in?cvsroot=cvs&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h.in.in?cvsroot=cvs&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/stamp-chi?cvsroot=cvs&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/SCC/Makefile.in?cvsroot=cvs&r1=1.95&r2=1.96
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.1345
retrieving revision 1.1346
diff -u -b -r1.1345 -r1.1346
--- ChangeLog 12 Sep 2006 20:31:17 -0000 1.1345
+++ ChangeLog 22 Sep 2006 17:54:38 -0000 1.1346
@@ -1,3 +1,11 @@
+2006-09-22 Mark D. Baushke <address@hidden>
+
+ * configure.in: Drop gl_FUNC_MMAP_ANON requirement.
+ * Makefile.in, configure, aclocal.m4, config.h.in, configure:
+ Regenerated.
+ * maint-aux/Makefile.in: Ditto.
+ * maint-aux/gnulib-filelist.txt: Update from GNULIB.
+
2006-09-12 Derek Price <address@hidden>
* NEWS: Note new %T commitinfo flag.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/Makefile.in,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -b -r1.201 -r1.202
--- Makefile.in 2 Sep 2006 23:17:59 -0000 1.201
+++ Makefile.in 22 Sep 2006 17:54:38 -0000 1.202
@@ -97,7 +97,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -110,9 +109,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -245,6 +243,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/aclocal.m4,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- aclocal.m4 2 Sep 2006 23:17:59 -0000 1.163
+++ aclocal.m4 22 Sep 2006 17:54:38 -0000 1.164
@@ -977,7 +977,6 @@
m4_include([m4/iconv.m4])
m4_include([m4/inet_ntop.m4])
m4_include([m4/intmax_t.m4])
-m4_include([m4/inttypes-h.m4])
m4_include([m4/inttypes-pri.m4])
m4_include([m4/inttypes.m4])
m4_include([m4/inttypes_h.m4])
@@ -1002,12 +1001,10 @@
m4_include([m4/mkdir-slash.m4])
m4_include([m4/mkstemp.m4])
m4_include([m4/mktime.m4])
-m4_include([m4/mmap-anon.m4])
m4_include([m4/nanosleep.m4])
m4_include([m4/netinet_in_h.m4])
m4_include([m4/nls.m4])
m4_include([m4/openat.m4])
-m4_include([m4/pagealign_alloc.m4])
m4_include([m4/pathmax.m4])
m4_include([m4/po.m4])
m4_include([m4/progtest.m4])
Index: config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/config.h.in,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -b -r1.221 -r1.222
--- config.h.in 2 Sep 2006 23:17:59 -0000 1.221
+++ config.h.in 22 Sep 2006 17:54:38 -0000 1.222
@@ -585,10 +585,6 @@
to 0 otherwise. */
#undef HAVE_MALLOC
-/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including
- config.h and <sys/mman.h>. */
-#undef HAVE_MAP_ANONYMOUS
-
/* Define to 1 if you have the `mblen' function. */
#undef HAVE_MBLEN
@@ -631,12 +627,6 @@
/* Define to 1 if you have the `mknod' function. */
#undef HAVE_MKNOD
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
/* Define to 1 if you have the `nanotime' function. */
#undef HAVE_NANOTIME
@@ -677,9 +667,6 @@
/* Define to 1 if you have the `pipe' function. */
#undef HAVE_PIPE
-/* Define to 1 if you have the `posix_memalign' function. */
-#undef HAVE_POSIX_MEMALIGN
-
/* Define to 1 if the `printf' function supports the %p format for printing
pointers. */
#undef HAVE_PRINTF_PTR
@@ -1038,9 +1025,6 @@
/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
#undef MALLOC_0_IS_NONNULL
-/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
-#undef MAP_ANONYMOUS
-
/* By default, CVS stores its modules and other such items in flat text files
(MY_NDBM enables this). Turning off MY_NDBM causes CVS to look for a
system-supplied ndbm database library and use it instead. That may speed
@@ -1374,6 +1358,9 @@
used. */
#undef __GETOPT_PREFIX
+/* Define to rpl_ if the mkstemp replacement function should be used. */
+#undef __MKSTEMP_PREFIX
+
/* Define to rpl_ if the openat replacement function should be used. */
#undef __OPENAT_PREFIX
@@ -1407,7 +1394,9 @@
/* Define to a replacement function name for getline(). */
#undef getline
-/* Define to a replacement function name for getpass(). */
+/* We want to always use the GNULIB version of getpass which we have in lib,
+ so define getpass to something that won't conflict with any existing system
+ declarations. */
#undef getpass
/* Define to rpl_gettimeofday if the replacement function should be used. */
@@ -1440,9 +1429,6 @@
/* Define to rpl_mkdir if the replacement function should be used. */
#undef mkdir
-/* Define to rpl_mkstemp if the replacement function should be used. */
-#undef mkstemp
-
/* Define to rpl_mktime if the replacement function should be used. */
#undef mktime
Index: configure
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -b -r1.478 -r1.479
--- configure 2 Sep 2006 23:17:59 -0000 1.478
+++ configure 22 Sep 2006 17:54:38 -0000 1.479
@@ -780,6 +780,8 @@
SYS_STAT_H
UNISTD_H
EOVERFLOW
+LIBCVS_LIBDEPS
+LIBCVS_LTLIBDEPS
USE_NLS
MSGFMT
GMSGFMT
@@ -1943,7 +1945,6 @@
ac_func_list="$ac_func_list alarm"
ac_func_list="$ac_func_list siginterrupt"
ac_header_list="$ac_header_list sys/select.h"
-ac_func_list="$ac_func_list posix_memalign"
ac_func_list="$ac_func_list iswprint"
ac_func_list="$ac_func_list mbsinit"
ac_header_list="$ac_header_list locale.h"
@@ -6128,9 +6129,16 @@
found_so=
found_a=
if test $use_additional = yes; then
- if test -n "$shlibext" && test -f
"$additional_libdir/lib$name.$shlibext"; then
+ if test -n "$shlibext" \
+ && { test -f "$additional_libdir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$additional_libdir/lib$name.dll.a"; }; };
then
found_dir="$additional_libdir"
+ if test -f "$additional_libdir/lib$name.$shlibext"; then
found_so="$additional_libdir/lib$name.$shlibext"
+ else
+ found_so="$additional_libdir/lib$name.dll.a"
+ fi
if test -f "$additional_libdir/lib$name.la"; then
found_la="$additional_libdir/lib$name.la"
fi
@@ -6158,9 +6166,16 @@
case "$x" in
-L*)
dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext";
then
+ if test -n "$shlibext" \
+ && { test -f "$dir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$dir/lib$name.dll.a"; }; }; then
found_dir="$dir"
+ if test -f "$dir/lib$name.$shlibext"; then
found_so="$dir/lib$name.$shlibext"
+ else
+ found_so="$dir/lib$name.dll.a"
+ fi
if test -f "$dir/lib$name.la"; then
found_la="$dir/lib$name.la"
fi
@@ -17580,27 +17595,31 @@
- { echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
-if test "${gl_cv_header_inttypes_h+set}" = set; then
+
+for ac_header in inttypes.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
-
- cat >conftest.$ac_ext <<_ACEOF
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <inttypes.h>
-int
-main ()
-{
-
- ;
- return 0;
-}
+$ac_includes_default
+#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -17636,30 +17655,116 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- gl_cv_header_inttypes_h=yes
+ ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- gl_cv_header_inttypes_h=no
+ ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
fi
-{ echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6; }
- if test $gl_cv_header_inttypes_h = yes; then
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INTTYPES_H 1
-_ACEOF
+ ac_header_preproc=no
+fi
- fi
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler,
rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the
preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the
compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be
compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing
prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite
headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf
documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be
Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the
preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result"
>&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler
will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take
precedence" >&2;}
+ ( cat <<\_ASBOX
+## --------------------------------- ##
+## Report this to address@hidden ##
+## --------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
- if test $gl_cv_header_inttypes_h = yes; then
+fi
+
+done
+
+ if test $ac_cv_header_inttypes_h = yes; then
{ echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are
broken" >&5
echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken...
$ECHO_C" >&6; }
if test "${gt_cv_inttypes_pri_broken+set}" = set; then
@@ -18786,6 +18891,8 @@
+
+
{ echo "$as_me:$LINENO: checking for working mktime" >&5
echo $ECHO_N "checking for working mktime... $ECHO_C" >&6; }
if test "${ac_cv_func_working_mktime+set}" = set; then
@@ -18801,11 +18908,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Test program from Paul Eggert and Tony Leneis. */
-#if TIME_WITH_SYS_TIME
+#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
-# if HAVE_SYS_TIME_H
+# ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
@@ -18813,9 +18920,12 @@
#endif
#include <stdlib.h>
-#include <unistd.h>
-#if !HAVE_ALARM
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifndef HAVE_ALARM
# define alarm(X) /* empty */
#endif
@@ -18832,9 +18942,9 @@
};
#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
-/* Fail if mktime fails to convert a date in the spring-forward gap.
+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
Based on a problem report from Andreas Jaeger. */
-static void
+static int
spring_forward_gap ()
{
/* glibc (up to about 1998-10-07) failed this test. */
@@ -18853,29 +18963,27 @@
tm.tm_min = 0;
tm.tm_sec = 0;
tm.tm_isdst = -1;
- if (mktime (&tm) == (time_t)-1)
- exit (1);
+ return mktime (&tm) != (time_t) -1;
}
-static void
+static int
mktime_test1 (now)
time_t now;
{
struct tm *lt;
- if ((lt = localtime (&now)) && mktime (lt) != now)
- exit (1);
+ return ! (lt = localtime (&now)) || mktime (lt) == now;
}
-static void
+static int
mktime_test (now)
time_t now;
{
- mktime_test1 (now);
- mktime_test1 ((time_t) (time_t_max - now));
- mktime_test1 ((time_t) (time_t_min + now));
+ return (mktime_test1 (now)
+ && mktime_test1 ((time_t) (time_t_max - now))
+ && mktime_test1 ((time_t) (time_t_min + now)));
}
-static void
+static int
irix_6_4_bug ()
{
/* Based on code from Ariel Faigon. */
@@ -18888,11 +18996,10 @@
tm.tm_sec = 0;
tm.tm_isdst = -1;
mktime (&tm);
- if (tm.tm_mon != 2 || tm.tm_mday != 31)
- exit (1);
+ return tm.tm_mon == 2 && tm.tm_mday == 31;
}
-static void
+static int
bigtime_test (j)
int j;
{
@@ -18914,8 +19021,39 @@
&& lt->tm_wday == tm.tm_wday
&& ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
== (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
- exit (1);
+ return 0;
}
+ return 1;
+}
+
+static int
+year_2050_test ()
+{
+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
+ ignoring leap seconds. */
+ unsigned long int answer = 2527315200UL;
+
+ struct tm tm;
+ time_t t;
+ tm.tm_year = 2050 - 1900;
+ tm.tm_mon = 2 - 1;
+ tm.tm_mday = 1;
+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
+ tm.tm_isdst = -1;
+
+ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
+ instead of "TZ=America/Vancouver" in order to detect the bug even
+ on systems that don't support the Olson extension, or don't have the
+ full zoneinfo tables installed. */
+ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
+
+ t = mktime (&tm);
+
+ /* Check that the result is either a failure, or close enough
+ to the correct answer that we can assume the discrepancy is
+ due to leap seconds. */
+ return (t == (time_t) -1
+ || (0 < t && answer - 120 <= t && t <= answer + 120));
}
int
@@ -18942,18 +19080,20 @@
putenv (tz_strings[i]);
for (t = 0; t <= time_t_max - delta; t += delta)
- mktime_test (t);
- mktime_test ((time_t) 1);
- mktime_test ((time_t) (60 * 60));
- mktime_test ((time_t) (60 * 60 * 24));
+ if (! mktime_test (t))
+ return 1;
+ if (! (mktime_test ((time_t) 1)
+ && mktime_test ((time_t) (60 * 60))
+ && mktime_test ((time_t) (60 * 60 * 24))))
+ return 1;
for (j = 1; 0 < j; j *= 2)
- bigtime_test (j);
- bigtime_test (j - 1);
+ if (! bigtime_test (j))
+ return 1;
+ if (! bigtime_test (j - 1))
+ return 1;
}
- irix_6_4_bug ();
- spring_forward_gap ();
- exit (0);
+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
}
_ACEOF
rm -f conftest$ac_exeext
@@ -19011,541 +19151,6 @@
- # Check for mmap()
-
-
-for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler,
rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the
preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the
compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be
compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing
prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite
headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf
documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But
Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be
Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the
preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result"
>&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler
will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take
precedence" >&2;}
- ( cat <<\_ASBOX
-## --------------------------------- ##
-## Report this to address@hidden ##
-## --------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_func in getpagesize
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares
$ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-{ echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_mmap_fixed_mapped=no
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
- Here is a matrix of mmap possibilities:
- mmap private not fixed
- mmap private fixed at somewhere currently unmapped
- mmap private fixed at somewhere already mapped
- mmap shared not fixed
- mmap shared fixed at somewhere currently unmapped
- mmap shared fixed at somewhere already mapped
- For private mappings, we should verify that changes cannot be read()
- back from the file, nor mmap's back from the file at a different
- address. (There have been systems where private was not correctly
- implemented like the infamous i386 svr4.0, and systems where the
- VM page cache was not coherent with the file system buffer cache
- like early versions of FreeBSD and possibly contemporary NetBSD.)
- For shared mappings, we should conversely verify that changes get
- propagated back to all the places they're supposed to be.
-
- Grep wants private fixed already mapped.
- The main things grep needs to know about mmap are:
- * does it exist and is it safe to write into the mmap'd area
- * how to use it (BSD variants) */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !STDC_HEADERS && !HAVE_STDLIB_H
-char *malloc ();
-#endif
-
-/* This mess was copied from the GNU getpagesize.h. */
-#if !HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h. */
-# if !HAVE_SYS_PARAM_H
-# define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-# define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-# if HAVE_SYS_PARAM_H
-# include <sys/param.h>
-# ifdef EXEC_PAGESIZE
-# define getpagesize() EXEC_PAGESIZE
-# else /* no EXEC_PAGESIZE */
-# ifdef NBPG
-# define getpagesize() NBPG * CLSIZE
-# ifndef CLSIZE
-# define CLSIZE 1
-# endif /* no CLSIZE */
-# else /* no NBPG */
-# ifdef NBPC
-# define getpagesize() NBPC
-# else /* no NBPC */
-# ifdef PAGESIZE
-# define getpagesize() PAGESIZE
-# endif /* PAGESIZE */
-# endif /* no NBPC */
-# endif /* no NBPG */
-# endif /* no EXEC_PAGESIZE */
-# else /* no HAVE_SYS_PARAM_H */
-# define getpagesize() 8192 /* punt totally */
-# endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-int
-main ()
-{
- char *data, *data2, *data3;
- int i, pagesize;
- int fd;
-
- pagesize = getpagesize ();
-
- /* First, make a file with some known garbage in it. */
- data = (char *) malloc (pagesize);
- if (!data)
- return 1;
- for (i = 0; i < pagesize; ++i)
- *(data + i) = rand ();
- umask (0);
- fd = creat ("conftest.mmap", 0600);
- if (fd < 0)
- return 1;
- if (write (fd, data, pagesize) != pagesize)
- return 1;
- close (fd);
-
- /* Next, try to mmap the file at a fixed address which already has
- something else allocated at it. If we can, also make sure that
- we see the same garbage. */
- fd = open ("conftest.mmap", O_RDWR);
- if (fd < 0)
- return 1;
- data2 = (char *) malloc (2 * pagesize);
- if (!data2)
- return 1;
- data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_FIXED, fd, 0L))
- return 1;
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data2 + i))
- return 1;
-
- /* Finally, make sure that changes to the mapped area do not
- percolate back to the file as seen by read(). (This is a bug on
- some variants of i386 svr4.0.) */
- for (i = 0; i < pagesize; ++i)
- *(data2 + i) = *(data2 + i) + 1;
- data3 = (char *) malloc (pagesize);
- if (!data3)
- return 1;
- if (read (fd, data3, pagesize) != pagesize)
- return 1;
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data3 + i))
- return 1;
- close (fd);
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_mmap_fixed_mapped=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext
conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
-
-fi
-rm -f conftest.mmap
-
-
- # Try to allow MAP_ANONYMOUS.
- gl_have_mmap_anonymous=no
- if test $ac_cv_func_mmap_fixed_mapped = yes; then
- { echo "$as_me:$LINENO: checking for MAP_ANONYMOUS" >&5
-echo $ECHO_N "checking for MAP_ANONYMOUS... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <sys/mman.h>
-#ifdef MAP_ANONYMOUS
- I cant identify this map.
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "I cant identify this map." >/dev/null 2>&1; then
- gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
-
- if test $gl_have_mmap_anonymous != yes; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <sys/mman.h>
-#ifdef MAP_ANON
- I cant identify this map.
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "I cant identify this map." >/dev/null 2>&1; then
-
-cat >>confdefs.h <<\_ACEOF
-#define MAP_ANONYMOUS MAP_ANON
-_ACEOF
-
- gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
-
- fi
- { echo "$as_me:$LINENO: result: $gl_have_mmap_anonymous" >&5
-echo "${ECHO_T}$gl_have_mmap_anonymous" >&6; }
- if test $gl_have_mmap_anonymous = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MAP_ANONYMOUS 1
-_ACEOF
-
- fi
- fi
-
-
-
-
-
-
-
{ echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
@@ -19629,8 +19234,6 @@
-
-
{ echo "$as_me:$LINENO: checking whether snprintf is declared" >&5
echo $ECHO_N "checking whether snprintf is declared... $ECHO_C" >&6; }
if test "${ac_cv_have_decl_snprintf+set}" = set; then
@@ -22035,6 +21638,10 @@
GL_COND_LIBTOOL_FALSE=
fi
+ gl_cond_libtool=false
+ gl_libdeps=
+ gl_ltlibdeps=
+ gl_source_base='lib'
@@ -26697,13 +26304,6 @@
esac
- case " $LIBOBJS " in
- *" getdate.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS getdate.$ac_objext"
- ;;
-esac
-
-
@@ -29321,8 +28921,8 @@
gl_cv_header_working_inttypes_h=no
- if test $gl_cv_header_working_stdint_h = yes \
- && test $gl_cv_header_inttypes_h = yes \
+ if test "$gl_cv_header_working_stdint_h" = yes \
+ && test $ac_cv_header_inttypes_h = yes \
&& test "$ac_cv_have_decl_imaxabs" = yes \
&& test "$ac_cv_have_decl_imaxdiv" = yes \
&& test "$ac_cv_have_decl_strtoimax" = yes \
@@ -30933,136 +30533,17 @@
fi
-for ac_func in mkstemp
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares
$ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
- case " $LIBOBJS " in
- *" $ac_func.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
- ;;
-esac
-
-fi
-done
- if test $ac_cv_func_mkstemp = no; then
- gl_cv_func_mkstemp_limitations=yes
- else
- { echo "$as_me:$LINENO: checking for mkstemp limitations" >&5
-echo $ECHO_N "checking for mkstemp limitations... $ECHO_C" >&6; }
-if test "${gl_cv_func_mkstemp_limitations+set}" = set; then
+ { echo "$as_me:$LINENO: checking for working mkstemp" >&5
+echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6; }
+if test "${gl_cv_func_working_mkstemp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
mkdir conftest.mkstemp
if test "$cross_compiling" = yes; then
- gl_cv_func_mkstemp_limitations=yes
-
+ gl_cv_func_working_mkstemp=no
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -31070,23 +30551,27 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-# include <stdlib.h>
-# include <unistd.h>
- int main ()
- {
- int i;
+$ac_includes_default
+int
+main ()
+{
+int i;
+ off_t large = (off_t) 4294967295u;
+ if (large < 0)
+ large = 2147483647;
for (i = 0; i < 70; i++)
{
char template[] = "conftest.mkstemp/coXXXXXX";
- int fd = mkstemp (template);
- if (fd == -1)
- exit (1);
+ int (*mkstemp_function) (char *) = mkstemp;
+ int fd = mkstemp_function (template);
+ if (fd < 0 || lseek (fd, large, SEEK_SET) != large)
+ return 1;
close (fd);
}
- exit (0);
- }
-
+ return 0;
+ ;
+ return 0;
+}
_ACEOF
rm -f conftest$ac_exeext
if { (ac_try="$ac_link"
@@ -31108,14 +30593,14 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- gl_cv_func_mkstemp_limitations=no
+ gl_cv_func_working_mkstemp=yes
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-gl_cv_func_mkstemp_limitations=yes
+gl_cv_func_working_mkstemp=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext
conftest.$ac_objext conftest.$ac_ext
fi
@@ -31123,13 +30608,16 @@
rm -rf conftest.mkstemp
-
fi
-{ echo "$as_me:$LINENO: result: $gl_cv_func_mkstemp_limitations" >&5
-echo "${ECHO_T}$gl_cv_func_mkstemp_limitations" >&6; }
- fi
+{ echo "$as_me:$LINENO: result: $gl_cv_func_working_mkstemp" >&5
+echo "${ECHO_T}$gl_cv_func_working_mkstemp" >&6; }
+
+ if test $gl_cv_func_working_mkstemp != yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define __MKSTEMP_PREFIX rpl_
+_ACEOF
- if test $gl_cv_func_mkstemp_limitations = yes; then
case " $LIBOBJS " in
*" mkstemp.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
@@ -31143,11 +30631,6 @@
esac
-cat >>confdefs.h <<\_ACEOF
-#define mkstemp rpl_mkstemp
-_ACEOF
-
-
@@ -31723,32 +31206,6 @@
- case " $LIBOBJS " in
- *" pagealign_alloc.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS pagealign_alloc.$ac_objext"
- ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -32323,6 +31780,13 @@
+
+
+
+
+
+
+
# Check whether --with-included-regex was given.
if test "${with_included_regex+set}" = set; then
withval=$with_included_regex;
@@ -32353,6 +31817,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ #if HAVE_LOCALE_H
+ #include <locale.h>
+ #endif
#include <limits.h>
#include <regex.h>
@@ -32364,6 +31831,33 @@
int i;
const char *s;
struct re_registers regs;
+
+ #if HAVE_LOCALE_H
+ /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html
+ This test needs valgrind to catch the bug on Debian
+ GNU/Linux 3.1 x86, but it might catch the bug better
+ on other platforms and it shouldn't hurt to try the
+ test here. */
+ if (setlocale (LC_ALL, "en_US.UTF-8"))
+ {
+ static char const pat[] = "insert into";
+ static char const data[] =
+ "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK";
+ re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE
+ | RE_ICASE);
+ memset (®ex, 0, sizeof regex);
+ s = re_compile_pattern (pat, sizeof pat - 1, ®ex);
+ if (s)
+ return 1;
+ if (re_search (®ex, data, sizeof data - 1,
+ 0, sizeof data - 1, ®s)
+ != -1)
+ return 1;
+ if (! setlocale (LC_ALL, "C"))
+ return 1;
+ }
+ #endif
+
re_set_syntax (RE_SYNTAX_POSIX_EGREP);
memset (®ex, 0, sizeof (regex));
for (i = 0; i <= UCHAR_MAX; i++)
@@ -32588,8 +32082,6 @@
-
-
{ echo "$as_me:$LINENO: checking whether isblank is declared" >&5
echo $ECHO_N "checking whether isblank is declared... $ECHO_C" >&6; }
if test "${ac_cv_have_decl_isblank+set}" = set; then
@@ -32683,7 +32175,7 @@
{ echo "$as_me:$LINENO: checking whether rename is broken" >&5
echo $ECHO_N "checking whether rename is broken... $ECHO_C" >&6; }
-if test "${vb_cv_func_rename_trailing_slash_bug+set}" = set; then
+if test "${gl_cv_func_rename_trailing_slash_bug+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -32693,7 +32185,7 @@
echo "$as_me: error: cannot create temporary directory" >&2;}
{ (exit 1); exit 1; }; }
if test "$cross_compiling" = yes; then
- vb_cv_func_rename_trailing_slash_bug=yes
+ gl_cv_func_rename_trailing_slash_bug=yes
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -32731,14 +32223,14 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- vb_cv_func_rename_trailing_slash_bug=no
+ gl_cv_func_rename_trailing_slash_bug=no
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-vb_cv_func_rename_trailing_slash_bug=yes
+gl_cv_func_rename_trailing_slash_bug=yes
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext
conftest.$ac_objext conftest.$ac_ext
fi
@@ -32748,9 +32240,9 @@
rm -rf conftest.d1 conftest.d2
fi
-{ echo "$as_me:$LINENO: result: $vb_cv_func_rename_trailing_slash_bug" >&5
-echo "${ECHO_T}$vb_cv_func_rename_trailing_slash_bug" >&6; }
- if test $vb_cv_func_rename_trailing_slash_bug = yes; then
+{ echo "$as_me:$LINENO: result: $gl_cv_func_rename_trailing_slash_bug" >&5
+echo "${ECHO_T}$gl_cv_func_rename_trailing_slash_bug" >&6; }
+ if test $gl_cv_func_rename_trailing_slash_bug = yes; then
case " $LIBOBJS " in
*" rename.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS rename.$ac_objext"
@@ -39918,6 +39410,10 @@
:
+ LIBCVS_LIBDEPS="$gl_libdeps"
+
+ LIBCVS_LTLIBDEPS="$gl_ltlibdeps"
+
{ echo "$as_me:$LINENO: checking whether NLS is requested" >&5
@@ -40298,9 +39794,16 @@
found_so=
found_a=
if test $use_additional = yes; then
- if test -n "$shlibext" && test -f
"$additional_libdir/lib$name.$shlibext"; then
+ if test -n "$shlibext" \
+ && { test -f "$additional_libdir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$additional_libdir/lib$name.dll.a"; }; };
then
found_dir="$additional_libdir"
+ if test -f "$additional_libdir/lib$name.$shlibext"; then
found_so="$additional_libdir/lib$name.$shlibext"
+ else
+ found_so="$additional_libdir/lib$name.dll.a"
+ fi
if test -f "$additional_libdir/lib$name.la"; then
found_la="$additional_libdir/lib$name.la"
fi
@@ -40328,9 +39831,16 @@
case "$x" in
-L*)
dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext";
then
+ if test -n "$shlibext" \
+ && { test -f "$dir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$dir/lib$name.dll.a"; }; }; then
found_dir="$dir"
+ if test -f "$dir/lib$name.$shlibext"; then
found_so="$dir/lib$name.$shlibext"
+ else
+ found_so="$dir/lib$name.dll.a"
+ fi
if test -f "$dir/lib$name.la"; then
found_la="$dir/lib$name.la"
fi
@@ -41135,9 +40645,16 @@
found_so=
found_a=
if test $use_additional = yes; then
- if test -n "$shlibext" && test -f
"$additional_libdir/lib$name.$shlibext"; then
+ if test -n "$shlibext" \
+ && { test -f "$additional_libdir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$additional_libdir/lib$name.dll.a"; }; };
then
found_dir="$additional_libdir"
+ if test -f "$additional_libdir/lib$name.$shlibext"; then
found_so="$additional_libdir/lib$name.$shlibext"
+ else
+ found_so="$additional_libdir/lib$name.dll.a"
+ fi
if test -f "$additional_libdir/lib$name.la"; then
found_la="$additional_libdir/lib$name.la"
fi
@@ -41165,9 +40682,16 @@
case "$x" in
-L*)
dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext";
then
+ if test -n "$shlibext" \
+ && { test -f "$dir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$dir/lib$name.dll.a"; }; }; then
found_dir="$dir"
+ if test -f "$dir/lib$name.$shlibext"; then
found_so="$dir/lib$name.$shlibext"
+ else
+ found_so="$dir/lib$name.dll.a"
+ fi
if test -f "$dir/lib$name.la"; then
found_la="$dir/lib$name.la"
fi
@@ -42065,7 +41589,6 @@
-
#
# End GNULIB stuff.
#
@@ -55251,6 +54774,8 @@
SYS_STAT_H!$SYS_STAT_H$ac_delim
UNISTD_H!$UNISTD_H$ac_delim
EOVERFLOW!$EOVERFLOW$ac_delim
+LIBCVS_LIBDEPS!$LIBCVS_LIBDEPS$ac_delim
+LIBCVS_LTLIBDEPS!$LIBCVS_LTLIBDEPS$ac_delim
USE_NLS!$USE_NLS$ac_delim
MSGFMT!$MSGFMT$ac_delim
GMSGFMT!$GMSGFMT$ac_delim
@@ -55277,7 +54802,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -55296,7 +54821,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
_ACEOF
sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -55309,8 +54834,6 @@
' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
CEOF$ac_eof
_ACEOF
@@ -55558,7 +55081,7 @@
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed"
>$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed
's/|#_!!_#|//g' >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
Index: configure.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure.in,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -b -r1.377 -r1.378
--- configure.in 12 Aug 2006 17:16:00 -0000 1.377
+++ configure.in 22 Sep 2006 17:54:38 -0000 1.378
@@ -224,7 +224,6 @@
AC_REQUIRE([gt_TYPE_WCHAR_T])
AC_REQUIRE([gt_TYPE_WINT_T])
AC_REQUIRE([gl_AC_TYPE_INTMAX_T])
-AC_REQUIRE([gl_FUNC_MMAP_ANON])
AC_REQUIRE([gl_AC_TYPE_LONG_LONG])])
CCVS_CALL_GNULIB_MACROS_ONCE()
Index: contrib/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/contrib/Makefile.in,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- contrib/Makefile.in 2 Sep 2006 23:17:59 -0000 1.140
+++ contrib/Makefile.in 22 Sep 2006 17:54:38 -0000 1.141
@@ -99,7 +99,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -112,9 +111,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -247,6 +245,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: contrib/pam/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/contrib/pam/Makefile.in,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- contrib/pam/Makefile.in 2 Sep 2006 23:17:59 -0000 1.61
+++ contrib/pam/Makefile.in 22 Sep 2006 17:54:38 -0000 1.62
@@ -86,7 +86,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -99,9 +98,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -213,6 +211,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: diff/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/diff/Makefile.in,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- diff/Makefile.in 2 Sep 2006 23:17:59 -0000 1.109
+++ diff/Makefile.in 22 Sep 2006 17:54:39 -0000 1.110
@@ -75,7 +75,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -88,9 +87,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -222,6 +220,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: doc/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/Makefile.in,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- doc/Makefile.in 2 Sep 2006 23:17:59 -0000 1.156
+++ doc/Makefile.in 22 Sep 2006 17:54:39 -0000 1.157
@@ -93,7 +93,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -106,9 +105,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -243,6 +241,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: doc/i18n/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/i18n/Makefile.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- doc/i18n/Makefile.in 2 Sep 2006 23:17:59 -0000 1.44
+++ doc/i18n/Makefile.in 22 Sep 2006 17:54:39 -0000 1.45
@@ -85,7 +85,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -98,9 +97,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -221,6 +219,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: doc/i18n/pt_BR/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/i18n/pt_BR/Makefile.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- doc/i18n/pt_BR/Makefile.in 2 Sep 2006 23:17:59 -0000 1.45
+++ doc/i18n/pt_BR/Makefile.in 22 Sep 2006 17:54:39 -0000 1.46
@@ -85,7 +85,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -98,9 +97,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -212,6 +210,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: lib/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ChangeLog,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -b -r1.548 -r1.549
--- lib/ChangeLog 6 Sep 2006 15:35:50 -0000 1.548
+++ lib/ChangeLog 22 Sep 2006 17:54:39 -0000 1.549
@@ -1,3 +1,49 @@
+2006-09-22 Mark D. Baushke <address@hidden>
+
+ * pagealign_alloc.c, pagealign_alloc.h: Removed as no longer
+ needed.
+ * Makefile.am: Import changes from...
+ * Makefile.gnulib: ...this regenerated file.
+ * Makefile.in, lib/getdate.c: Regenerated.
+ * libcvs.dep (mkstemp.c): Depends on mkstemp.h now.
+ (pagealign_alloc.c): Removed.
+ (openat.c): Added.
+ * libcvs.dsp (pagealign_alloc.c, pagealign_alloc.h): Removed.
+ (mkstemp.h): Added.
+ (alloca.c, allocsa.c, atexit.c, canonicalize.c, chdir-long.c,
+ chown.c, creat-safer.c, dup2.c, fchmodat.c, fchown-stub.c,
+ filenamecat.c, fnmatch_loop.c, ftruncate.c, getnline.c, getpass.c,
+ gettimeofday.c, lchown.c, memchr.c, memmove.c, mempcpy.c,
+ memrchr.c, mkdir.c, mkdirat.c, mkstime.c, openat.c, openat-die.c,
+ open-safer.c, pipe-safer.c, strdup.c, strncasecmp.c, strstr.c,
+ strtoimax.c, strtol.c, strtoll.c, strtoul.c, strtoull.c,
+ strtoumax.c, waitpid.c, at-func.c, close-stream.h, fcntl--.h,
+ fcntl-safer.h, getnline.h, getpass.h, intprops.h, lchown.h,
+ lstat.h, memrchr.h, minmax.h, openat.h, openat-priv.h,
+ same-inode.h, size_max.h, strftime.h, strstr.h, verify.h, wait.h,
+ wcwidth.h, xselect.h): Add SOURCE lines.
+ * libcvs.mak (pagealign_alloc.obj, pagealign_alloc.c): Remove.
+ * mkstemp.h: New from GNULIB.
+ * __fpending.c, alloca.c, allocsa.c, asnprintf.c, asprintf.c,
+ atexit.c, basename.c, canon-host.c, canonicalize.c, chdir-long.c,
+ chown.c, close-stream.c, closeout.c, creat-safer.c, cycle-check.c,
+ dirname.c, dup-safer.c, dup2.c, error.c, exitfail.c, fchmodat.c,
+ fchown-stub.c, fd-safer.c, filenamecat.c, fnmatch.c, ftruncate.c,
+ gai_strerror.c, getaddrinfo.c, getcwd.c, getdate.y, gethostname.c,
+ getlogin_r.c, getndelim2.c, getnline.c, getopt.c, getopt1.c,
+ getpass.c, gettime.c, gettimeofday.c, glob.c, inet_ntop.c,
+ lchown.c, lstat.c, malloc.c, mbchar.c, md5.c, memchr.c, memmove.c,
+ memrchr.c, mkdir.c, mkdirat.c, mkstemp.c, mktime.c, nanosleep.c,
+ open-safer.c, openat-die.c, openat.c, pipe-safer.c, printf-args.c,
+ printf-parse.c, quotearg.c, readlink.c, realloc.c, regex.c,
+ regex_internal.c, rename.c, rpmatch.c, save-cwd.c, setenv.c,
+ snprintf.c, strcasecmp.c, strdup.c, strerror.c, strftime.c,
+ stripslash.c, strncasecmp.c, strndup.c, strnlen.c, strnlen1.c,
+ strstr.c, strtoimax.c, strtol.c, tempname.c, time_r.c, unsetenv.c,
+ vasnprintf.c, vasprintf.c, xalloc-die.c, xgetcwd.c,
+ xgethostname.c, xmalloc.c, xreadlink.c, yesno.c: Update from
+ GNULIB.
+
2006-09-06 Derek Price <address@hidden>
* .cvsignore: Ignore generated fcntl.h & inttypes.h.
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.am,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- lib/Makefile.am 2 Sep 2006 23:17:59 -0000 1.122
+++ lib/Makefile.am 22 Sep 2006 17:54:39 -0000 1.123
@@ -71,8 +71,8 @@
# We need the following in order to create <alloca.h> when the system
# doesn't have one that works with the given compiler.
alloca.h: alloca_.h
- cp $(srcdir)/alloca_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/alloca_.h address@hidden
+ mv -f address@hidden $@
MOSTLYCLEANFILES += alloca.h alloca.h-t
## end gnulib module alloca-opt
@@ -92,6 +92,7 @@
# doesn't have one.
arpa/inet.h:
test -d arpa || mkdir arpa
+ rm -f address@hidden $@
echo '#include <sys/socket.h>' >address@hidden
mv address@hidden $@
MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
@@ -181,6 +182,7 @@
# We need the following in order to create <fcntl.h> when the system
# doesn't have one that works with the given compiler.
fcntl.h: fcntl_.h
+ rm -f address@hidden $@
sed -e 's|@''ABSOLUTE_FCNTL_H''@|$(ABSOLUTE_FCNTL_H)|g' \
< $(srcdir)/fcntl_.h > address@hidden
mv address@hidden $@
@@ -208,8 +210,8 @@
# We need the following in order to create <fnmatch.h> when the system
# doesn't have one that supports the required API.
fnmatch.h: fnmatch_.h
- cp $(srcdir)/fnmatch_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/fnmatch_.h address@hidden
+ mv -f address@hidden $@
MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
## end gnulib module fnmatch
@@ -253,6 +255,7 @@
$(LIB_CLOCK_GETTIME) \
$(LIBINTL)
+libcvs_a_SOURCES += getdate.y
BUILT_SOURCES += getdate.c
MAINTAINERCLEANFILES += getdate.c
EXTRA_DIST += getdate.c getdate.h
@@ -297,8 +300,8 @@
# We need the following in order to create <getopt.h> when the system
# doesn't have one that works with the given compiler.
getopt.h: getopt_.h
- cp $(srcdir)/getopt_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/getopt_.h address@hidden
+ mv -f address@hidden $@
MOSTLYCLEANFILES += getopt.h getopt.h-t
## end gnulib module getopt
@@ -344,8 +347,8 @@
# doesn't have one that works with the given compiler.
all-local $(libcvs_a_OBJECTS): $(GLOB_H)
glob.h: glob_.h
- cp $(srcdir)/glob_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/glob_.h address@hidden
+ mv -f address@hidden $@
MOSTLYCLEANFILES += glob.h glob.h-t
## end gnulib module glob
@@ -370,6 +373,7 @@
# We need the following in order to create <inttypes.h> when the system
# doesn't have one that works with the given compiler.
inttypes.h: inttypes_.h
+ rm -f address@hidden $@
sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-e 's|@''ABSOLUTE_INTTYPES_H''@|$(ABSOLUTE_INTTYPES_H)|g' \
-e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
@@ -433,6 +437,12 @@
## end gnulib module minmax
+## begin gnulib module mkstemp
+
+EXTRA_DIST += mkstemp.h
+
+## end gnulib module mkstemp
+
## begin gnulib module netinet_in
BUILT_SOURCES += $(NETINET_IN_H)
@@ -441,6 +451,7 @@
# doesn't have one.
netinet/in.h:
test -d netinet || mkdir netinet
+ rm -f address@hidden $@
echo '#include <sys/socket.h>' >address@hidden
mv address@hidden $@
MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
@@ -454,12 +465,6 @@
## end gnulib module openat
-## begin gnulib module pagealign_alloc
-
-EXTRA_DIST += pagealign_alloc.h
-
-## end gnulib module pagealign_alloc
-
## begin gnulib module pathmax
EXTRA_DIST += pathmax.h
@@ -522,6 +527,7 @@
# We need the following in order to create <stdbool.h> when the system
# doesn't have one that works.
stdbool.h: stdbool_.h
+ rm -f address@hidden $@
sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' \
< $(srcdir)/stdbool_.h > address@hidden
mv address@hidden $@
@@ -537,6 +543,7 @@
# We need the following in order to create <stdint.h> when the system
# doesn't have one that works with the given compiler.
stdint.h: stdint_.h
+ rm -f address@hidden $@
sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
-e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
@@ -615,8 +622,8 @@
# doesn't have one that works with the given compiler.
sys/socket.h: socket_.h
test -d sys || mkdir sys
- cp $(srcdir)/socket_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/socket_.h address@hidden
+ mv -f address@hidden $@
MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
MOSTLYCLEANDIRS += sys
@@ -631,6 +638,7 @@
# has one that is incomplete.
sys/stat.h: stat_.h
test -d sys || mkdir sys
+ rm -f address@hidden $@
sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \
< $(srcdir)/stat_.h > address@hidden
mv address@hidden $@
Index: lib/Makefile.gnulib
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.gnulib,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- lib/Makefile.gnulib 2 Sep 2006 23:17:59 -0000 1.85
+++ lib/Makefile.gnulib 22 Sep 2006 17:54:39 -0000 1.86
@@ -8,14 +8,14 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libcvs --source-base=lib
--m4-base=m4 --doc-base=doc --aux-dir=build-aux --no-libtool --macro-prefix=gl
allocsa atexit base64 canon-host canonicalize closeout dirname dup2 error exit
exitfail extensions fnmatch fnmatch-posix ftruncate getdate gethostname getline
getlogin_r getndelim2 getnline getopt getpagesize getpass-gnu gettext gettime
gettimeofday glob inttypes lstat malloc md5 memmove minmax mkdir mkstemp mktime
nanosleep pagealign_alloc pathmax quotearg readlink realloc regex rename
save-cwd setenv stat-macros stdbool stdint strcase strdup strerror strftime
strstr strtoul strtoumax time_r timespec tzset unlocked-io vasnprintf vasprintf
xalloc-die xgethostname xreadlink xsize yesno
+# Reproduce by: gnulib-tool --import --dir=. --lib=libcvs --source-base=lib
--m4-base=m4 --doc-base=doc --aux-dir=build-aux --no-libtool --macro-prefix=gl
allocsa atexit base64 canon-host canonicalize closeout dirname dup2 error exit
exitfail extensions fnmatch fnmatch-posix ftruncate getdate gethostname getline
getlogin_r getndelim2 getnline getopt getpagesize getpass-gnu gettext gettime
gettimeofday glob inttypes lstat malloc md5 memmove minmax mkdir mkstemp mktime
nanosleep pathmax quotearg readlink realloc regex rename save-cwd setenv
stat-macros stdbool stdint strcase strdup strerror strftime strstr strtoul
strtoumax time_r timespec tzset unlocked-io vasnprintf vasprintf xalloc-die
xgethostname xreadlink xsize yesno
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
noinst_LIBRARIES = libcvs.a
libcvs_a_SOURCES =
-libcvs_a_LIBADD = @LIBOBJS@
+libcvs_a_LIBADD = $(LIBOBJS)
noinst_HEADERS =
EXTRA_DIST =
BUILT_SOURCES =
@@ -42,8 +42,8 @@
# We need the following in order to create <alloca.h> when the system
# doesn't have one that works with the given compiler.
alloca.h: alloca_.h
- cp $(srcdir)/alloca_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/alloca_.h address@hidden
+ mv -f address@hidden $@
MOSTLYCLEANFILES += alloca.h alloca.h-t
## end gnulib module alloca-opt
@@ -63,6 +63,7 @@
# doesn't have one.
arpa/inet.h:
test -d arpa || mkdir arpa
+ rm -f address@hidden $@
echo '#include <sys/socket.h>' >address@hidden
mv address@hidden $@
MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
@@ -144,6 +145,7 @@
# We need the following in order to create <fcntl.h> when the system
# doesn't have one that works with the given compiler.
fcntl.h: fcntl_.h
+ rm -f address@hidden $@
sed -e 's|@''ABSOLUTE_FCNTL_H''@|$(ABSOLUTE_FCNTL_H)|g' \
< $(srcdir)/fcntl_.h > address@hidden
mv address@hidden $@
@@ -171,8 +173,8 @@
# We need the following in order to create <fnmatch.h> when the system
# doesn't have one that supports the required API.
fnmatch.h: fnmatch_.h
- cp $(srcdir)/fnmatch_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/fnmatch_.h address@hidden
+ mv -f address@hidden $@
MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
## end gnulib module fnmatch
@@ -242,8 +244,8 @@
# We need the following in order to create <getopt.h> when the system
# doesn't have one that works with the given compiler.
getopt.h: getopt_.h
- cp $(srcdir)/getopt_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/getopt_.h address@hidden
+ mv -f address@hidden $@
MOSTLYCLEANFILES += getopt.h getopt.h-t
## end gnulib module getopt
@@ -288,8 +290,8 @@
# We need the following in order to create <glob.h> when the system
# doesn't have one that works with the given compiler.
glob.h: glob_.h
- cp $(srcdir)/glob_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/glob_.h address@hidden
+ mv -f address@hidden $@
MOSTLYCLEANFILES += glob.h glob.h-t
## end gnulib module glob
@@ -314,6 +316,7 @@
# We need the following in order to create <inttypes.h> when the system
# doesn't have one that works with the given compiler.
inttypes.h: inttypes_.h
+ rm -f address@hidden $@
sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-e 's|@''ABSOLUTE_INTTYPES_H''@|$(ABSOLUTE_INTTYPES_H)|g' \
-e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
@@ -377,6 +380,12 @@
## end gnulib module minmax
+## begin gnulib module mkstemp
+
+EXTRA_DIST += mkstemp.h
+
+## end gnulib module mkstemp
+
## begin gnulib module netinet_in
BUILT_SOURCES += $(NETINET_IN_H)
@@ -385,6 +394,7 @@
# doesn't have one.
netinet/in.h:
test -d netinet || mkdir netinet
+ rm -f address@hidden $@
echo '#include <sys/socket.h>' >address@hidden
mv address@hidden $@
MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
@@ -398,12 +408,6 @@
## end gnulib module openat
-## begin gnulib module pagealign_alloc
-
-EXTRA_DIST += pagealign_alloc.h
-
-## end gnulib module pagealign_alloc
-
## begin gnulib module pathmax
EXTRA_DIST += pathmax.h
@@ -466,6 +470,7 @@
# We need the following in order to create <stdbool.h> when the system
# doesn't have one that works.
stdbool.h: stdbool_.h
+ rm -f address@hidden $@
sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h >
address@hidden
mv address@hidden $@
MOSTLYCLEANFILES += stdbool.h stdbool.h-t
@@ -480,6 +485,7 @@
# We need the following in order to create <stdint.h> when the system
# doesn't have one that works with the given compiler.
stdint.h: stdint_.h
+ rm -f address@hidden $@
sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
-e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
@@ -558,8 +564,8 @@
# doesn't have one that works with the given compiler.
sys/socket.h: socket_.h
test -d sys || mkdir sys
- cp $(srcdir)/socket_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/socket_.h address@hidden
+ mv -f address@hidden $@
MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
MOSTLYCLEANDIRS += sys
@@ -574,6 +580,7 @@
# has one that is incomplete.
sys/stat.h: stat_.h
test -d sys || mkdir sys
+ rm -f address@hidden $@
sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \
< $(srcdir)/stat_.h > address@hidden
mv address@hidden $@
Index: lib/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.in,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -b -r1.223 -r1.224
--- lib/Makefile.in 2 Sep 2006 23:17:59 -0000 1.223
+++ lib/Makefile.in 22 Sep 2006 17:54:39 -0000 1.224
@@ -67,14 +67,14 @@
gettime.c gettimeofday.c glob.c inet_ntop.c lchown.c lstat.c \
malloc.c mbchar.c md5.c memchr.c memmove.c mempcpy.c memrchr.c \
mkdir.c mkdirat.c mkstemp.c mktime.c nanosleep.c open-safer.c \
- openat-die.c openat.c pagealign_alloc.c pipe-safer.c \
- printf-args.c printf-parse.c quotearg.c readlink.c realloc.c \
- regex.c rename.c rpmatch.c save-cwd.c setenv.c snprintf.c \
- strcasecmp.c strdup.c strerror.c strftime.c stripslash.c \
- strncasecmp.c strndup.c strnlen.c strstr.c strtoimax.c \
- strtol.c strtoll.c strtoul.c strtoull.c strtoumax.c \
- sunos57-select.c tempname.c time_r.c unsetenv.c vasnprintf.c \
- vasprintf.c waitpid.c xgetcwd.c xmalloc.c xreadlink.c yesno.c
+ openat-die.c openat.c pipe-safer.c printf-args.c \
+ printf-parse.c quotearg.c readlink.c realloc.c regex.c \
+ rename.c rpmatch.c save-cwd.c setenv.c snprintf.c strcasecmp.c \
+ strdup.c strerror.c strftime.c stripslash.c strncasecmp.c \
+ strndup.c strnlen.c strstr.c strtoimax.c strtol.c strtoll.c \
+ strtoul.c strtoull.c strtoumax.c sunos57-select.c tempname.c \
+ time_r.c unsetenv.c vasnprintf.c vasprintf.c waitpid.c \
+ xgetcwd.c xmalloc.c xreadlink.c yesno.c
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \
$(top_srcdir)/m4/acx_extract_cpp_defn.m4 \
@@ -111,7 +111,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -124,9 +123,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -168,8 +166,9 @@
libcvs_a_AR = $(AR) $(ARFLAGS)
libcvs_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
am_libcvs_a_OBJECTS = sighandle.$(OBJEXT) allocsa.$(OBJEXT) \
- base64.$(OBJEXT) getnline.$(OBJEXT) strnlen1.$(OBJEXT) \
- xalloc-die.$(OBJEXT) xgethostname.$(OBJEXT) xstrndup.$(OBJEXT)
+ base64.$(OBJEXT) getdate.$(OBJEXT) getnline.$(OBJEXT) \
+ strnlen1.$(OBJEXT) xalloc-die.$(OBJEXT) xgethostname.$(OBJEXT) \
+ xstrndup.$(OBJEXT)
libcvs_a_OBJECTS = $(am_libcvs_a_OBJECTS)
am_getdate_OBJECTS = getdate-error.$(OBJEXT) getdate-getdate.$(OBJEXT) \
getdate-progname.$(OBJEXT)
@@ -186,6 +185,7 @@
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+YLWRAP = $(top_srcdir)/build-aux/ylwrap
SOURCES = $(libcvs_a_SOURCES) $(getdate_SOURCES)
DIST_SOURCES = $(libcvs_a_SOURCES) $(getdate_SOURCES)
ETAGS = etags
@@ -264,6 +264,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
@@ -385,9 +387,9 @@
# matching?)
libcvs_a_SOURCES = sighandle.c system.h wait.h xselect.h xtime.h \
allocsa.h allocsa.c base64.h base64.c error.h exit.h \
- getaddrinfo.h getnline.h getnline.c gettext.h inet_ntop.h \
- mbchar.h mbuiter.h md5.h minmax.h setenv.h size_max.h \
- snprintf.h strcase.h strnlen1.h strnlen1.c strstr.h \
+ getaddrinfo.h getdate.y getnline.h getnline.c gettext.h \
+ inet_ntop.h mbchar.h mbuiter.h md5.h minmax.h setenv.h \
+ size_max.h snprintf.h strcase.h strnlen1.h strnlen1.c strstr.h \
printf-args.h printf-parse.h vasnprintf.h vasprintf.h verify.h \
wcwidth.h xalloc-die.c xgethostname.h xgethostname.c xsize.h \
xstrndup.h xstrndup.c
@@ -425,13 +427,13 @@
getdate.h getdelim.h getline.h getlogin_r.h getndelim2.h \
getndelim2.c getopt_.h getopt_int.h getpagesize.h getpass.h \
glob_.h glob-libc.h intprops.h inttypes_.h lchown.h lstat.h \
- mempcpy.h memrchr.h at-func.c openat.h openat-priv.h \
- pagealign_alloc.h pathmax.h quotearg.h regcomp.c regex.h \
- regex_internal.c regex_internal.h regexec.c same-inode.h \
- save-cwd.h stat-macros.h stdbool_.h stdint_.h strdup.h \
- strftime.h strndup.h strnlen.h socket_.h stat_.h time_r.h \
- timespec.h unistd-safer.h unistd--.h unlocked-io.h xalloc.h \
- xgetcwd.h xreadlink.h yesno.h
+ mempcpy.h memrchr.h mkstemp.h at-func.c openat.h openat-priv.h \
+ pathmax.h quotearg.h regcomp.c regex.h regex_internal.c \
+ regex_internal.h regexec.c same-inode.h save-cwd.h \
+ stat-macros.h stdbool_.h stdint_.h strdup.h strftime.h \
+ strndup.h strnlen.h socket_.h stat_.h time_r.h timespec.h \
+ unistd-safer.h unistd--.h unlocked-io.h xalloc.h xgetcwd.h \
+ xreadlink.h yesno.h
getdate_SOURCES = error.c getdate.y progname.c
getdate_CPPFLAGS = -DTEST
getdate_LDADD = \
@@ -523,7 +525,6 @@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@@ -553,7 +554,6 @@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@@ -597,6 +597,7 @@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@@ -661,25 +662,7 @@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
getdate-progname.obj `if test -f 'progname.c'; then $(CYGPATH_W) 'progname.c';
else $(CYGPATH_W) '$(srcdir)/progname.c'; fi`
.y.c:
- $(YACCCOMPILE) $<
- if test -f y.tab.h; then \
- to=`echo "$*_H" | sed \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
- -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
- sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \
- y.tab.h >$*.ht; \
- rm -f y.tab.h; \
- if cmp -s $*.ht $*.h; then \
- rm -f $*.ht ;\
- else \
- mv $*.ht $*.h; \
- fi; \
- fi
- if test -f y.output; then \
- mv y.output $*.output; \
- fi
- sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >address@hidden && mv address@hidden
$@
- rm -f y.tab.c
+ $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output --
$(YACCCOMPILE)
uninstall-info-am:
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -933,19 +916,21 @@
# We need the following in order to create <alloca.h> when the system
# doesn't have one that works with the given compiler.
alloca.h: alloca_.h
- cp $(srcdir)/alloca_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/alloca_.h address@hidden
+ mv -f address@hidden $@
# We need the following in order to create <arpa/inet.h> when the system
# doesn't have one.
arpa/inet.h:
test -d arpa || mkdir arpa
+ rm -f address@hidden $@
echo '#include <sys/socket.h>' >address@hidden
mv address@hidden $@
# We need the following in order to create <fcntl.h> when the system
# doesn't have one that works with the given compiler.
fcntl.h: fcntl_.h
+ rm -f address@hidden $@
sed -e 's|@''ABSOLUTE_FCNTL_H''@|$(ABSOLUTE_FCNTL_H)|g' \
< $(srcdir)/fcntl_.h > address@hidden
mv address@hidden $@
@@ -953,25 +938,26 @@
# We need the following in order to create <fnmatch.h> when the system
# doesn't have one that supports the required API.
fnmatch.h: fnmatch_.h
- cp $(srcdir)/fnmatch_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/fnmatch_.h address@hidden
+ mv -f address@hidden $@
# We need the following in order to create <getopt.h> when the system
# doesn't have one that works with the given compiler.
getopt.h: getopt_.h
- cp $(srcdir)/getopt_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/getopt_.h address@hidden
+ mv -f address@hidden $@
# We need the following in order to create <glob.h> when the system
# doesn't have one that works with the given compiler.
all-local $(libcvs_a_OBJECTS): $(GLOB_H)
glob.h: glob_.h
- cp $(srcdir)/glob_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/glob_.h address@hidden
+ mv -f address@hidden $@
# We need the following in order to create <inttypes.h> when the system
# doesn't have one that works with the given compiler.
inttypes.h: inttypes_.h
+ rm -f address@hidden $@
sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-e 's|@''ABSOLUTE_INTTYPES_H''@|$(ABSOLUTE_INTTYPES_H)|g' \
-e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
@@ -988,12 +974,14 @@
# doesn't have one.
netinet/in.h:
test -d netinet || mkdir netinet
+ rm -f address@hidden $@
echo '#include <sys/socket.h>' >address@hidden
mv address@hidden $@
# We need the following in order to create <stdbool.h> when the system
# doesn't have one that works.
stdbool.h: stdbool_.h
+ rm -f address@hidden $@
sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' \
< $(srcdir)/stdbool_.h > address@hidden
mv address@hidden $@
@@ -1001,6 +989,7 @@
# We need the following in order to create <stdint.h> when the system
# doesn't have one that works with the given compiler.
stdint.h: stdint_.h
+ rm -f address@hidden $@
sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
-e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
@@ -1029,13 +1018,14 @@
# doesn't have one that works with the given compiler.
sys/socket.h: socket_.h
test -d sys || mkdir sys
- cp $(srcdir)/socket_.h address@hidden
- mv address@hidden $@
+ cp -f $(srcdir)/socket_.h address@hidden
+ mv -f address@hidden $@
# We need the following in order to create <sys/stat.h> when the system
# has one that is incomplete.
sys/stat.h: stat_.h
test -d sys || mkdir sys
+ rm -f address@hidden $@
sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \
< $(srcdir)/stat_.h > address@hidden
mv address@hidden $@
Index: lib/__fpending.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/__fpending.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lib/__fpending.c 19 Sep 2005 21:26:13 -0000 1.3
+++ lib/__fpending.c 22 Sep 2006 17:54:39 -0000 1.4
@@ -1,5 +1,5 @@
/* __fpending.c -- return the number of pending output bytes on a stream
- Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "__fpending.h"
Index: lib/alloca.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/alloca.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/alloca.c 5 Oct 2004 18:58:25 -0000 1.4
+++ lib/alloca.c 22 Sep 2006 17:54:39 -0000 1.5
@@ -21,9 +21,7 @@
allocating any. It is a good idea to use alloca(0) in
your main control loop, etc. to force garbage collection. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <alloca.h>
Index: lib/allocsa.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/allocsa.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lib/allocsa.c 23 May 2005 17:44:30 -0000 1.2
+++ lib/allocsa.c 22 Sep 2006 17:54:39 -0000 1.3
@@ -1,5 +1,5 @@
/* Safe automatic memory allocation.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006 Free Software Foundation, Inc.
Written by Bruno Haible <address@hidden>, 2003.
This program is free software; you can redistribute it and/or modify
@@ -16,9 +16,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "allocsa.h"
Index: lib/asnprintf.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/asnprintf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lib/asnprintf.c 23 May 2005 17:44:30 -0000 1.2
+++ lib/asnprintf.c 22 Sep 2006 17:54:39 -0000 1.3
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "vasnprintf.h"
Index: lib/asprintf.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/asprintf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lib/asprintf.c 23 May 2005 17:44:30 -0000 1.2
+++ lib/asprintf.c 22 Sep 2006 17:54:39 -0000 1.3
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "vasprintf.h"
Index: lib/atexit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/atexit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lib/atexit.c 19 Sep 2005 21:26:13 -0000 1.2
+++ lib/atexit.c 22 Sep 2006 17:54:39 -0000 1.3
@@ -1,9 +1,7 @@
/* Wrapper to implement ANSI C's atexit using SunOS's on_exit. */
/* This function is in the public domain. --Mike Stump. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
int
atexit (void (*f) (void))
Index: lib/basename.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/basename.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- lib/basename.c 6 Jul 2006 02:17:59 -0000 1.6
+++ lib/basename.c 22 Sep 2006 17:54:39 -0000 1.7
@@ -17,9 +17,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "dirname.h"
Index: lib/canon-host.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/canon-host.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/canon-host.c 13 Sep 2005 13:56:47 -0000 1.4
+++ lib/canon-host.c 22 Sep 2006 17:54:39 -0000 1.5
@@ -1,6 +1,6 @@
/* Host name canonicalization
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
Written by Derek Price <address@hidden>.
@@ -18,9 +18,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "canon-host.h"
Index: lib/canonicalize.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/canonicalize.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lib/canonicalize.c 4 Oct 2005 02:34:53 -0000 1.3
+++ lib/canonicalize.c 22 Sep 2006 17:54:39 -0000 1.4
@@ -1,5 +1,5 @@
/* Return the canonical absolute name of a given file.
- Copyright (C) 1996-2005 Free Software Foundation, Inc.
+ Copyright (C) 1996-2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,9 +16,7 @@
If not, write to the Free Software Foundation,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "canonicalize.h"
Index: lib/chdir-long.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/chdir-long.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- lib/chdir-long.c 2 Sep 2006 23:17:59 -0000 1.6
+++ lib/chdir-long.c 22 Sep 2006 17:54:39 -0000 1.7
@@ -17,9 +17,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "chdir-long.h"
@@ -263,6 +261,6 @@
/*
Local Variables:
-compile-command: "gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H -I.. -g -O -W -Wall
chdir-long.c libcoreutils.a"
+compile-command: "gcc -DTEST_CHDIR=1 -g -O -W -Wall chdir-long.c
libcoreutils.a"
End:
*/
Index: lib/chown.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/chown.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/chown.c 24 Aug 2006 01:24:14 -0000 1.1
+++ lib/chown.c 22 Sep 2006 17:54:39 -0000 1.2
@@ -1,6 +1,7 @@
/* provide consistent interface to chown for systems that don't interpret
an ID of -1 as meaning `don't change the corresponding ID'.
- Copyright (C) 1997, 2004, 2005 Free Software Foundation, Inc.
+
+ Copyright (C) 1997, 2004, 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,9 +19,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Disable the definition of chown to rpl_chown (from config.h) in this
file. Otherwise, we'd get conflicting prototypes for rpl_chown on
Index: lib/close-stream.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/close-stream.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/close-stream.c 16 Aug 2006 18:12:09 -0000 1.1
+++ lib/close-stream.c 22 Sep 2006 17:54:39 -0000 1.2
@@ -17,9 +17,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "close-stream.h"
Index: lib/closeout.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/closeout.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/closeout.c 16 Aug 2006 18:12:09 -0000 1.5
+++ lib/closeout.c 22 Sep 2006 17:54:39 -0000 1.6
@@ -17,9 +17,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "closeout.h"
Index: lib/creat-safer.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/creat-safer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/creat-safer.c 4 Oct 2005 02:34:53 -0000 1.1
+++ lib/creat-safer.c 22 Sep 2006 17:54:39 -0000 1.2
@@ -1,5 +1,6 @@
/* Invoke creat, but avoid some glitches.
- Copyright (C) 2005 Free Software Foundation, Inc.
+
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "fcntl-safer.h"
Index: lib/cycle-check.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/cycle-check.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lib/cycle-check.c 6 Jul 2006 02:17:59 -0000 1.3
+++ lib/cycle-check.c 22 Sep 2006 17:54:39 -0000 1.4
@@ -19,9 +19,7 @@
/* Written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
Index: lib/dirname.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/dirname.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- lib/dirname.c 6 Jul 2006 02:17:59 -0000 1.6
+++ lib/dirname.c 22 Sep 2006 17:54:39 -0000 1.7
@@ -17,9 +17,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "dirname.h"
Index: lib/dup-safer.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/dup-safer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/dup-safer.c 19 Sep 2005 21:26:13 -0000 1.5
+++ lib/dup-safer.c 22 Sep 2006 17:54:39 -0000 1.6
@@ -1,5 +1,6 @@
/* Invoke dup, but avoid some glitches.
- Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
+
+ Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "unistd-safer.h"
Index: lib/dup2.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/dup2.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- lib/dup2.c 4 Oct 2005 02:34:53 -0000 1.6
+++ lib/dup2.c 22 Sep 2006 17:54:39 -0000 1.7
@@ -1,5 +1,6 @@
/* Duplicate an open file descriptor to a specified file descriptor.
- Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
+
+ Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
/* written by Paul Eggert */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <errno.h>
#include <fcntl.h>
Index: lib/error.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/error.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- lib/error.c 2 Sep 2006 23:17:59 -0000 1.10
+++ lib/error.c 22 Sep 2006 17:54:39 -0000 1.11
@@ -18,7 +18,7 @@
/* Written by David MacKenzie <address@hidden>. */
-#ifdef HAVE_CONFIG_H
+#if !_LIBC
# include <config.h>
#endif
Index: lib/exitfail.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/exitfail.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/exitfail.c 16 Aug 2006 18:12:09 -0000 1.4
+++ lib/exitfail.c 22 Sep 2006 17:54:39 -0000 1.5
@@ -1,6 +1,6 @@
/* Failure exit status
- Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
If not, write to the Free Software Foundation,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "exitfail.h"
#include "exit.h"
Index: lib/fchmodat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/fchmodat.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/fchmodat.c 21 Aug 2006 19:22:22 -0000 1.1
+++ lib/fchmodat.c 22 Sep 2006 17:54:39 -0000 1.2
@@ -17,9 +17,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "openat.h"
#include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
Index: lib/fchown-stub.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/fchown-stub.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/fchown-stub.c 24 Aug 2006 01:24:14 -0000 1.1
+++ lib/fchown-stub.c 22 Sep 2006 17:54:39 -0000 1.2
@@ -1,6 +1,5 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
#include <sys/types.h>
#include <errno.h>
Index: lib/fd-safer.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/fd-safer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/fd-safer.c 19 Sep 2005 21:26:13 -0000 1.4
+++ lib/fd-safer.c 22 Sep 2006 17:54:39 -0000 1.5
@@ -1,6 +1,6 @@
/* Return a safer copy of a file descriptor.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "unistd-safer.h"
Index: lib/filenamecat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/filenamecat.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lib/filenamecat.c 6 Jul 2006 02:17:59 -0000 1.3
+++ lib/filenamecat.c 22 Sep 2006 17:54:39 -0000 1.4
@@ -19,9 +19,7 @@
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "filenamecat.h"
Index: lib/fnmatch.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/fnmatch.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- lib/fnmatch.c 7 Jul 2006 02:46:50 -0000 1.16
+++ lib/fnmatch.c 22 Sep 2006 17:54:39 -0000 1.17
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
# include <config.h>
#endif
Index: lib/ftruncate.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ftruncate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/ftruncate.c 4 Oct 2005 02:34:53 -0000 1.4
+++ lib/ftruncate.c 22 Sep 2006 17:54:39 -0000 1.5
@@ -1,9 +1,7 @@
/* ftruncate emulations that work on some System V's.
This file is in the public domain. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <sys/types.h>
#include <fcntl.h>
Index: lib/gai_strerror.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/gai_strerror.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lib/gai_strerror.c 20 Mar 2006 02:21:56 -0000 1.3
+++ lib/gai_strerror.c 22 Sep 2006 17:54:39 -0000 1.4
@@ -16,11 +16,8 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#ifndef _LIBC
+# include <config.h>
# include "getaddrinfo.h"
#endif
Index: lib/getaddrinfo.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getaddrinfo.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- lib/getaddrinfo.c 2 Sep 2006 23:17:59 -0000 1.14
+++ lib/getaddrinfo.c 22 Sep 2006 17:54:39 -0000 1.15
@@ -167,7 +167,7 @@
return EAI_NONAME;
#ifdef HAVE_IPV6
- nodename = (hint->ai_family == AF_INET6) ? "::" : "0.0.0.0";
+ nodename = (hints->ai_family == AF_INET6) ? "::" : "0.0.0.0";
#else
nodename = "0.0.0.0";
#endif
Index: lib/getcwd.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getcwd.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- lib/getcwd.c 11 Jul 2006 16:40:33 -0000 1.11
+++ lib/getcwd.c 22 Sep 2006 17:54:39 -0000 1.12
@@ -16,11 +16,8 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#if !_LIBC
+# include <config.h>
# include "getcwd.h"
#endif
Index: lib/getdate.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getdate.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- lib/getdate.c 7 Jul 2006 02:46:50 -0000 1.47
+++ lib/getdate.c 22 Sep 2006 17:54:39 -0000 1.48
@@ -137,9 +137,7 @@
/* FIXME: Check for arithmetic overflow in all cases, not just
some of them. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "getdate.h"
@@ -326,7 +324,7 @@
#endif
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 215 "getdate.y"
+#line 213 "getdate.y"
typedef union YYSTYPE {
long int intval;
textint textintval;
@@ -334,7 +332,7 @@
relative_time rel;
} YYSTYPE;
/* Line 196 of yacc.c. */
-#line 338 "getdate.c"
+#line 336 "getdate.tab.c"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
@@ -346,7 +344,7 @@
/* Line 219 of yacc.c. */
-#line 350 "getdate.c"
+#line 348 "getdate.tab.c"
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
# define YYSIZE_T __SIZE_TYPE__
@@ -594,14 +592,14 @@
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned short int yyrline[] =
{
- 0, 241, 241, 242, 246, 253, 255, 259, 261, 263,
- 265, 267, 269, 271, 275, 283, 291, 301, 308, 320,
- 325, 333, 335, 345, 347, 349, 354, 359, 364, 369,
- 377, 382, 402, 409, 417, 425, 430, 436, 441, 450,
- 460, 473, 475, 477, 479, 481, 483, 485, 487, 489,
- 491, 493, 495, 497, 499, 501, 503, 505, 507, 509,
- 511, 513, 517, 519, 521, 523, 525, 527, 531, 531,
- 534, 535, 540, 541, 546, 584, 585, 591, 592
+ 0, 239, 239, 240, 244, 251, 253, 257, 259, 261,
+ 263, 265, 267, 269, 273, 281, 289, 299, 306, 318,
+ 323, 331, 333, 343, 345, 347, 352, 357, 362, 367,
+ 375, 380, 400, 407, 415, 423, 428, 434, 439, 448,
+ 458, 471, 473, 475, 477, 479, 481, 483, 485, 487,
+ 489, 491, 493, 495, 497, 499, 501, 503, 505, 507,
+ 509, 511, 515, 517, 519, 521, 523, 525, 529, 529,
+ 532, 533, 538, 539, 544, 582, 583, 589, 590
};
#endif
@@ -1422,67 +1420,67 @@
switch (yyn)
{
case 4:
-#line 247 "getdate.y"
+#line 245 "getdate.y"
{
pc->seconds = (yyvsp[0].timespec);
pc->timespec_seen = true;
- }
+ ;}
break;
case 7:
-#line 260 "getdate.y"
- { pc->times_seen++; }
+#line 258 "getdate.y"
+ { pc->times_seen++; ;}
break;
case 8:
-#line 262 "getdate.y"
- { pc->local_zones_seen++; }
+#line 260 "getdate.y"
+ { pc->local_zones_seen++; ;}
break;
case 9:
-#line 264 "getdate.y"
- { pc->zones_seen++; }
+#line 262 "getdate.y"
+ { pc->zones_seen++; ;}
break;
case 10:
-#line 266 "getdate.y"
- { pc->dates_seen++; }
+#line 264 "getdate.y"
+ { pc->dates_seen++; ;}
break;
case 11:
-#line 268 "getdate.y"
- { pc->days_seen++; }
+#line 266 "getdate.y"
+ { pc->days_seen++; ;}
break;
case 12:
-#line 270 "getdate.y"
- { pc->rels_seen = true; }
+#line 268 "getdate.y"
+ { pc->rels_seen = true; ;}
break;
case 14:
-#line 276 "getdate.y"
+#line 274 "getdate.y"
{
pc->hour = (yyvsp[-1].textintval).value;
pc->minutes = 0;
pc->seconds.tv_sec = 0;
pc->seconds.tv_nsec = 0;
pc->meridian = (yyvsp[0].intval);
- }
+ ;}
break;
case 15:
-#line 284 "getdate.y"
+#line 282 "getdate.y"
{
pc->hour = (yyvsp[-3].textintval).value;
pc->minutes = (yyvsp[-1].textintval).value;
pc->seconds.tv_sec = 0;
pc->seconds.tv_nsec = 0;
pc->meridian = (yyvsp[0].intval);
- }
+ ;}
break;
case 16:
-#line 292 "getdate.y"
+#line 290 "getdate.y"
{
pc->hour = (yyvsp[-4].textintval).value;
pc->minutes = (yyvsp[-2].textintval).value;
@@ -1491,21 +1489,21 @@
pc->meridian = MER24;
pc->zones_seen++;
pc->time_zone = time_zone_hhmm ((yyvsp[-1].textintval),
(yyvsp[0].intval));
- }
+ ;}
break;
case 17:
-#line 302 "getdate.y"
+#line 300 "getdate.y"
{
pc->hour = (yyvsp[-5].textintval).value;
pc->minutes = (yyvsp[-3].textintval).value;
pc->seconds = (yyvsp[-1].timespec);
pc->meridian = (yyvsp[0].intval);
- }
+ ;}
break;
case 18:
-#line 309 "getdate.y"
+#line 307 "getdate.y"
{
pc->hour = (yyvsp[-6].textintval).value;
pc->minutes = (yyvsp[-4].textintval).value;
@@ -1513,32 +1511,32 @@
pc->meridian = MER24;
pc->zones_seen++;
pc->time_zone = time_zone_hhmm ((yyvsp[-1].textintval),
(yyvsp[0].intval));
- }
+ ;}
break;
case 19:
-#line 321 "getdate.y"
+#line 319 "getdate.y"
{
pc->local_isdst = (yyvsp[0].intval);
pc->dsts_seen += (0 < (yyvsp[0].intval));
- }
+ ;}
break;
case 20:
-#line 326 "getdate.y"
+#line 324 "getdate.y"
{
pc->local_isdst = 1;
pc->dsts_seen += (0 < (yyvsp[-1].intval)) + 1;
- }
+ ;}
break;
case 21:
-#line 334 "getdate.y"
- { pc->time_zone = (yyvsp[0].intval); }
+#line 332 "getdate.y"
+ { pc->time_zone = (yyvsp[0].intval); ;}
break;
case 22:
-#line 336 "getdate.y"
+#line 334 "getdate.y"
{ pc->time_zone = (yyvsp[-1].intval);
pc->rel.ns += (yyvsp[0].rel).ns;
pc->rel.seconds += (yyvsp[0].rel).seconds;
@@ -1547,66 +1545,66 @@
pc->rel.day += (yyvsp[0].rel).day;
pc->rel.month += (yyvsp[0].rel).month;
pc->rel.year += (yyvsp[0].rel).year;
- pc->rels_seen = true; }
+ pc->rels_seen = true; ;}
break;
case 23:
-#line 346 "getdate.y"
- { pc->time_zone = (yyvsp[-2].intval) + time_zone_hhmm
((yyvsp[-1].textintval), (yyvsp[0].intval)); }
+#line 344 "getdate.y"
+ { pc->time_zone = (yyvsp[-2].intval) + time_zone_hhmm
((yyvsp[-1].textintval), (yyvsp[0].intval)); ;}
break;
case 24:
-#line 348 "getdate.y"
- { pc->time_zone = (yyvsp[0].intval) + 60; }
+#line 346 "getdate.y"
+ { pc->time_zone = (yyvsp[0].intval) + 60; ;}
break;
case 25:
-#line 350 "getdate.y"
- { pc->time_zone = (yyvsp[-1].intval) + 60; }
+#line 348 "getdate.y"
+ { pc->time_zone = (yyvsp[-1].intval) + 60; ;}
break;
case 26:
-#line 355 "getdate.y"
+#line 353 "getdate.y"
{
pc->day_ordinal = 1;
pc->day_number = (yyvsp[0].intval);
- }
+ ;}
break;
case 27:
-#line 360 "getdate.y"
+#line 358 "getdate.y"
{
pc->day_ordinal = 1;
pc->day_number = (yyvsp[-1].intval);
- }
+ ;}
break;
case 28:
-#line 365 "getdate.y"
+#line 363 "getdate.y"
{
pc->day_ordinal = (yyvsp[-1].intval);
pc->day_number = (yyvsp[0].intval);
- }
+ ;}
break;
case 29:
-#line 370 "getdate.y"
+#line 368 "getdate.y"
{
pc->day_ordinal = (yyvsp[-1].textintval).value;
pc->day_number = (yyvsp[0].intval);
- }
+ ;}
break;
case 30:
-#line 378 "getdate.y"
+#line 376 "getdate.y"
{
pc->month = (yyvsp[-2].textintval).value;
pc->day = (yyvsp[0].textintval).value;
- }
+ ;}
break;
case 31:
-#line 383 "getdate.y"
+#line 381 "getdate.y"
{
/* Interpret as YYYY/MM/DD if the first value has 4 or more digits,
otherwise as MM/DD/YY.
@@ -1625,77 +1623,77 @@
pc->day = (yyvsp[-2].textintval).value;
pc->year = (yyvsp[0].textintval);
}
- }
+ ;}
break;
case 32:
-#line 403 "getdate.y"
+#line 401 "getdate.y"
{
/* ISO 8601 format. YYYY-MM-DD. */
pc->year = (yyvsp[-2].textintval);
pc->month = -(yyvsp[-1].textintval).value;
pc->day = -(yyvsp[0].textintval).value;
- }
+ ;}
break;
case 33:
-#line 410 "getdate.y"
+#line 408 "getdate.y"
{
/* e.g. 17-JUN-1992. */
pc->day = (yyvsp[-2].textintval).value;
pc->month = (yyvsp[-1].intval);
pc->year.value = -(yyvsp[0].textintval).value;
pc->year.digits = (yyvsp[0].textintval).digits;
- }
+ ;}
break;
case 34:
-#line 418 "getdate.y"
+#line 416 "getdate.y"
{
/* e.g. JUN-17-1992. */
pc->month = (yyvsp[-2].intval);
pc->day = -(yyvsp[-1].textintval).value;
pc->year.value = -(yyvsp[0].textintval).value;
pc->year.digits = (yyvsp[0].textintval).digits;
- }
+ ;}
break;
case 35:
-#line 426 "getdate.y"
+#line 424 "getdate.y"
{
pc->month = (yyvsp[-1].intval);
pc->day = (yyvsp[0].textintval).value;
- }
+ ;}
break;
case 36:
-#line 431 "getdate.y"
+#line 429 "getdate.y"
{
pc->month = (yyvsp[-3].intval);
pc->day = (yyvsp[-2].textintval).value;
pc->year = (yyvsp[0].textintval);
- }
+ ;}
break;
case 37:
-#line 437 "getdate.y"
+#line 435 "getdate.y"
{
pc->day = (yyvsp[-1].textintval).value;
pc->month = (yyvsp[0].intval);
- }
+ ;}
break;
case 38:
-#line 442 "getdate.y"
+#line 440 "getdate.y"
{
pc->day = (yyvsp[-2].textintval).value;
pc->month = (yyvsp[-1].intval);
pc->year = (yyvsp[0].textintval);
- }
+ ;}
break;
case 39:
-#line 451 "getdate.y"
+#line 449 "getdate.y"
{
pc->rel.ns -= (yyvsp[-1].rel).ns;
pc->rel.seconds -= (yyvsp[-1].rel).seconds;
@@ -1704,11 +1702,11 @@
pc->rel.day -= (yyvsp[-1].rel).day;
pc->rel.month -= (yyvsp[-1].rel).month;
pc->rel.year -= (yyvsp[-1].rel).year;
- }
+ ;}
break;
case 40:
-#line 461 "getdate.y"
+#line 459 "getdate.y"
{
pc->rel.ns += (yyvsp[0].rel).ns;
pc->rel.seconds += (yyvsp[0].rel).seconds;
@@ -1717,151 +1715,151 @@
pc->rel.day += (yyvsp[0].rel).day;
pc->rel.month += (yyvsp[0].rel).month;
pc->rel.year += (yyvsp[0].rel).year;
- }
+ ;}
break;
case 41:
-#line 474 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].intval); }
+#line 472 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].intval); ;}
break;
case 42:
-#line 476 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year =
(yyvsp[-1].textintval).value; }
+#line 474 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year =
(yyvsp[-1].textintval).value; ;}
break;
case 43:
-#line 478 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; }
+#line 476 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; ;}
break;
case 44:
-#line 480 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].intval); }
+#line 478 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].intval); ;}
break;
case 45:
-#line 482 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month =
(yyvsp[-1].textintval).value; }
+#line 480 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month =
(yyvsp[-1].textintval).value; ;}
break;
case 46:
-#line 484 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; }
+#line 482 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; ;}
break;
case 47:
-#line 486 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].intval) *
(yyvsp[0].intval); }
+#line 484 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].intval) *
(yyvsp[0].intval); ;}
break;
case 48:
-#line 488 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day =
(yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 486 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day =
(yyvsp[-1].textintval).value * (yyvsp[0].intval); ;}
break;
case 49:
-#line 490 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[0].intval); }
+#line 488 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[0].intval); ;}
break;
case 50:
-#line 492 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].intval); }
+#line 490 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].intval); ;}
break;
case 51:
-#line 494 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour =
(yyvsp[-1].textintval).value; }
+#line 492 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour =
(yyvsp[-1].textintval).value; ;}
break;
case 52:
-#line 496 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; }
+#line 494 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; ;}
break;
case 53:
-#line 498 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].intval);
}
+#line 496 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].intval);
;}
break;
case 54:
-#line 500 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes =
(yyvsp[-1].textintval).value; }
+#line 498 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes =
(yyvsp[-1].textintval).value; ;}
break;
case 55:
-#line 502 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; }
+#line 500 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; ;}
break;
case 56:
-#line 504 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].intval);
}
+#line 502 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].intval);
;}
break;
case 57:
-#line 506 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].textintval).value; }
+#line 504 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].textintval).value; ;}
break;
case 58:
-#line 508 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; }
+#line 506 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; ;}
break;
case 59:
-#line 510 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; }
+#line 508 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; ;}
break;
case 60:
-#line 512 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 1; }
+#line 510 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 1; ;}
break;
case 62:
-#line 518 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year =
(yyvsp[-1].textintval).value; }
+#line 516 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year =
(yyvsp[-1].textintval).value; ;}
break;
case 63:
-#line 520 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month =
(yyvsp[-1].textintval).value; }
+#line 518 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month =
(yyvsp[-1].textintval).value; ;}
break;
case 64:
-#line 522 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day =
(yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 520 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day =
(yyvsp[-1].textintval).value * (yyvsp[0].intval); ;}
break;
case 65:
-#line 524 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour =
(yyvsp[-1].textintval).value; }
+#line 522 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour =
(yyvsp[-1].textintval).value; ;}
break;
case 66:
-#line 526 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes =
(yyvsp[-1].textintval).value; }
+#line 524 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes =
(yyvsp[-1].textintval).value; ;}
break;
case 67:
-#line 528 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].textintval).value; }
+#line 526 "getdate.y"
+ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].textintval).value; ;}
break;
case 71:
-#line 536 "getdate.y"
- { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value;
(yyval.timespec).tv_nsec = 0; }
+#line 534 "getdate.y"
+ { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value;
(yyval.timespec).tv_nsec = 0; ;}
break;
case 73:
-#line 542 "getdate.y"
- { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value;
(yyval.timespec).tv_nsec = 0; }
+#line 540 "getdate.y"
+ { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value;
(yyval.timespec).tv_nsec = 0; ;}
break;
case 74:
-#line 547 "getdate.y"
+#line 545 "getdate.y"
{
if (pc->dates_seen && ! pc->year.digits
&& ! pc->rels_seen && (pc->times_seen || 2 <
(yyvsp[0].textintval).digits))
@@ -1894,27 +1892,27 @@
pc->meridian = MER24;
}
}
- }
+ ;}
break;
case 75:
-#line 584 "getdate.y"
- { (yyval.intval) = -1; }
+#line 582 "getdate.y"
+ { (yyval.intval) = -1; ;}
break;
case 76:
-#line 586 "getdate.y"
- { (yyval.intval) = (yyvsp[0].textintval).value; }
+#line 584 "getdate.y"
+ { (yyval.intval) = (yyvsp[0].textintval).value; ;}
break;
case 77:
-#line 591 "getdate.y"
- { (yyval.intval) = MER24; }
+#line 589 "getdate.y"
+ { (yyval.intval) = MER24; ;}
break;
case 78:
-#line 593 "getdate.y"
- { (yyval.intval) = (yyvsp[0].intval); }
+#line 591 "getdate.y"
+ { (yyval.intval) = (yyvsp[0].intval); ;}
break;
@@ -1922,7 +1920,7 @@
}
/* Line 1126 of yacc.c. */
-#line 1926 "getdate.c"
+#line 1924 "getdate.tab.c"
yyvsp -= yylen;
yyssp -= yylen;
@@ -2190,7 +2188,7 @@
}
-#line 596 "getdate.y"
+#line 594 "getdate.y"
static table const meridian_table[] =
Index: lib/getdate.y
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getdate.y,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- lib/getdate.y 7 Jul 2006 02:46:50 -0000 1.38
+++ lib/getdate.y 22 Sep 2006 17:54:39 -0000 1.39
@@ -32,9 +32,7 @@
/* FIXME: Check for arithmetic overflow in all cases, not just
some of them. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "getdate.h"
Index: lib/gethostname.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/gethostname.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/gethostname.c 23 May 2005 17:44:31 -0000 1.4
+++ lib/gethostname.c 22 Sep 2006 17:54:39 -0000 1.5
@@ -1,5 +1,6 @@
/* gethostname emulation for SysV and POSIX.1.
- Copyright (C) 1992, 2003 Free Software Foundation, Inc.
+
+ Copyright (C) 1992, 2003, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
/* David MacKenzie <address@hidden> */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#ifdef HAVE_UNAME
# include <sys/utsname.h>
Index: lib/getlogin_r.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getlogin_r.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/getlogin_r.c 20 Mar 2006 02:21:56 -0000 1.5
+++ lib/getlogin_r.c 22 Sep 2006 17:54:39 -0000 1.6
@@ -1,6 +1,6 @@
/* Provide a working getlogin_r for systems which lack it.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
/* written by Paul Eggert and Derek Price */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "getlogin_r.h"
Index: lib/getndelim2.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getndelim2.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- lib/getndelim2.c 21 Aug 2006 19:22:22 -0000 1.10
+++ lib/getndelim2.c 22 Sep 2006 17:54:39 -0000 1.11
@@ -20,9 +20,7 @@
/* Originally written by Jan Brittenson, address@hidden */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "getndelim2.h"
Index: lib/getnline.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getnline.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- lib/getnline.c 19 Sep 2005 21:26:13 -0000 1.10
+++ lib/getnline.c 22 Sep 2006 17:54:39 -0000 1.11
@@ -1,6 +1,6 @@
/* getnline - Read a line from a stream, with bounded memory allocation.
- Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,9 +16,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "getnline.h"
Index: lib/getopt.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getopt.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- lib/getopt.c 7 Jul 2006 02:46:50 -0000 1.11
+++ lib/getopt.c 22 Sep 2006 17:54:39 -0000 1.12
@@ -20,7 +20,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
# include <config.h>
#endif
Index: lib/getopt1.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getopt1.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- lib/getopt1.c 19 Sep 2005 21:26:13 -0000 1.7
+++ lib/getopt1.c 22 Sep 2006 17:54:39 -0000 1.8
@@ -1,5 +1,5 @@
/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
+ Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004,2006
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,13 +17,10 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#ifdef _LIBC
# include <getopt.h>
#else
+# include <config.h>
# include "getopt.h"
#endif
#include "getopt_int.h"
Index: lib/getpass.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getpass.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- lib/getpass.c 4 Jun 2006 09:25:48 -0000 1.12
+++ lib/getpass.c 22 Sep 2006 17:54:39 -0000 1.13
@@ -1,4 +1,6 @@
-/* Copyright (C) 1992-2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2001, 2003, 2004, 2005, 2006 Free Software
+ Foundation, Inc.
+
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -15,7 +17,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
# include <config.h>
#endif
Index: lib/gettime.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/gettime.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/gettime.c 25 Jan 2006 12:53:38 -0000 1.5
+++ lib/gettime.c 22 Sep 2006 17:54:39 -0000 1.6
@@ -1,5 +1,6 @@
/* gettime -- get the system clock
- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+
+ Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "timespec.h"
Index: lib/gettimeofday.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/gettimeofday.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lib/gettimeofday.c 19 Sep 2005 21:26:13 -0000 1.3
+++ lib/gettimeofday.c 22 Sep 2006 17:54:39 -0000 1.4
@@ -2,7 +2,8 @@
static buffer that localtime uses for it's return value. The gettimeofday
function from Mac OS X 10.0.4, i.e. Darwin 1.3.7 has this problem.
The tzset replacement is necessary for at least Solaris 2.5, 2.5.1, and 2.6.
- Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+
+ Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,9 +21,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Disable the definitions of these functions (from config.h)
so we can use the library versions here. */
Index: lib/glob.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/glob.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- lib/glob.c 11 Jul 2006 16:40:33 -0000 1.22
+++ lib/glob.c 22 Sep 2006 17:54:39 -0000 1.23
@@ -16,7 +16,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
# include <config.h>
#endif
Index: lib/inet_ntop.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/inet_ntop.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/inet_ntop.c 29 Jun 2006 12:13:26 -0000 1.1
+++ lib/inet_ntop.c 22 Sep 2006 17:54:39 -0000 1.2
@@ -1,5 +1,6 @@
/* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
- Copyright (c) 2005, 2006 Free Software Foundation, Inc.
+
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -32,9 +33,7 @@
* SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "inet_ntop.h"
Index: lib/lchown.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/lchown.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/lchown.c 24 Aug 2006 01:24:14 -0000 1.1
+++ lib/lchown.c 22 Sep 2006 17:54:39 -0000 1.2
@@ -1,5 +1,7 @@
/* Provide a stub lchown function for systems that lack it.
- Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc.
+
+ Copyright (C) 1998, 1999, 2002, 2004, 2006 Free Software
+ Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +19,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
Index: lib/libcvs.dep
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/libcvs.dep,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- lib/libcvs.dep 21 Aug 2006 10:08:18 -0000 1.38
+++ lib/libcvs.dep 22 Sep 2006 17:54:39 -0000 1.39
@@ -48,6 +48,7 @@
"..\windows-NT\woe32.h"\
".\__fpending.h"\
".\closeout.h"\
+ ".\close-stream.h"\
".\error.h"\
".\exitfail.h"\
".\gettext.h"\
@@ -297,20 +298,19 @@
.\mkstemp.c : \
"..\windows-NT\config.h"\
"..\windows-NT\woe32.h"\
+ ".\mkstemp.h"\
".\timespec.h"\
-.\pagealign_alloc.c : \
+.\openat.c : \
"..\windows-NT\config.h"\
- "..\windows-NT\unistd.h"\
"..\windows-NT\woe32.h"\
- ".\error.h"\
- ".\exit.h"\
- ".\getpagesize.h"\
- ".\gettext.h"\
- ".\pagealign_alloc.h"\
- ".\timespec.h"\
- ".\xalloc.h"\
+ ".\dirname.h"\
+ ".\dfcntl--.h"\
+ ".\lstat.h"\
+ ".\open-priv.h"\
+ ".\openat.h"\
+ ".\save-cwd.h"\
".\printf-args.c" : \
Index: lib/libcvs.dsp
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/libcvs.dsp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- lib/libcvs.dsp 2 Sep 2006 23:17:59 -0000 1.36
+++ lib/libcvs.dsp 22 Sep 2006 17:54:39 -0000 1.37
@@ -89,10 +89,22 @@
# End Source File
# Begin Source File
+SOURCE=.\alloca.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\allocsa.c
+# End Source File
+# Begin Source File
+
SOURCE=.\asnprintf.c
# End Source File
# Begin Source File
+SOURCE=.\atexit.c
+# End Source File
+# Begin Source File
+
SOURCE=.\base64.c
# End Source File
# Begin Source File
@@ -105,6 +117,18 @@
# End Source File
# Begin Source File
+SOURCE=.\canonicalize.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\chdir-long.c"
+# End Source File
+# Begin Source File
+
+SOURCE=.\chown.c
+# End Source File
+# Begin Source File
+
SOURCE=.\closeout.c
# End Source File
# Begin Source File
@@ -113,6 +137,10 @@
# End Source File
# Begin Source File
+SOURCE=".\creat-safer.c"
+# End Source File
+# Begin Source File
+
SOURCE=".\cycle-check.c"
# End Source File
# Begin Source File
@@ -125,14 +153,30 @@
# End Source File
# Begin Source File
+SOURCE=.\dup2.c
+# End Source File
+# Begin Source File
+
SOURCE=.\exitfail.c
# End Source File
# Begin Source File
+SOURCE=.\fchmodat.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\fchown-stub.c"
+# End Source File
+# Begin Source File
+
SOURCE=".\fd-safer.c"
# End Source File
# Begin Source File
+SOURCE=.\filenamecat.c
+# End Source File
+# Begin Source File
+
SOURCE=.\fncase.c
# End Source File
# Begin Source File
@@ -141,6 +185,10 @@
# End Source File
# Begin Source File
+SOURCE=".\fnmatch_loop.c"
+# End Source File
+# Begin Source File
+
SOURCE=.\fseeko.c
# End Source File
# Begin Source File
@@ -149,6 +197,10 @@
# End Source File
# Begin Source File
+SOURCE=.\ftruncate.c
+# End Source File
+# Begin Source File
+
SOURCE=.\gai_strerror.c
# End Source File
# Begin Source File
@@ -177,6 +229,10 @@
# End Source File
# Begin Source File
+SOURCE=.\getnline.c
+# End Source File
+# Begin Source File
+
SOURCE=.\getopt.c
# End Source File
# Begin Source File
@@ -185,10 +241,18 @@
# End Source File
# Begin Source File
+SOURCE=.\getpass.c
+# End Source File
+# Begin Source File
+
SOURCE=.\gettime.c
# End Source File
# Begin Source File
+SOURCE=.\gettimeofday.c
+# End Source File
+# Begin Source File
+
SOURCE=.\glob.c
# End Source File
# Begin Source File
@@ -197,6 +261,10 @@
# End Source File
# Begin Source File
+SOURCE=.\lchown.c
+# End Source File
+# Begin Source File
+
SOURCE=.\lstat.c
# End Source File
# Begin Source File
@@ -209,15 +277,51 @@
# End Source File
# Begin Source File
+SOURCE=.\memchr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\memmove.c
+# End Source File
+# Begin Source File
+
SOURCE=.\mempcpy.c
# End Source File
# Begin Source File
+SOURCE=.\memrchr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mkdir.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mkdirat.c
+# End Source File
+# Begin Source File
+
SOURCE=.\mkstemp.c
# End Source File
# Begin Source File
-SOURCE=.\pagealign_alloc.c
+SOURCE=.\mkstime.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\openat.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\openat-die.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\open-safer.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\pipe-safer.c"
# End Source File
# Begin Source File
@@ -269,6 +373,10 @@
# End Source File
# Begin Source File
+SOURCE=.\strdup.c
+# End Source File
+# Begin Source File
+
SOURCE=.\strftime.c
# End Source File
# Begin Source File
@@ -277,6 +385,10 @@
# End Source File
# Begin Source File
+SOURCE=.\strncasecmp.c
+# End Source File
+# Begin Source File
+
SOURCE=.\strndup.c
# End Source File
# Begin Source File
@@ -289,6 +401,34 @@
# End Source File
# Begin Source File
+SOURCE=.\strstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtoimax.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtol.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtoll.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtoul.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtoull.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtoumax.c
+# End Source File
+# Begin Source File
+
SOURCE=.\tempname.c
# End Source File
# Begin Source File
@@ -309,6 +449,10 @@
# End Source File
# Begin Source File
+SOURCE=.\waitpid.c
+# End Source File
+# Begin Source File
+
SOURCE=".\xalloc-die.c"
# End Source File
# Begin Source File
@@ -380,6 +524,10 @@
# End Source File
# Begin Source File
+SOURCE=".\at-func.c"
+# End Source File
+# Begin Source File
+
SOURCE=.\base64.h
# End Source File
# Begin Source File
@@ -400,6 +548,10 @@
# End Source File
# Begin Source File
+SOURCE=".\close-stream.h"
+# End Source File
+# Begin Source File
+
SOURCE="..\windows-NT\config.h"
# End Source File
# Begin Source File
@@ -428,6 +580,14 @@
# End Source File
# Begin Source File
+SOURCE=".\fcntl--.h"
+# End Source File
+# Begin Source File
+
+SOURCE=".\fcntl-safer.h"
+# End Source File
+# Begin Source File
+
SOURCE=.\filenamecat.h
# End Source File
# Begin Source File
@@ -491,6 +651,10 @@
# End Source File
# Begin Source File
+SOURCE=.\getnline.h
+# End Source File
+# Begin Source File
+
SOURCE=.\getopt.h
# End Source File
# Begin Source File
@@ -530,6 +694,10 @@
# End Source File
# Begin Source File
+SOURCE=.\getpass.h
+# End Source File
+# Begin Source File
+
SOURCE=.\gettext.h
# End Source File
# Begin Source File
@@ -573,6 +741,22 @@
# End Source File
# Begin Source File
+SOURCE=.\intprops.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\windows-NT\inttypes.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\lchown.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\lstat.h
+# End Source File
+# Begin Source File
+
SOURCE=.\mbchar.h
# End Source File
# Begin Source File
@@ -585,11 +769,19 @@
# End Source File
# Begin Source File
+SOURCE=.\memrchr.h
+# End Source File
+# Begin Source File
+
SOURCE=.\mempcpy.h
# End Source File
# Begin Source File
-SOURCE="..\windows-NT\inttypes.h"
+SOURCE=.\minmax.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mkstemp.h
# End Source File
# Begin Source File
@@ -601,7 +793,11 @@
# End Source File
# Begin Source File
-SOURCE=.\pagealign_alloc.h
+SOURCE=".\openat.h"
+# End Source File
+# Begin Source File
+
+SOURCE=".\openat-priv.h"
# End Source File
# Begin Source File
@@ -637,6 +833,10 @@
# End Source File
# Begin Source File
+SOURCE=".\same-inode.h"
+# End Source File
+# Begin Source File
+
SOURCE=".\save-cwd.h"
# End Source File
# Begin Source File
@@ -645,6 +845,10 @@
# End Source File
# Begin Source File
+SOURCE=.\size_max.h
+# End Source File
+# Begin Source File
+
SOURCE=.\snprintf.h
# End Source File
# Begin Source File
@@ -677,6 +881,10 @@
# End Source File
# Begin Source File
+SOURCE=.\strftime.h
+# End Source File
+# Begin Source File
+
SOURCE=.\strnlen.h
# End Source File
# Begin Source File
@@ -685,6 +893,10 @@
# End Source File
# Begin Source File
+SOURCE=.\strstr.h
+# End Source File
+# Begin Source File
+
SOURCE=.\system.h
# End Source File
# Begin Source File
@@ -717,6 +929,18 @@
# End Source File
# Begin Source File
+SOURCE=.\verify.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\wait.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\wcwidth.h
+# End Source File
+# Begin Source File
+
SOURCE="..\windows-NT\woe32.h"
# End Source File
# Begin Source File
@@ -737,6 +961,10 @@
# End Source File
# Begin Source File
+SOURCE=.\xselect.h
+# End Source File
+# Begin Source File
+
SOURCE=.\xsize.h
# End Source File
# Begin Source File
Index: lib/libcvs.mak
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/libcvs.mak,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- lib/libcvs.mak 7 Jul 2006 00:48:20 -0000 1.34
+++ lib/libcvs.mak 22 Sep 2006 17:54:39 -0000 1.35
@@ -72,7 +72,6 @@
address@hidden "$(INTDIR)\md5.obj"
address@hidden "$(INTDIR)\mempcpy.obj"
address@hidden "$(INTDIR)\mkstemp.obj"
- address@hidden "$(INTDIR)\pagealign_alloc.obj"
address@hidden "$(INTDIR)\printf-args.obj"
address@hidden "$(INTDIR)\printf-parse.obj"
address@hidden "$(INTDIR)\quotearg.obj"
@@ -152,7 +151,6 @@
"$(INTDIR)\md5.obj" \
"$(INTDIR)\mempcpy.obj" \
"$(INTDIR)\mkstemp.obj" \
- "$(INTDIR)\pagealign_alloc.obj" \
"$(INTDIR)\printf-args.obj" \
"$(INTDIR)\printf-parse.obj" \
"$(INTDIR)\quotearg.obj" \
@@ -232,7 +230,6 @@
address@hidden "$(INTDIR)\md5.obj"
address@hidden "$(INTDIR)\mempcpy.obj"
address@hidden "$(INTDIR)\mkstemp.obj"
- address@hidden "$(INTDIR)\pagealign_alloc.obj"
address@hidden "$(INTDIR)\printf-args.obj"
address@hidden "$(INTDIR)\printf-parse.obj"
address@hidden "$(INTDIR)\quotearg.obj"
@@ -309,7 +306,6 @@
"$(INTDIR)\md5.obj" \
"$(INTDIR)\mempcpy.obj" \
"$(INTDIR)\mkstemp.obj" \
- "$(INTDIR)\pagealign_alloc.obj" \
"$(INTDIR)\printf-args.obj" \
"$(INTDIR)\printf-parse.obj" \
"$(INTDIR)\quotearg.obj" \
@@ -548,11 +544,6 @@
"$(INTDIR)\mkstemp.obj" : $(SOURCE) "$(INTDIR)"
-SOURCE=.\pagealign_alloc.c
-
-"$(INTDIR)\pagealign_alloc.obj" : $(SOURCE) "$(INTDIR)"
-
-
SOURCE=".\printf-args.c"
"$(INTDIR)\printf-args.obj" : $(SOURCE) "$(INTDIR)"
Index: lib/lstat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/lstat.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- lib/lstat.c 20 Mar 2006 02:21:56 -0000 1.6
+++ lib/lstat.c 22 Sep 2006 17:54:39 -0000 1.7
@@ -19,9 +19,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* The specification of these functions is in sys_stat.h. But we cannot
include this include file here, because on some systems, a
Index: lib/malloc.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/malloc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/malloc.c 19 Sep 2005 21:26:13 -0000 1.5
+++ lib/malloc.c 22 Sep 2006 17:54:39 -0000 1.6
@@ -1,5 +1,6 @@
/* malloc() function that is glibc compatible.
- Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+
+ Copyright (C) 1997, 1998, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#undef malloc
#include <stdlib.h>
Index: lib/mbchar.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/mbchar.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/mbchar.c 4 Sep 2005 05:58:56 -0000 1.1
+++ lib/mbchar.c 22 Sep 2006 17:54:39 -0000 1.2
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <limits.h>
Index: lib/md5.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/md5.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- lib/md5.c 25 Jan 2006 12:53:38 -0000 1.14
+++ lib/md5.c 22 Sep 2006 17:54:39 -0000 1.15
@@ -20,9 +20,7 @@
/* Written by Ulrich Drepper <address@hidden>, 1995. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "md5.h"
Index: lib/memchr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/memchr.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/memchr.c 4 Sep 2005 05:58:56 -0000 1.1
+++ lib/memchr.c 22 Sep 2006 17:54:39 -0000 1.2
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004 Free
+/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2006 Free
Software Foundation, Inc.
Based on strlen implementation by Torbjorn Granlund (address@hidden),
@@ -24,7 +24,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
# include <config.h>
#endif
Index: lib/memmove.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/memmove.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- lib/memmove.c 19 Sep 2005 21:26:13 -0000 1.7
+++ lib/memmove.c 22 Sep 2006 17:54:39 -0000 1.8
@@ -3,9 +3,7 @@
In the public domain.
By David MacKenzie <address@hidden>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <stddef.h>
Index: lib/memrchr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/memrchr.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lib/memrchr.c 23 May 2005 17:44:31 -0000 1.2
+++ lib/memrchr.c 22 Sep 2006 17:54:39 -0000 1.3
@@ -1,7 +1,7 @@
/* memrchr -- find the last occurrence of a byte in a memory block
- Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2005
- Free Software Foundation, Inc.
+ Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Based on strlen implementation by Torbjorn Granlund (address@hidden),
with help from Dan Sahlin (address@hidden) and
@@ -23,14 +23,11 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#if defined _LIBC
# include <string.h>
# include <memcopy.h>
#else
+# include <config.h>
# include "memrchr.h"
# define reg_char char
#endif
Index: lib/mkdir.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/mkdir.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- lib/mkdir.c 19 Sep 2005 21:26:13 -0000 1.7
+++ lib/mkdir.c 22 Sep 2006 17:54:39 -0000 1.8
@@ -1,7 +1,7 @@
/* On some systems, mkdir ("foo/", 0700) fails because of the trailing
slash. On those systems, this wrapper removes the trailing slash.
- Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Disable the definition of mkdir to rpl_mkdir (from config.h) in this
file. Otherwise, we'd get conflicting prototypes for rpl_mkdir on
Index: lib/mkdirat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/mkdirat.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lib/mkdirat.c 21 Aug 2006 19:22:22 -0000 1.2
+++ lib/mkdirat.c 22 Sep 2006 17:54:39 -0000 1.3
@@ -17,9 +17,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "openat.h"
Index: lib/mkstemp.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/mkstemp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/mkstemp.c 19 Sep 2005 21:26:13 -0000 1.5
+++ lib/mkstemp.c 22 Sep 2006 17:54:39 -0000 1.6
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2001, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2001, 2005, 2006 Free Software Foundation, Inc.
This file is derived from the one in the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -15,15 +15,12 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
+#if !_LIBC
# include <config.h>
+# include "mkstemp.h"
+int __gen_tempname ();
#endif
-/* Disable the definition of mkstemp to rpl_mkstemp (from config.h) in this
- file. Otherwise, we'd get conflicting prototypes for rpl_mkstemp on
- most systems. */
-#undef mkstemp
-
#include <stdio.h>
#include <stdlib.h>
@@ -31,14 +28,13 @@
# define __GT_FILE 0
#endif
-int __gen_tempname ();
-
/* Generate a unique temporary file name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
they are replaced with a string that makes the file name unique.
Then open the file and return a fd. */
int
-rpl_mkstemp (char *template)
+mkstemp (template)
+ char *template;
{
return __gen_tempname (template, __GT_FILE);
}
Index: lib/mktime.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/mktime.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- lib/mktime.c 19 Sep 2005 16:24:56 -0000 1.12
+++ lib/mktime.c 22 Sep 2006 17:54:39 -0000 1.13
@@ -1,7 +1,7 @@
/* Convert a `struct tm' to a time_t value.
- Copyright (C) 1993-1999, 2002-2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1993-1999, 2002-2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Paul Eggert (address@hidden).
+ Contributed by Paul Eggert <address@hidden>.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -215,10 +215,11 @@
/* Overflow occurred one way or another. Return the nearest result
that is actually in range, except don't report a zero difference
if the actual difference is nonzero, as that would cause a false
- match. */
+ match; and don't oscillate between two values, as that would
+ confuse the spring-forward gap detector. */
return (*t < TIME_T_MIDPOINT
- ? TIME_T_MIN + (*t == TIME_T_MIN)
- : TIME_T_MAX - (*t == TIME_T_MAX));
+ ? (*t <= TIME_T_MIN + 1 ? *t + 1 : TIME_T_MIN)
+ : (TIME_T_MAX - 1 <= *t ? *t - 1 : TIME_T_MAX));
}
/* Use CONVERT to convert *T to a broken down time in *TP.
Index: lib/nanosleep.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/nanosleep.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- lib/nanosleep.c 2 Sep 2006 23:17:59 -0000 1.9
+++ lib/nanosleep.c 22 Sep 2006 17:54:39 -0000 1.10
@@ -19,9 +19,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Undefine nanosleep here so any prototype is not redefined to be a
prototype for rpl_nanosleep. (they'd conflict e.g., on alpha-dec-osf3.2) */
@@ -29,10 +27,10 @@
#include <stdbool.h>
#include <stdio.h>
+#include <sys/types.h>
#if HAVE_SYS_SELECT_H
# include <sys/select.h>
#endif
-#include <sys/types.h>
#include <signal.h>
#if TIME_WITH_SYS_TIME
Index: lib/open-safer.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/open-safer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/open-safer.c 4 Oct 2005 02:34:54 -0000 1.1
+++ lib/open-safer.c 22 Sep 2006 17:54:39 -0000 1.2
@@ -1,5 +1,6 @@
/* Invoke open, but avoid some glitches.
- Copyright (C) 2005 Free Software Foundation, Inc.
+
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "fcntl-safer.h"
Index: lib/openat-die.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/openat-die.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/openat-die.c 4 Oct 2005 02:34:54 -0000 1.1
+++ lib/openat-die.c 22 Sep 2006 17:54:39 -0000 1.2
@@ -1,6 +1,6 @@
/* Report a save- or restore-cwd failure in our openat replacement and then
exit.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,9 +16,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <stdlib.h>
Index: lib/openat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/openat.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- lib/openat.c 21 Aug 2006 19:22:22 -0000 1.8
+++ lib/openat.c 22 Sep 2006 17:54:39 -0000 1.9
@@ -17,9 +17,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "openat.h"
Index: lib/pipe-safer.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/pipe-safer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lib/pipe-safer.c 16 Aug 2006 18:12:09 -0000 1.3
+++ lib/pipe-safer.c 22 Sep 2006 17:54:40 -0000 1.4
@@ -17,9 +17,7 @@
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "unistd-safer.h"
Index: lib/printf-args.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/printf-args.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/printf-args.c 16 Aug 2006 18:12:09 -0000 1.4
+++ lib/printf-args.c 22 Sep 2006 17:54:40 -0000 1.5
@@ -15,9 +15,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "printf-args.h"
Index: lib/printf-parse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/printf-parse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lib/printf-parse.c 23 May 2005 17:44:32 -0000 1.2
+++ lib/printf-parse.c 22 Sep 2006 17:54:40 -0000 1.3
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
+ Copyright (C) 1999-2000, 2002-2003, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#if WIDE_CHAR_VERSION
Index: lib/quotearg.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/quotearg.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- lib/quotearg.c 25 Jan 2006 12:53:38 -0000 1.6
+++ lib/quotearg.c 22 Sep 2006 17:54:40 -0000 1.7
@@ -19,9 +19,7 @@
/* Written by Paul Eggert <address@hidden> */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "quotearg.h"
Index: lib/readlink.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/readlink.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/readlink.c 16 Aug 2006 18:12:09 -0000 1.5
+++ lib/readlink.c 22 Sep 2006 17:54:40 -0000 1.6
@@ -1,5 +1,5 @@
/* Stub for readlink().
- Copyright (C) 2003-2005 Free Software Foundation, Inc.
+ Copyright (C) 2003-2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <errno.h>
#include <sys/types.h>
Index: lib/realloc.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/realloc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/realloc.c 19 Sep 2005 21:26:13 -0000 1.5
+++ lib/realloc.c 22 Sep 2006 17:54:40 -0000 1.6
@@ -1,5 +1,6 @@
/* realloc() function that is glibc compatible.
- Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc.
+
+ Copyright (C) 1997, 2003, 2004, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#undef realloc
#include <stdlib.h>
Index: lib/regex.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/regex.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- lib/regex.c 11 Apr 2006 20:21:31 -0000 1.23
+++ lib/regex.c 22 Sep 2006 17:54:40 -0000 1.24
@@ -17,9 +17,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Make sure noone compiles this code with a C++ compiler. */
#if defined __cplusplus && defined _LIBC
Index: lib/regex_internal.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/regex_internal.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- lib/regex_internal.c 16 Aug 2006 18:12:09 -0000 1.9
+++ lib/regex_internal.c 22 Sep 2006 17:54:40 -0000 1.10
@@ -597,17 +597,78 @@
if (BE (offset != 0, 1))
{
- /* Are the characters which are already checked remain? */
- if (BE (offset < pstr->valid_raw_len, 1)
+ /* Should the already checked characters be kept? */
+ if (BE (offset < pstr->valid_raw_len, 1))
+ {
+ /* Yes, move them to the front of the buffer. */
#ifdef RE_ENABLE_I18N
- /* Handling this would enlarge the code too much.
- Accept a slowdown in that case. */
- && pstr->offsets_needed == 0
+ if (BE (pstr->offsets_needed, 0))
+ {
+ Idx low = 0, high = pstr->valid_len, mid;
+ do
+ {
+ mid = (high + low) / 2;
+ if (pstr->offsets[mid] > offset)
+ high = mid;
+ else if (pstr->offsets[mid] < offset)
+ low = mid + 1;
+ else
+ break;
+ }
+ while (low < high);
+ if (pstr->offsets[mid] < offset)
+ ++mid;
+ pstr->tip_context = re_string_context_at (pstr, mid - 1,
+ eflags);
+ /* This can be quite complicated, so handle specially
+ only the common and easy case where the character with
+ different length representation of lower and upper
+ case is present at or after offset. */
+ if (pstr->valid_len > offset
+ && mid == offset && pstr->offsets[mid] == offset)
+ {
+ memmove (pstr->wcs, pstr->wcs + offset,
+ (pstr->valid_len - offset) * sizeof (wint_t));
+ memmove (pstr->mbs, pstr->mbs + offset, pstr->valid_len -
offset);
+ pstr->valid_len -= offset;
+ pstr->valid_raw_len -= offset;
+ for (low = 0; low < pstr->valid_len; low++)
+ pstr->offsets[low] = pstr->offsets[low + offset] - offset;
+ }
+ else
+ {
+ /* Otherwise, just find out how long the partial multibyte
+ character at offset is and fill it with WEOF/255. */
+ pstr->len = pstr->raw_len - idx + offset;
+ pstr->stop = pstr->raw_stop - idx + offset;
+ pstr->offsets_needed = 0;
+ while (mid > 0 && pstr->offsets[mid - 1] == offset)
+ --mid;
+ while (mid < pstr->valid_len)
+ if (pstr->wcs[mid] != WEOF)
+ break;
+ else
+ ++mid;
+ if (mid == pstr->valid_len)
+ pstr->valid_len = 0;
+ else
+ {
+ pstr->valid_len = pstr->offsets[mid] - offset;
+ if (pstr->valid_len)
+ {
+ for (low = 0; low < pstr->valid_len; ++low)
+ pstr->wcs[low] = WEOF;
+ memset (pstr->mbs, 255, pstr->valid_len);
+ }
+ }
+ pstr->valid_raw_len = pstr->valid_len;
+ }
+ }
+ else
#endif
- )
{
- /* Yes, move them to the front of the buffer. */
- pstr->tip_context = re_string_context_at (pstr, offset - 1, eflags);
+ pstr->tip_context = re_string_context_at (pstr, offset - 1,
+ eflags);
#ifdef RE_ENABLE_I18N
if (pstr->mb_cur_max > 1)
memmove (pstr->wcs, pstr->wcs + offset,
@@ -622,9 +683,12 @@
assert (pstr->valid_len > 0);
#endif
}
+ }
else
{
/* No, skip all characters until IDX. */
+ Idx prev_valid_len = pstr->valid_len;
+
#ifdef RE_ENABLE_I18N
if (BE (pstr->offsets_needed, 0))
{
@@ -648,6 +712,8 @@
byte other than 0x80 - 0xbf. */
raw = pstr->raw_mbs + pstr->raw_mbs_idx;
end = raw + (offset - pstr->mb_cur_max);
+ if (end < pstr->raw_mbs)
+ end = pstr->raw_mbs;
p = raw + offset - 1;
#ifdef _LIBC
/* We know the wchar_t encoding is UCS4, so for the simple
@@ -655,7 +721,7 @@
if (isascii (*p) && BE (pstr->trans == NULL, 1))
{
memset (&pstr->cur_state, '\0', sizeof (mbstate_t));
- pstr->valid_len = 0;
+ /* pstr->valid_len = 0; */
wc = (wchar_t) *p;
}
else
@@ -698,7 +764,7 @@
pstr->valid_len = re_string_skip_chars (pstr, idx, &wc) - idx;
if (wc == WEOF)
pstr->tip_context
- = re_string_context_at (pstr, pstr->valid_raw_len - 1,
eflags);
+ = re_string_context_at (pstr, prev_valid_len - 1, eflags);
else
pstr->tip_context = ((BE (pstr->word_ops_used != 0, 0)
&& IS_WIDE_WORD_CHAR (wc))
@@ -711,7 +777,7 @@
for (wcs_idx = 0; wcs_idx < pstr->valid_len; ++wcs_idx)
pstr->wcs[wcs_idx] = WEOF;
if (pstr->mbs_allocated)
- memset (pstr->mbs, -1, pstr->valid_len);
+ memset (pstr->mbs, 255, pstr->valid_len);
}
pstr->valid_raw_len = pstr->valid_len;
}
@@ -1340,7 +1406,6 @@
internal_function
re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
{
- int type = token.type;
if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0))
{
size_t new_nodes_alloc = dfa->nodes_alloc * 2;
@@ -1376,8 +1441,11 @@
dfa->nodes[dfa->nodes_len] = token;
dfa->nodes[dfa->nodes_len].constraint = 0;
#ifdef RE_ENABLE_I18N
+ {
+ int type = token.type;
dfa->nodes[dfa->nodes_len].accept_mb =
(type == OP_PERIOD && dfa->mb_cur_max > 1) || type == COMPLEX_BRACKET;
+ }
#endif
dfa->nexts[dfa->nodes_len] = REG_MISSING;
re_node_set_init_empty (dfa->edests + dfa->nodes_len);
Index: lib/rename.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/rename.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- lib/rename.c 19 Sep 2005 21:26:14 -0000 1.10
+++ lib/rename.c 22 Sep 2006 17:54:40 -0000 1.11
@@ -1,7 +1,8 @@
/* Work around the bug in some systems whereby rename fails when the source
file has a trailing slash. The rename functions of SunOS 4.1.1_U1 and
mips-dec-ultrix4.4 have this bug.
- Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+
+ Copyright (C) 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,9 +20,7 @@
/* written by Volker Borchert */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#undef rename
#include <stdio.h>
Index: lib/rpmatch.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/rpmatch.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/rpmatch.c 19 Sep 2005 21:26:14 -0000 1.5
+++ lib/rpmatch.c 22 Sep 2006 17:54:40 -0000 1.6
@@ -1,6 +1,8 @@
/* Determine whether string value is affirmation or negative response
according to current locale's data.
- Copyright (C) 1996, 1998, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+ Copyright (C) 1996, 1998, 2000, 2002, 2003, 2006 Free Software
+ Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,9 +18,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <stddef.h>
#include <stdlib.h>
Index: lib/save-cwd.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/save-cwd.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- lib/save-cwd.c 25 Jan 2006 12:53:38 -0000 1.13
+++ lib/save-cwd.c 22 Sep 2006 17:54:40 -0000 1.14
@@ -1,7 +1,7 @@
/* save-cwd.c -- Save and restore current working directory.
- Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005 Free Software
- Foundation, Inc.
+ Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005, 2006 Free
+ Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "save-cwd.h"
Index: lib/setenv.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/setenv.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- lib/setenv.c 16 Aug 2006 18:12:09 -0000 1.6
+++ lib/setenv.c 22 Sep 2006 17:54:40 -0000 1.7
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2003,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2003,2005,2006 Free Software Foundation,
Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
+#if !_LIBC
# include <config.h>
#endif
#include <alloca.h>
Index: lib/snprintf.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/snprintf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lib/snprintf.c 16 Aug 2006 18:12:09 -0000 1.2
+++ lib/snprintf.c 22 Sep 2006 17:54:40 -0000 1.3
@@ -16,9 +16,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "snprintf.h"
Index: lib/strcasecmp.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strcasecmp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/strcasecmp.c 20 Oct 2005 21:06:01 -0000 1.4
+++ lib/strcasecmp.c 22 Sep 2006 17:54:40 -0000 1.5
@@ -1,5 +1,5 @@
/* Case-insensitive string comparison function.
- Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 2005-2006 Free Software Foundation, Inc.
Written by Bruno Haible <address@hidden>, 2005,
based on earlier glibc code.
@@ -17,9 +17,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "strcase.h"
Index: lib/strdup.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strdup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/strdup.c 23 May 2005 17:44:32 -0000 1.5
+++ lib/strdup.c 22 Sep 2006 17:54:40 -0000 1.6
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004 Free Software
- Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004, 2006 Free
+ Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,11 +17,8 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#ifndef _LIBC
+# include <config.h>
/* Get specification. */
# include "strdup.h"
#endif
Index: lib/strerror.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strerror.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- lib/strerror.c 19 Sep 2005 21:26:14 -0000 1.7
+++ lib/strerror.c 22 Sep 2006 17:54:40 -0000 1.8
@@ -1,7 +1,7 @@
/* strerror.c --- ANSI C compatible system error routine
- Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003 Free Software
- Foundation, Inc.
+ Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003, 2006 Free
+ Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <limits.h>
Index: lib/strftime.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strftime.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- lib/strftime.c 7 Jul 2006 02:46:50 -0000 1.13
+++ lib/strftime.c 22 Sep 2006 17:54:40 -0000 1.14
@@ -18,10 +18,6 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#ifdef _LIBC
# define HAVE_MBLEN 1
# define HAVE_MBRLEN 1
@@ -32,6 +28,8 @@
# define HAVE_TZSET 1
# define MULTIBYTE_IS_FORMAT_SAFE 1
# include "../locale/localeinfo.h"
+#else
+# include <config.h>
#endif
#include <ctype.h>
Index: lib/stripslash.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/stripslash.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- lib/stripslash.c 6 Jul 2006 02:17:59 -0000 1.8
+++ lib/stripslash.c 22 Sep 2006 17:54:40 -0000 1.9
@@ -16,9 +16,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "dirname.h"
Index: lib/strncasecmp.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strncasecmp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/strncasecmp.c 20 Oct 2005 21:06:01 -0000 1.4
+++ lib/strncasecmp.c 22 Sep 2006 17:54:40 -0000 1.5
@@ -1,5 +1,5 @@
/* strncasecmp.c -- case insensitive string comparator
- Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 2005-2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "strcase.h"
Index: lib/strndup.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strndup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/strndup.c 6 Jul 2006 02:17:59 -0000 1.1
+++ lib/strndup.c 22 Sep 2006 17:54:40 -0000 1.2
@@ -18,10 +18,8 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
#if !_LIBC
+# include <config.h>
# include "strndup.h"
#endif
Index: lib/strnlen.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strnlen.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/strnlen.c 6 Jul 2006 02:17:59 -0000 1.1
+++ lib/strnlen.c 22 Sep 2006 17:54:40 -0000 1.2
@@ -16,9 +16,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "strnlen.h"
Index: lib/strnlen1.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strnlen1.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lib/strnlen1.c 16 Aug 2006 18:12:09 -0000 1.3
+++ lib/strnlen1.c 22 Sep 2006 17:54:40 -0000 1.4
@@ -1,5 +1,5 @@
/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "strnlen1.h"
Index: lib/strstr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strstr.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/strstr.c 19 Sep 2005 21:26:14 -0000 1.5
+++ lib/strstr.c 22 Sep 2006 17:54:40 -0000 1.6
@@ -1,5 +1,5 @@
/* Searching in a string.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006 Free Software Foundation, Inc.
Written by Bruno Haible <address@hidden>, 2005.
This program is free software; you can redistribute it and/or modify
@@ -16,9 +16,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "strstr.h"
Index: lib/strtoimax.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strtoimax.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/strtoimax.c 21 Aug 2006 19:22:22 -0000 1.5
+++ lib/strtoimax.c 22 Sep 2006 17:54:40 -0000 1.6
@@ -19,9 +19,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Verify interface. */
#include <inttypes.h>
Index: lib/strtol.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strtol.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- lib/strtol.c 6 Jul 2006 13:47:56 -0000 1.8
+++ lib/strtol.c 22 Sep 2006 17:54:40 -0000 1.9
@@ -20,12 +20,10 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#ifdef _LIBC
# define USE_NUMBER_GROUPING
+#else
+# include <config.h>
#endif
#include <ctype.h>
Index: lib/tempname.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/tempname.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- lib/tempname.c 21 Aug 2006 19:22:22 -0000 1.10
+++ lib/tempname.c 22 Sep 2006 17:54:40 -0000 1.11
@@ -17,7 +17,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
+#if !_LIBC
# include <config.h>
#endif
@@ -213,11 +213,15 @@
necessary to try all these combinations. Instead if a reasonable
number of names is tried (we define reasonable as 62**3) fail to
give the system administrator the chance to remove the problems. */
- unsigned int attempts_min = 62 * 62 * 62;
+#define ATTEMPTS_MIN (62 * 62 * 62)
/* The number of times to attempt to generate a temporary file. To
conform to POSIX, this must be no smaller than TMP_MAX. */
- unsigned int attempts = attempts_min < TMP_MAX ? TMP_MAX : attempts_min;
+#if ATTEMPTS_MIN < TMP_MAX
+ unsigned int attempts = TMP_MAX;
+#else
+ unsigned int attempts = ATTEMPTS_MIN;
+#endif
len = strlen (tmpl);
if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
Index: lib/time_r.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/time_r.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/time_r.c 30 Mar 2006 18:13:12 -0000 1.5
+++ lib/time_r.c 22 Sep 2006 17:54:40 -0000 1.6
@@ -18,9 +18,7 @@
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "time_r.h"
Index: lib/unsetenv.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/unsetenv.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/unsetenv.c 19 Jun 2006 17:45:58 -0000 1.5
+++ lib/unsetenv.c 22 Sep 2006 17:54:40 -0000 1.6
@@ -15,9 +15,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <errno.h>
#if !_LIBC
Index: lib/vasnprintf.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/vasnprintf.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- lib/vasnprintf.c 2 Sep 2006 23:17:59 -0000 1.6
+++ lib/vasnprintf.c 22 Sep 2006 17:54:40 -0000 1.7
@@ -22,9 +22,7 @@
# define _GNU_SOURCE 1
#endif
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#ifndef IN_LIBINTL
# include <alloca.h>
#endif
Index: lib/vasprintf.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/vasprintf.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- lib/vasprintf.c 2 Sep 2006 23:17:59 -0000 1.14
+++ lib/vasprintf.c 22 Sep 2006 17:54:40 -0000 1.15
@@ -15,9 +15,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "vasprintf.h"
Index: lib/xalloc-die.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/xalloc-die.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/xalloc-die.c 20 Mar 2006 02:21:56 -0000 1.4
+++ lib/xalloc-die.c 22 Sep 2006 17:54:40 -0000 1.5
@@ -17,9 +17,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "xalloc.h"
Index: lib/xgetcwd.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/xgetcwd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/xgetcwd.c 19 Sep 2005 21:26:14 -0000 1.5
+++ lib/xgetcwd.c 22 Sep 2006 17:54:40 -0000 1.6
@@ -1,6 +1,6 @@
/* xgetcwd.c -- return current directory with unlimited length
- Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "xgetcwd.h"
Index: lib/xgethostname.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/xgethostname.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/xgethostname.c 4 Oct 2005 02:34:54 -0000 1.4
+++ lib/xgethostname.c 22 Sep 2006 17:54:40 -0000 1.5
@@ -1,7 +1,7 @@
/* xgethostname.c -- return current hostname with unlimited length
- Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005 Free Software
- Foundation, Inc.
+ Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005, 2006 Free
+ Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "xgethostname.h"
Index: lib/xmalloc.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/xmalloc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/xmalloc.c 19 Sep 2005 21:26:14 -0000 1.5
+++ lib/xmalloc.c 22 Sep 2006 17:54:40 -0000 1.6
@@ -1,7 +1,8 @@
/* xmalloc.c -- malloc with out of memory checking
Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+ Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "xalloc.h"
Index: lib/xreadlink.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/xreadlink.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lib/xreadlink.c 4 Oct 2005 02:34:54 -0000 1.5
+++ lib/xreadlink.c 22 Sep 2006 17:54:40 -0000 1.6
@@ -1,6 +1,7 @@
/* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
- Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software
+ Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,9 +20,7 @@
/* Written by Jim Meyering <address@hidden> */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "xreadlink.h"
Index: lib/yesno.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/yesno.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- lib/yesno.c 19 Sep 2005 21:26:14 -0000 1.8
+++ lib/yesno.c 22 Sep 2006 17:54:40 -0000 1.9
@@ -1,7 +1,7 @@
/* yesno.c -- read a yes/no response from stdin
- Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005 Free Software
- Foundation, Inc.
+ Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005, 2006 Free
+ Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "yesno.h"
Index: m4/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/ChangeLog,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- m4/ChangeLog 2 Sep 2006 23:17:59 -0000 1.188
+++ m4/ChangeLog 22 Sep 2006 17:54:40 -0000 1.189
@@ -1,3 +1,10 @@
+2006-09-22 Mark D. Baushke <address@hidden>
+
+ * mmap-anon.m4, pagealign_alloc.m4: Remove as no longer needed.
+ * getdate.m4, gettext.m4, gnulib-cache.m4, gnulib-comp.m4,
+ inttypes-h.m4, inttypes-pri.m4, inttypes.m4, lib-link.m4,
+ mkstemp.m4, mktime.m4, regex.m4, rename.m4: Update from GNULIB.
+
2006-09-02 Mark D. Baushke <address@hidden>
* codeset.m4, fnmatch.m4, gnulib-cache.m4, gnulib-comp.m4,
Index: m4/getdate.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/getdate.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- m4/getdate.m4 24 Aug 2006 01:24:14 -0000 1.6
+++ m4/getdate.m4 22 Sep 2006 17:54:40 -0000 1.7
@@ -1,4 +1,4 @@
-# getdate.m4 serial 10
+# getdate.m4 serial 11
dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -19,8 +19,6 @@
AC_DEFUN([gl_GETDATE],
[
- AC_LIBOBJ([getdate])
-
dnl Prerequisites of lib/getdate.h.
AC_REQUIRE([AM_STDBOOL_H])
AC_REQUIRE([gl_TIMESPEC])
Index: m4/gettext.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/gettext.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- m4/gettext.m4 16 Aug 2006 18:12:09 -0000 1.9
+++ m4/gettext.m4 22 Sep 2006 17:54:40 -0000 1.10
@@ -1,4 +1,4 @@
-# gettext.m4 serial 53 (gettext-0.15)
+# gettext.m4 serial 53.1
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -17,6 +17,8 @@
dnl Ulrich Drepper <address@hidden>, 1995-2000.
dnl Bruno Haible <address@hidden>, 2000-2005.
+AC_PREREQ(2.52)
+
dnl Macro to add for using GNU gettext.
dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
@@ -497,7 +499,6 @@
AC_REQUIRE([AC_FUNC_MMAP])dnl
AC_REQUIRE([gt_INTDIV0])dnl
AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
- AC_REQUIRE([gl_HEADER_INTTYPES_H])dnl
AC_REQUIRE([gt_INTTYPES_PRI])dnl
AC_REQUIRE([gl_LOCK])dnl
@@ -507,7 +508,7 @@
[AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,
[Define to 1 if the compiler understands __builtin_expect.])])
- AC_CHECK_HEADERS([argz.h limits.h unistd.h sys/param.h])
+ AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
argz_next __fsetlocking])
Index: m4/gnulib-cache.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/gnulib-cache.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- m4/gnulib-cache.m4 2 Sep 2006 23:17:59 -0000 1.11
+++ m4/gnulib-cache.m4 22 Sep 2006 17:54:40 -0000 1.12
@@ -15,11 +15,11 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --lib=libcvs --source-base=lib --m4-base=m4
--doc-base=doc --aux-dir=build-aux --no-libtool --macro-prefix=gl allocsa
atexit base64 canon-host canonicalize closeout dirname dup2 error exit exitfail
extensions fnmatch fnmatch-posix ftruncate getdate gethostname getline
getlogin_r getndelim2 getnline getopt getpagesize getpass-gnu gettext gettime
gettimeofday glob inttypes lstat malloc md5 memmove minmax mkdir mkstemp mktime
nanosleep pagealign_alloc pathmax quotearg readlink realloc regex rename
save-cwd setenv stat-macros stdbool stdint strcase strdup strerror strftime
strstr strtoul strtoumax time_r timespec tzset unlocked-io vasnprintf vasprintf
xalloc-die xgethostname xreadlink xsize yesno
+# gnulib-tool --import --dir=. --lib=libcvs --source-base=lib --m4-base=m4
--doc-base=doc --aux-dir=build-aux --no-libtool --macro-prefix=gl allocsa
atexit base64 canon-host canonicalize closeout dirname dup2 error exit exitfail
extensions fnmatch fnmatch-posix ftruncate getdate gethostname getline
getlogin_r getndelim2 getnline getopt getpagesize getpass-gnu gettext gettime
gettimeofday glob inttypes lstat malloc md5 memmove minmax mkdir mkstemp mktime
nanosleep pathmax quotearg readlink realloc regex rename save-cwd setenv
stat-macros stdbool stdint strcase strdup strerror strftime strstr strtoul
strtoumax time_r timespec tzset unlocked-io vasnprintf vasprintf xalloc-die
xgethostname xreadlink xsize yesno
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([])
-gl_MODULES([allocsa atexit base64 canon-host canonicalize closeout dirname
dup2 error exit exitfail extensions fnmatch fnmatch-posix ftruncate getdate
gethostname getline getlogin_r getndelim2 getnline getopt getpagesize
getpass-gnu gettext gettime gettimeofday glob inttypes lstat malloc md5 memmove
minmax mkdir mkstemp mktime nanosleep pagealign_alloc pathmax quotearg readlink
realloc regex rename save-cwd setenv stat-macros stdbool stdint strcase strdup
strerror strftime strstr strtoul strtoumax time_r timespec tzset unlocked-io
vasnprintf vasprintf xalloc-die xgethostname xreadlink xsize yesno])
+gl_MODULES([allocsa atexit base64 canon-host canonicalize closeout dirname
dup2 error exit exitfail extensions fnmatch fnmatch-posix ftruncate getdate
gethostname getline getlogin_r getndelim2 getnline getopt getpagesize
getpass-gnu gettext gettime gettimeofday glob inttypes lstat malloc md5 memmove
minmax mkdir mkstemp mktime nanosleep pathmax quotearg readlink realloc regex
rename save-cwd setenv stat-macros stdbool stdint strcase strdup strerror
strftime strstr strtoul strtoumax time_r timespec tzset unlocked-io vasnprintf
vasprintf xalloc-die xgethostname xreadlink xsize yesno])
gl_AVOID([])
gl_SOURCE_BASE([lib])
gl_M4_BASE([m4])
Index: m4/gnulib-comp.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/gnulib-comp.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- m4/gnulib-comp.m4 2 Sep 2006 23:17:59 -0000 1.25
+++ m4/gnulib-comp.m4 22 Sep 2006 17:54:40 -0000 1.26
@@ -32,6 +32,10 @@
AC_DEFUN([gl_INIT],
[
AM_CONDITIONAL([GL_COND_LIBTOOL], [false])
+ gl_cond_libtool=false
+ gl_libdeps=
+ gl_ltlibdeps=
+ gl_source_base='lib'
gl_FUNC_ALLOCA
gl_ALLOCSA
gl_HEADER_ARPA_INET
@@ -94,13 +98,12 @@
gl_FUNC_NANOSLEEP
gl_HEADER_NETINET_IN
gl_FUNC_OPENAT
- gl_PAGEALIGN_ALLOC
gl_PATHMAX
gl_QUOTEARG
gl_FUNC_READLINK
AC_FUNC_REALLOC
gl_REGEX
- vb_FUNC_RENAME
+ gl_FUNC_RENAME
gl_FUNC_RPMATCH
gl_SAVE_CWD
gt_FUNC_SETENV
@@ -141,6 +144,10 @@
gl_XSIZE
gl_XSTRNDUP
gl_YESNO
+ LIBCVS_LIBDEPS="$gl_libdeps"
+ AC_SUBST([LIBCVS_LIBDEPS])
+ LIBCVS_LTLIBDEPS="$gl_ltlibdeps"
+ AC_SUBST([LIBCVS_LTLIBDEPS])
])
# This macro records the list of files which have been installed by
@@ -253,6 +260,7 @@
lib/mkdir.c
lib/mkdirat.c
lib/mkstemp.c
+ lib/mkstemp.h
lib/mktime.c
lib/nanosleep.c
lib/open-safer.c
@@ -260,8 +268,6 @@
lib/openat-priv.h
lib/openat.c
lib/openat.h
- lib/pagealign_alloc.c
- lib/pagealign_alloc.h
lib/pathmax.h
lib/pipe-safer.c
lib/printf-args.c
@@ -428,12 +434,10 @@
m4/mkdir-slash.m4
m4/mkstemp.m4
m4/mktime.m4
- m4/mmap-anon.m4
m4/nanosleep.m4
m4/netinet_in_h.m4
m4/nls.m4
m4/openat.m4
- m4/pagealign_alloc.m4
m4/pathmax.m4
m4/po.m4
m4/printf-posix.m4
Index: m4/inttypes-h.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/inttypes-h.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- m4/inttypes-h.m4 16 Aug 2006 18:12:09 -0000 1.1
+++ m4/inttypes-h.m4 22 Sep 2006 17:54:40 -0000 1.2
@@ -1,25 +1 @@
-# inttypes-h.m4 serial 1 (gettext-0.15)
-dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gl_HEADER_INTTYPES_H],
-[
- AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
- [
- AC_TRY_COMPILE(
- [#include <sys/types.h>
-#include <inttypes.h>],
- [], gl_cv_header_inttypes_h=yes, gl_cv_header_inttypes_h=no)
- ])
- if test $gl_cv_header_inttypes_h = yes; then
- AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
- [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
- fi
-])
+/* This file will go away when gettext-0.15.1 is released. */
Index: m4/inttypes-pri.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/inttypes-pri.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- m4/inttypes-pri.m4 2 Sep 2006 23:17:59 -0000 1.4
+++ m4/inttypes-pri.m4 22 Sep 2006 17:54:40 -0000 1.5
@@ -1,4 +1,4 @@
-# inttypes-pri.m4 serial 3 (gettext-0.15.1)
+# inttypes-pri.m4 serial 4 (gettext-0.15.1)
dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -6,13 +6,15 @@
dnl From Bruno Haible.
+AC_PREREQ(2.52)
+
# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
# macros to non-string values. This is the case on AIX 4.3.3.
AC_DEFUN([gt_INTTYPES_PRI],
[
- AC_REQUIRE([gl_HEADER_INTTYPES_H])
- if test $gl_cv_header_inttypes_h = yes; then
+ AC_CHECK_HEADERS([inttypes.h])
+ if test $ac_cv_header_inttypes_h = yes; then
AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
gt_cv_inttypes_pri_broken,
[
Index: m4/inttypes.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/inttypes.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- m4/inttypes.m4 2 Sep 2006 23:17:59 -0000 1.4
+++ m4/inttypes.m4 22 Sep 2006 17:54:40 -0000 1.5
@@ -1,4 +1,4 @@
-# inttypes.m4 serial 4
+# inttypes.m4 serial 5
dnl Copyright (C) 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -23,8 +23,8 @@
dnl - that imaxabs, imaxdiv, strtoimax, strtoumax are declared,
dnl - some additional tests.
gl_cv_header_working_inttypes_h=no
- if test $gl_cv_header_working_stdint_h = yes \
- && test $gl_cv_header_inttypes_h = yes \
+ if test "$gl_cv_header_working_stdint_h" = yes \
+ && test $ac_cv_header_inttypes_h = yes \
&& test "$ac_cv_have_decl_imaxabs" = yes \
&& test "$ac_cv_have_decl_imaxdiv" = yes \
&& test "$ac_cv_have_decl_strtoimax" = yes \
Index: m4/lib-link.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/lib-link.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- m4/lib-link.m4 16 Aug 2006 18:12:09 -0000 1.6
+++ m4/lib-link.m4 22 Sep 2006 17:54:40 -0000 1.7
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 8 (gettext-0.15)
+# lib-link.m4 serial 9 (gettext-0.15.1)
dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -198,9 +198,16 @@
found_so=
found_a=
if test $use_additional = yes; then
- if test -n "$shlibext" && test -f
"$additional_libdir/lib$name.$shlibext"; then
+ if test -n "$shlibext" \
+ && { test -f "$additional_libdir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$additional_libdir/lib$name.dll.a"; }; };
then
found_dir="$additional_libdir"
+ if test -f "$additional_libdir/lib$name.$shlibext"; then
found_so="$additional_libdir/lib$name.$shlibext"
+ else
+ found_so="$additional_libdir/lib$name.dll.a"
+ fi
if test -f "$additional_libdir/lib$name.la"; then
found_la="$additional_libdir/lib$name.la"
fi
@@ -220,9 +227,16 @@
case "$x" in
-L*)
dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext";
then
+ if test -n "$shlibext" \
+ && { test -f "$dir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$dir/lib$name.dll.a"; }; }; then
found_dir="$dir"
+ if test -f "$dir/lib$name.$shlibext"; then
found_so="$dir/lib$name.$shlibext"
+ else
+ found_so="$dir/lib$name.dll.a"
+ fi
if test -f "$dir/lib$name.la"; then
found_la="$dir/lib$name.la"
fi
Index: m4/mkstemp.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/mkstemp.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- m4/mkstemp.m4 21 Aug 2006 19:22:22 -0000 1.8
+++ m4/mkstemp.m4 22 Sep 2006 17:54:40 -0000 1.9
@@ -1,4 +1,4 @@
-#serial 13
+#serial 14
# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -12,46 +12,41 @@
# only 32 files per process.
# On systems like the above, arrange to use the replacement function.
AC_DEFUN([gl_FUNC_MKSTEMP],
-[dnl
- AC_REPLACE_FUNCS(mkstemp)
- if test $ac_cv_func_mkstemp = no; then
- gl_cv_func_mkstemp_limitations=yes
- else
- AC_CACHE_CHECK([for mkstemp limitations],
- gl_cv_func_mkstemp_limitations,
+[
+ AC_REQUIRE([AC_SYS_LARGEFILE])
+
+ AC_CACHE_CHECK([for working mkstemp],
+ [gl_cv_func_working_mkstemp],
[
mkdir conftest.mkstemp
- AC_TRY_RUN([
-# include <stdlib.h>
-# include <unistd.h>
- int main ()
- {
- int i;
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [AC_INCLUDES_DEFAULT],
+ [[int i;
+ off_t large = (off_t) 4294967295u;
+ if (large < 0)
+ large = 2147483647;
for (i = 0; i < 70; i++)
{
char template[] = "conftest.mkstemp/coXXXXXX";
- int fd = mkstemp (template);
- if (fd == -1)
- exit (1);
+ int (*mkstemp_function) (char *) = mkstemp;
+ int fd = mkstemp_function (template);
+ if (fd < 0 || lseek (fd, large, SEEK_SET) != large)
+ return 1;
close (fd);
}
- exit (0);
- }
- ],
- gl_cv_func_mkstemp_limitations=no,
- gl_cv_func_mkstemp_limitations=yes,
- gl_cv_func_mkstemp_limitations=yes
- )
+ return 0;]])],
+ [gl_cv_func_working_mkstemp=yes],
+ [gl_cv_func_working_mkstemp=no],
+ [gl_cv_func_working_mkstemp=no])
rm -rf conftest.mkstemp
- ]
- )
- fi
+ ])
- if test $gl_cv_func_mkstemp_limitations = yes; then
+ if test $gl_cv_func_working_mkstemp != yes; then
+ AC_DEFINE([__MKSTEMP_PREFIX], [[rpl_]],
+ [Define to rpl_ if the mkstemp replacement function should be used.])
AC_LIBOBJ(mkstemp)
AC_LIBOBJ(tempname)
- AC_DEFINE(mkstemp, rpl_mkstemp,
- [Define to rpl_mkstemp if the replacement function should be used.])
gl_PREREQ_MKSTEMP
gl_PREREQ_TEMPNAME
fi
Index: m4/mktime.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/mktime.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- m4/mktime.m4 4 Oct 2005 02:33:12 -0000 1.3
+++ m4/mktime.m4 22 Sep 2006 17:54:40 -0000 1.4
@@ -1,29 +1,29 @@
-#serial 7
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+#serial 8
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl From Jim Meyering.
-# Redefine AC_FUNC_MKTIME, to fix a bug in Autoconf 2.57 and earlier.
-# This redefinition can be removed once a new version of Autoconf comes out.
+# Redefine AC_FUNC_MKTIME, to fix a bug in Autoconf 2.60a and earlier.
+# This redefinition can be removed once a new version of Autoconf is assumed.
# The redefinition is taken from
-#
<http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/autoconf/autoconf/lib/autoconf/functions.m4?rev=1.78>.
+#
<http://cvs.sv.gnu.org/viewcvs/*checkout*/autoconf/lib/autoconf/functions.m4?rev=1.108&root=autoconf>.
# AC_FUNC_MKTIME
# --------------
AC_DEFUN([AC_FUNC_MKTIME],
[AC_REQUIRE([AC_HEADER_TIME])dnl
-AC_CHECK_HEADERS_ONCE(sys/time.h)
+AC_CHECK_HEADERS_ONCE(sys/time.h unistd.h)
AC_CHECK_FUNCS_ONCE(alarm)
AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime,
[AC_RUN_IFELSE([AC_LANG_SOURCE(
[[/* Test program from Paul Eggert and Tony Leneis. */
-#if TIME_WITH_SYS_TIME
+#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
-# if HAVE_SYS_TIME_H
+# ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
@@ -31,9 +31,12 @@
#endif
#include <stdlib.h>
-#include <unistd.h>
-#if !HAVE_ALARM
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifndef HAVE_ALARM
# define alarm(X) /* empty */
#endif
@@ -50,9 +53,9 @@
};
#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
-/* Fail if mktime fails to convert a date in the spring-forward gap.
+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
Based on a problem report from Andreas Jaeger. */
-static void
+static int
spring_forward_gap ()
{
/* glibc (up to about 1998-10-07) failed this test. */
@@ -71,29 +74,27 @@
tm.tm_min = 0;
tm.tm_sec = 0;
tm.tm_isdst = -1;
- if (mktime (&tm) == (time_t)-1)
- exit (1);
+ return mktime (&tm) != (time_t) -1;
}
-static void
+static int
mktime_test1 (now)
time_t now;
{
struct tm *lt;
- if ((lt = localtime (&now)) && mktime (lt) != now)
- exit (1);
+ return ! (lt = localtime (&now)) || mktime (lt) == now;
}
-static void
+static int
mktime_test (now)
time_t now;
{
- mktime_test1 (now);
- mktime_test1 ((time_t) (time_t_max - now));
- mktime_test1 ((time_t) (time_t_min + now));
+ return (mktime_test1 (now)
+ && mktime_test1 ((time_t) (time_t_max - now))
+ && mktime_test1 ((time_t) (time_t_min + now)));
}
-static void
+static int
irix_6_4_bug ()
{
/* Based on code from Ariel Faigon. */
@@ -106,11 +107,10 @@
tm.tm_sec = 0;
tm.tm_isdst = -1;
mktime (&tm);
- if (tm.tm_mon != 2 || tm.tm_mday != 31)
- exit (1);
+ return tm.tm_mon == 2 && tm.tm_mday == 31;
}
-static void
+static int
bigtime_test (j)
int j;
{
@@ -132,8 +132,39 @@
&& lt->tm_wday == tm.tm_wday
&& ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
== (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
- exit (1);
+ return 0;
}
+ return 1;
+}
+
+static int
+year_2050_test ()
+{
+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
+ ignoring leap seconds. */
+ unsigned long int answer = 2527315200UL;
+
+ struct tm tm;
+ time_t t;
+ tm.tm_year = 2050 - 1900;
+ tm.tm_mon = 2 - 1;
+ tm.tm_mday = 1;
+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
+ tm.tm_isdst = -1;
+
+ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
+ instead of "TZ=America/Vancouver" in order to detect the bug even
+ on systems that don't support the Olson extension, or don't have the
+ full zoneinfo tables installed. */
+ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
+
+ t = mktime (&tm);
+
+ /* Check that the result is either a failure, or close enough
+ to the correct answer that we can assume the discrepancy is
+ due to leap seconds. */
+ return (t == (time_t) -1
+ || (0 < t && answer - 120 <= t && t <= answer + 120));
}
int
@@ -160,18 +191,20 @@
putenv (tz_strings[i]);
for (t = 0; t <= time_t_max - delta; t += delta)
- mktime_test (t);
- mktime_test ((time_t) 1);
- mktime_test ((time_t) (60 * 60));
- mktime_test ((time_t) (60 * 60 * 24));
+ if (! mktime_test (t))
+ return 1;
+ if (! (mktime_test ((time_t) 1)
+ && mktime_test ((time_t) (60 * 60))
+ && mktime_test ((time_t) (60 * 60 * 24))))
+ return 1;
for (j = 1; 0 < j; j *= 2)
- bigtime_test (j);
- bigtime_test (j - 1);
+ if (! bigtime_test (j))
+ return 1;
+ if (! bigtime_test (j - 1))
+ return 1;
}
- irix_6_4_bug ();
- spring_forward_gap ();
- exit (0);
+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
}]])],
[ac_cv_func_working_mktime=yes],
[ac_cv_func_working_mktime=no],
Index: m4/regex.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/regex.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- m4/regex.m4 24 Aug 2006 01:24:14 -0000 1.14
+++ m4/regex.m4 22 Sep 2006 17:54:40 -0000 1.15
@@ -1,4 +1,4 @@
-#serial 39
+#serial 40
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
# 2006 Free Software Foundation, Inc.
@@ -14,6 +14,8 @@
AC_DEFUN([gl_REGEX],
[
+ AC_CHECK_HEADERS_ONCE([locale.h])
+
AC_ARG_WITH([included-regex],
[AC_HELP_STRING([--without-included-regex],
[don't compile regex; this is the default on
@@ -34,6 +36,9 @@
[AC_RUN_IFELSE(
[AC_LANG_PROGRAM(
[AC_INCLUDES_DEFAULT
+ #if HAVE_LOCALE_H
+ #include <locale.h>
+ #endif
#include <limits.h>
#include <regex.h>
],
@@ -42,6 +47,33 @@
int i;
const char *s;
struct re_registers regs;
+
+ #if HAVE_LOCALE_H
+ /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html
+ This test needs valgrind to catch the bug on Debian
+ GNU/Linux 3.1 x86, but it might catch the bug better
+ on other platforms and it shouldn't hurt to try the
+ test here. */
+ if (setlocale (LC_ALL, "en_US.UTF-8"))
+ {
+ static char const pat[] = "insert into";
+ static char const data[] =
+ "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK";
+ re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE
+ | RE_ICASE);
+ memset (®ex, 0, sizeof regex);
+ s = re_compile_pattern (pat, sizeof pat - 1, ®ex);
+ if (s)
+ return 1;
+ if (re_search (®ex, data, sizeof data - 1,
+ 0, sizeof data - 1, ®s)
+ != -1)
+ return 1;
+ if (! setlocale (LC_ALL, "C"))
+ return 1;
+ }
+ #endif
+
re_set_syntax (RE_SYNTAX_POSIX_EGREP);
memset (®ex, 0, sizeof (regex));
for (i = 0; i <= UCHAR_MAX; i++)
@@ -161,7 +193,7 @@
AC_REQUIRE([AC_GNU_SOURCE])
AC_REQUIRE([AC_C_RESTRICT])
AC_REQUIRE([AM_LANGINFO_CODESET])
- AC_CHECK_HEADERS_ONCE([locale.h wchar.h wctype.h])
+ AC_CHECK_HEADERS_ONCE([wchar.h wctype.h])
AC_CHECK_FUNCS_ONCE([mbrtowc mempcpy wcrtomb wcscoll])
AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
])
Index: m4/rename.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/rename.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- m4/rename.m4 25 Apr 2006 14:50:23 -0000 1.3
+++ m4/rename.m4 22 Sep 2006 17:54:40 -0000 1.4
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
# Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -13,10 +13,10 @@
dnl to compile the wrapper function.
dnl
-AC_DEFUN([vb_FUNC_RENAME],
+AC_DEFUN([gl_FUNC_RENAME],
[
AC_CACHE_CHECK([whether rename is broken],
- vb_cv_func_rename_trailing_slash_bug,
+ gl_cv_func_rename_trailing_slash_bug,
[
rm -rf conftest.d1 conftest.d2
mkdir conftest.d1 ||
@@ -30,14 +30,14 @@
exit (rename ("conftest.d1/", "conftest.d2") ? 1 : 0);
}
],
- vb_cv_func_rename_trailing_slash_bug=no,
- vb_cv_func_rename_trailing_slash_bug=yes,
+ gl_cv_func_rename_trailing_slash_bug=no,
+ gl_cv_func_rename_trailing_slash_bug=yes,
dnl When crosscompiling, assume rename is broken.
- vb_cv_func_rename_trailing_slash_bug=yes)
+ gl_cv_func_rename_trailing_slash_bug=yes)
rm -rf conftest.d1 conftest.d2
])
- if test $vb_cv_func_rename_trailing_slash_bug = yes; then
+ if test $gl_cv_func_rename_trailing_slash_bug = yes; then
AC_LIBOBJ(rename)
AC_DEFINE(rename, rpl_rename,
[Define to rpl_rename if the replacement function should be used.])
Index: maint-aux/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/maint-aux/Makefile.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- maint-aux/Makefile.in 2 Sep 2006 23:18:00 -0000 1.42
+++ maint-aux/Makefile.in 22 Sep 2006 17:54:40 -0000 1.43
@@ -88,7 +88,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -101,9 +100,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -215,6 +213,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: maint-aux/gnulib-filelist.txt
===================================================================
RCS file: /cvsroot/cvs/ccvs/maint-aux/gnulib-filelist.txt,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- maint-aux/gnulib-filelist.txt 2 Sep 2006 23:18:00 -0000 1.30
+++ maint-aux/gnulib-filelist.txt 22 Sep 2006 17:54:40 -0000 1.31
@@ -105,6 +105,7 @@
lib/mkdir.c
lib/mkdirat.c
lib/mkstemp.c
+lib/mkstemp.h
lib/mktime.c
lib/nanosleep.c
lib/open-safer.c
@@ -112,8 +113,6 @@
lib/openat-priv.h
lib/openat.c
lib/openat.h
-lib/pagealign_alloc.c
-lib/pagealign_alloc.h
lib/pathmax.h
lib/pipe-safer.c
lib/printf-args.c
@@ -280,12 +279,10 @@
m4/mkdir-slash.m4
m4/mkstemp.m4
m4/mktime.m4
-m4/mmap-anon.m4
m4/nanosleep.m4
m4/netinet_in_h.m4
m4/nls.m4
m4/openat.m4
-m4/pagealign_alloc.m4
m4/pathmax.m4
m4/po.m4
m4/printf-posix.m4
Index: man/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/man/Makefile.in,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- man/Makefile.in 2 Sep 2006 23:18:00 -0000 1.111
+++ man/Makefile.in 22 Sep 2006 17:54:40 -0000 1.112
@@ -90,7 +90,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -103,9 +102,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -222,6 +220,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/Makefile.in,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -b -r1.183 -r1.184
--- src/Makefile.in 2 Sep 2006 23:18:00 -0000 1.183
+++ src/Makefile.in 22 Sep 2006 17:54:41 -0000 1.184
@@ -94,7 +94,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -107,9 +106,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -259,6 +257,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: tools/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/tools/Makefile.in,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- tools/Makefile.in 2 Sep 2006 23:18:00 -0000 1.101
+++ tools/Makefile.in 22 Sep 2006 17:54:41 -0000 1.102
@@ -91,7 +91,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -104,9 +103,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -218,6 +216,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: vms/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/Makefile.in,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- vms/Makefile.in 2 Sep 2006 23:18:00 -0000 1.105
+++ vms/Makefile.in 22 Sep 2006 17:54:41 -0000 1.106
@@ -94,7 +94,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -107,9 +106,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -221,6 +219,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: windows-NT/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/ChangeLog,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -b -r1.390 -r1.391
--- windows-NT/ChangeLog 18 Sep 2006 08:26:22 -0000 1.390
+++ windows-NT/ChangeLog 22 Sep 2006 17:54:41 -0000 1.391
@@ -1,3 +1,11 @@
+2006-09-22 Mark D. Baushke <address@hidden>
+
+ * config.h.in.in (HAVE_MAP_ANONYMOUS, HAVE_MMAP,
+ HAVE_POSIX_MEMALIGN, MAP_ANONYMOUS, mkstemp): Remove as unused.
+ (__MKSTEMP_PREFIX): New define as rpl_.
+ (getpass): Define as gnu_getpass.
+ * Maekfile.in, stamp-chi, config.h.in, config.h: Regenerated.
+
2006-09-18 Mark D. Baushke <address@hidden>
* config.h.in.in (HAVE_DECL_*): Define to 0 instead of undef to
Index: windows-NT/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/Makefile.in,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- windows-NT/Makefile.in 2 Sep 2006 23:18:00 -0000 1.135
+++ windows-NT/Makefile.in 22 Sep 2006 17:54:41 -0000 1.136
@@ -95,7 +95,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -108,9 +107,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -231,6 +229,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: windows-NT/config.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -b -r1.211 -r1.212
--- windows-NT/config.h 18 Sep 2006 08:26:22 -0000 1.211
+++ windows-NT/config.h 22 Sep 2006 17:54:41 -0000 1.212
@@ -607,10 +607,6 @@
to 0 otherwise. */
#define HAVE_MALLOC 1
-/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including
- config.h and <sys/mman.h>. */
-#undef HAVE_MAP_ANONYMOUS
-
/* Define to 1 if you have the `mblen' function. */
#define HAVE_MBLEN 1
@@ -653,12 +649,6 @@
/* Define to 1 if you have the `mknod' function. */
#undef HAVE_MKNOD
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
/* Define to 1 if you have the `nanotime' function. */
#undef HAVE_NANOTIME
@@ -699,9 +689,6 @@
/* Define to 1 if you have the `pipe' function. */
#undef HAVE_PIPE
-/* Define to 1 if you have the `posix_memalign' function. */
-#undef HAVE_POSIX_MEMALIGN
-
/* Define to 1 if the `printf' function supports the %p format for printing
pointers. */
#define HAVE_PRINTF_PTR 1
@@ -1060,9 +1047,6 @@
/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
#undef MALLOC_0_IS_NONNULL
-/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
-#undef MAP_ANONYMOUS
-
/* By default, CVS stores its modules and other such items in flat text files
(MY_NDBM enables this). Turning off MY_NDBM causes CVS to look for a
system-supplied ndbm database library and use it instead. That may speed
@@ -1396,6 +1380,9 @@
used. */
#define __GETOPT_PREFIX rpl_
+/* Define to rpl_ if the mkstemp replacement function should be used. */
+#define __MKSTEMP_PREFIX rpl_
+
/* Define to rpl_ if the openat replacement function should be used. */
#undef __OPENAT_PREFIX
@@ -1430,7 +1417,7 @@
#undef getline
/* Define to a replacement function name for getpass(). */
-#undef getpass
+#define getpass gnu_getpass
/* Define to rpl_gettimeofday if the replacement function should be used. */
#undef gettimeofday
@@ -1462,9 +1449,6 @@
/* Define to rpl_mkdir if the replacement function should be used. */
#undef mkdir
-/* Define to rpl_mkstemp if the replacement function should be used. */
-#undef mkstemp
-
/* Define to rpl_mktime if the replacement function should be used. */
#undef mktime
Index: windows-NT/config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h.in,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- windows-NT/config.h.in 18 Sep 2006 08:26:22 -0000 1.139
+++ windows-NT/config.h.in 22 Sep 2006 17:54:41 -0000 1.140
@@ -600,10 +600,6 @@
to 0 otherwise. */
#define HAVE_MALLOC 1
-/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including
- config.h and <sys/mman.h>. */
-#undef HAVE_MAP_ANONYMOUS
-
/* Define to 1 if you have the `mblen' function. */
#define HAVE_MBLEN 1
@@ -646,12 +642,6 @@
/* Define to 1 if you have the `mknod' function. */
#undef HAVE_MKNOD
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
/* Define to 1 if you have the `nanotime' function. */
#undef HAVE_NANOTIME
@@ -692,9 +682,6 @@
/* Define to 1 if you have the `pipe' function. */
#undef HAVE_PIPE
-/* Define to 1 if you have the `posix_memalign' function. */
-#undef HAVE_POSIX_MEMALIGN
-
/* Define to 1 if the `printf' function supports the %p format for printing
pointers. */
#define HAVE_PRINTF_PTR 1
@@ -1053,9 +1040,6 @@
/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
#undef MALLOC_0_IS_NONNULL
-/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
-#undef MAP_ANONYMOUS
-
/* By default, CVS stores its modules and other such items in flat text files
(MY_NDBM enables this). Turning off MY_NDBM causes CVS to look for a
system-supplied ndbm database library and use it instead. That may speed
@@ -1389,6 +1373,9 @@
used. */
#define __GETOPT_PREFIX rpl_
+/* Define to rpl_ if the mkstemp replacement function should be used. */
+#define __MKSTEMP_PREFIX rpl_
+
/* Define to rpl_ if the openat replacement function should be used. */
#undef __OPENAT_PREFIX
@@ -1423,7 +1410,7 @@
#undef getline
/* Define to a replacement function name for getpass(). */
-#undef getpass
+#define getpass gnu_getpass
/* Define to rpl_gettimeofday if the replacement function should be used. */
#undef gettimeofday
@@ -1455,9 +1442,6 @@
/* Define to rpl_mkdir if the replacement function should be used. */
#undef mkdir
-/* Define to rpl_mkstemp if the replacement function should be used. */
-#undef mkstemp
-
/* Define to rpl_mktime if the replacement function should be used. */
#undef mktime
Index: windows-NT/config.h.in.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h.in.in,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- windows-NT/config.h.in.in 18 Sep 2006 08:26:22 -0000 1.61
+++ windows-NT/config.h.in.in 22 Sep 2006 17:54:41 -0000 1.62
@@ -94,8 +94,8 @@
#define DEFAULT_SIGN_TEMPLATE ""
/* Define to the option string that the OpenPGP program used in the
- DEFAULT_SIGN_TEMPLATE would like to see for text files (substituted at run
- time in place of `%M' in the DEFAULT_SIGN_TEMPLATE). */
+ DEFAULT_SIGN_TEMPLATE & DEFAULT_VERIFY_TEMPLATE would like to see for text
+ files (substituted at run time in place of `%M' in both templates). */
#define DEFAULT_SIGN_TEXTMODE ""
/* Define to a command line template that will read an OpenPGP signature from
@@ -600,10 +600,6 @@
to 0 otherwise. */
#define HAVE_MALLOC 1
-/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including
- config.h and <sys/mman.h>. */
-#undef HAVE_MAP_ANONYMOUS
-
/* Define to 1 if you have the `mblen' function. */
#define HAVE_MBLEN 1
@@ -646,12 +642,6 @@
/* Define to 1 if you have the `mknod' function. */
#undef HAVE_MKNOD
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
/* Define to 1 if you have the `nanotime' function. */
#undef HAVE_NANOTIME
@@ -693,9 +683,6 @@
/* Define to 1 if you have the `pipe' function. */
#undef HAVE_PIPE
-/* Define to 1 if you have the `posix_memalign' function. */
-#undef HAVE_POSIX_MEMALIGN
-
/* Define to 1 if the `printf' function supports the %p format for printing
pointers. */
#define HAVE_PRINTF_PTR 1
@@ -1048,9 +1035,6 @@
/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
#undef MALLOC_0_IS_NONNULL
-/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
-#undef MAP_ANONYMOUS
-
/* By default, CVS stores its modules and other such items in flat text files
(MY_NDBM enables this). Turning off MY_NDBM causes CVS to look for a
system-supplied ndbm database library and use it instead. That may speed
@@ -1384,6 +1368,9 @@
used. */
#define __GETOPT_PREFIX rpl_
+/* Define to rpl_ if the mkstemp replacement function should be used. */
+#define __MKSTEMP_PREFIX rpl_
+
/* Define to rpl_ if the openat replacement function should be used. */
#undef __OPENAT_PREFIX
@@ -1402,7 +1389,7 @@
/* We want to always use the GNULIB version of getpass which we have in lib,
so define getpass to something that won't conflict with any existing system
declarations. */
-#undef getpass
+#define getpass gnu_getpass
/* Define to rpl_gettimeofday if the replacement function should be used. */
#undef gettimeofday
@@ -1434,9 +1421,6 @@
/* Define to rpl_mkdir if the replacement function should be used. */
#undef mkdir
-/* Define to rpl_mkstemp if the replacement function should be used. */
-#undef mkstemp
-
/* Define to rpl_mktime if the replacement function should be used. */
#undef mktime
Index: windows-NT/stamp-chi
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/stamp-chi,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- windows-NT/stamp-chi 18 Sep 2006 08:26:22 -0000 1.122
+++ windows-NT/stamp-chi 22 Sep 2006 17:54:41 -0000 1.123
@@ -600,10 +600,6 @@
to 0 otherwise. */
#define HAVE_MALLOC 1
-/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including
- config.h and <sys/mman.h>. */
-#undef HAVE_MAP_ANONYMOUS
-
/* Define to 1 if you have the `mblen' function. */
#define HAVE_MBLEN 1
@@ -646,12 +642,6 @@
/* Define to 1 if you have the `mknod' function. */
#undef HAVE_MKNOD
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
/* Define to 1 if you have the `nanotime' function. */
#undef HAVE_NANOTIME
@@ -692,9 +682,6 @@
/* Define to 1 if you have the `pipe' function. */
#undef HAVE_PIPE
-/* Define to 1 if you have the `posix_memalign' function. */
-#undef HAVE_POSIX_MEMALIGN
-
/* Define to 1 if the `printf' function supports the %p format for printing
pointers. */
#define HAVE_PRINTF_PTR 1
@@ -1053,9 +1040,6 @@
/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
#undef MALLOC_0_IS_NONNULL
-/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
-#undef MAP_ANONYMOUS
-
/* By default, CVS stores its modules and other such items in flat text files
(MY_NDBM enables this). Turning off MY_NDBM causes CVS to look for a
system-supplied ndbm database library and use it instead. That may speed
@@ -1389,6 +1373,9 @@
used. */
#define __GETOPT_PREFIX rpl_
+/* Define to rpl_ if the mkstemp replacement function should be used. */
+#define __MKSTEMP_PREFIX rpl_
+
/* Define to rpl_ if the openat replacement function should be used. */
#undef __OPENAT_PREFIX
@@ -1423,7 +1410,7 @@
#undef getline
/* Define to a replacement function name for getpass(). */
-#undef getpass
+#define getpass gnu_getpass
/* Define to rpl_gettimeofday if the replacement function should be used. */
#undef gettimeofday
@@ -1455,9 +1442,6 @@
/* Define to rpl_mkdir if the replacement function should be used. */
#undef mkdir
-/* Define to rpl_mkstemp if the replacement function should be used. */
-#undef mkstemp
-
/* Define to rpl_mktime if the replacement function should be used. */
#undef mktime
Index: windows-NT/SCC/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/SCC/Makefile.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- windows-NT/SCC/Makefile.in 2 Sep 2006 23:18:00 -0000 1.95
+++ windows-NT/SCC/Makefile.in 22 Sep 2006 17:54:41 -0000 1.96
@@ -92,7 +92,6 @@
$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glob.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/intmax_t.m4 \
- $(top_srcdir)/m4/inttypes-h.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchown.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -105,9 +104,8 @@
$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
- $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/nanosleep.m4 \
- $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
+ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \
@@ -219,6 +217,8 @@
INTTYPES_H = @INTTYPES_H@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
Index: lib/mkstemp.h
===================================================================
RCS file: lib/mkstemp.h
diff -N lib/mkstemp.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/mkstemp.h 22 Sep 2006 17:54:39 -0000 1.1
@@ -0,0 +1,30 @@
+/* Create a unique temporary file.
+
+ Copyright (C) 2006 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+/* written by Jim Meyering */
+
+#include <stdlib.h>
+
+#ifdef __MKSTEMP_PREFIX
+# define _GL_CONCAT(x, y) x ## y
+# define _GL_XCONCAT(x, y) _GL_CONCAT (x, y)
+# define __MKSTEMP_ID(y) _GL_XCONCAT (__MKSTEMP_PREFIX, y)
+# undef mkstemp
+# define mkstemp __MKSTEMP_ID (mkstemp)
+int mkstemp (char *);
+#endif
Index: lib/pagealign_alloc.c
===================================================================
RCS file: lib/pagealign_alloc.c
diff -N lib/pagealign_alloc.c
--- lib/pagealign_alloc.c 20 Mar 2006 02:21:56 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,195 +0,0 @@
-/* Memory allocation aligned to system page boundaries.
-
- Copyright (C) 2005 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA. */
-
-/* Written by Derek R. Price <address@hidden>. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "pagealign_alloc.h"
-
-#include <errno.h>
-#include <stdlib.h>
-
-#include <fcntl.h>
-#include <unistd.h>
-
-#if HAVE_MMAP
-# include <sys/mman.h>
-#endif
-
-#include "error.h"
-#include "exit.h"
-#include "getpagesize.h"
-#include "xalloc.h"
-#include "gettext.h"
-
-#define _(str) gettext (str)
-
-#if HAVE_MMAP
-/* Define MAP_FILE when it isn't otherwise. */
-# ifndef MAP_FILE
-# define MAP_FILE 0
-# endif
-/* Define MAP_FAILED for old systems which neglect to. */
-# ifndef MAP_FAILED
-# define MAP_FAILED ((void *)-1)
-# endif
-#endif
-
-
-#if HAVE_MMAP || ! HAVE_POSIX_MEMALIGN
-
-# if HAVE_MMAP
-/* For each memory region, we store its size. */
-typedef size_t info_t;
-# else
-/* For each memory region, we store the original pointer returned by
- malloc(). */
-typedef void * info_t;
-# endif
-
-/* A simple linked list of allocated memory regions. It is probably not the
- most efficient way to store these, but anyway... */
-typedef struct memnode_s memnode_t;
-struct memnode_s
-{
- void *aligned_ptr;
- info_t info;
- memnode_t *next;
-};
-
-/* The list of currently allocated memory regions. */
-static memnode_t *memnode_table = NULL;
-
-
-static void
-new_memnode (void *aligned_ptr, info_t info)
-{
- memnode_t *new_node = (memnode_t *) xmalloc (sizeof (memnode_t));
- new_node->aligned_ptr = aligned_ptr;
- new_node->info = info;
- new_node->next = memnode_table;
- memnode_table = new_node;
-}
-
-
-/* Dispose of the memnode containing a map for the ALIGNED_PTR in question
- and return the content of the node's INFO field. */
-static info_t
-get_memnode (void *aligned_ptr)
-{
- info_t ret;
- memnode_t *c;
- memnode_t **p_next = &memnode_table;
-
- for (c = *p_next; c != NULL; p_next = &c->next, c = c->next)
- if (c->aligned_ptr == aligned_ptr)
- break;
-
- if (c == NULL)
- /* An attempt to free untracked memory. A wrong pointer was passed
- to pagealign_free(). */
- abort ();
-
- /* Remove this entry from the list, save the return value, and free it. */
- *p_next = c->next;
- ret = c->info;
- free (c);
-
- return ret;
-}
-
-#endif /* HAVE_MMAP || !HAVE_POSIX_MEMALIGN */
-
-
-void *
-pagealign_alloc (size_t size)
-{
- void *ret;
-#if HAVE_MMAP
-# ifdef HAVE_MAP_ANONYMOUS
- const int fd = -1;
- const int flags = MAP_ANONYMOUS | MAP_PRIVATE;
-# else /* !HAVE_MAP_ANONYMOUS */
- static int fd = -1; /* Only open /dev/zero once in order to avoid limiting
- the amount of memory we may allocate based on the
- number of open file descriptors. */
- const int flags = MAP_FILE | MAP_PRIVATE;
- if (fd == -1)
- {
- fd = open ("/dev/zero", O_RDONLY, 0666);
- if (fd < 0)
- error (EXIT_FAILURE, errno, _("Failed to open /dev/zero for read"));
- }
-# endif /* HAVE_MAP_ANONYMOUS */
- ret = mmap (NULL, size, PROT_READ | PROT_WRITE, flags, fd, 0);
- if (ret == MAP_FAILED)
- return NULL;
- new_memnode (ret, size);
-#elif HAVE_POSIX_MEMALIGN
- int status = posix_memalign (&ret, getpagesize (), size);
- if (status)
- {
- errno = status;
- return NULL;
- }
-#else /* !HAVE_MMAP && !HAVE_POSIX_MEMALIGN */
- size_t pagesize = getpagesize ();
- void *unaligned_ptr = malloc (size + pagesize - 1);
- if (unaligned_ptr == NULL)
- {
- /* Set errno. We don't know whether malloc already set errno: some
- implementations of malloc do, some don't. */
- errno = ENOMEM;
- return NULL;
- }
- ret = (char *) unaligned_ptr
- + ((- (unsigned long) unaligned_ptr) & (pagesize - 1));
- new_memnode (ret, unaligned_ptr);
-#endif /* HAVE_MMAP && HAVE_POSIX_MEMALIGN */
- return ret;
-}
-
-
-void *
-pagealign_xalloc (size_t size)
-{
- void *ret;
-
- ret = pagealign_alloc (size);
- if (ret == NULL)
- xalloc_die ();
- return ret;
-}
-
-
-void
-pagealign_free (void *aligned_ptr)
-{
-#if HAVE_MMAP
- if (munmap (aligned_ptr, get_memnode (aligned_ptr)) < 0)
- error (EXIT_FAILURE, errno, "Failed to unmap memory");
-#elif HAVE_POSIX_MEMALIGN
- free (aligned_ptr);
-#else
- free (get_memnode (aligned_ptr));
-#endif
-}
Index: lib/pagealign_alloc.h
===================================================================
RCS file: lib/pagealign_alloc.h
diff -N lib/pagealign_alloc.h
--- lib/pagealign_alloc.h 23 May 2005 17:44:31 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-/* Memory allocation aligned to system page boundaries.
-
- Copyright (C) 2005 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA. */
-
-#ifndef _PAGEALIGN_ALLOC_H
-# define _PAGEALIGN_ALLOC_H
-
-# include <stddef.h>
-
-/* Allocate a block of memory of SIZE bytes, aligned on a system page
- boundary.
- If SIZE is not a multiple of the system page size, it will be rounded up
- to the next multiple.
- Return a pointer to the start of the memory block. Upon allocation failure,
- return NULL and set errno. */
-extern void *pagealign_alloc (size_t size);
-
-/* Like pagealign_alloc, except it exits the program if the allocation
- fails. */
-extern void *pagealign_xalloc (size_t size);
-
-/* Free a memory block.
- PTR must be a non-NULL pointer returned by pagealign_alloc or
- pagealign_xalloc. */
-extern void pagealign_free (void *ptr);
-
-#endif /* _PAGEALIGN_ALLOC_H */
Index: m4/mmap-anon.m4
===================================================================
RCS file: m4/mmap-anon.m4
diff -N m4/mmap-anon.m4
--- m4/mmap-anon.m4 2 May 2005 07:24:29 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-# mmap-anon.m4 serial 3
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_MMAP_ANON],
-[
- dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
- AC_REQUIRE([AC_PROG_CPP])
- AC_REQUIRE([AC_PROG_EGREP])
-
- dnl Persuade glibc <sys/mman.h> to define MAP_ANONYMOUS.
- AC_REQUIRE([AC_GNU_SOURCE])
-
- # Check for mmap()
- AC_FUNC_MMAP
-
- # Try to allow MAP_ANONYMOUS.
- gl_have_mmap_anonymous=no
- if test $ac_cv_func_mmap_fixed_mapped = yes; then
- AC_MSG_CHECKING([for MAP_ANONYMOUS])
- AC_EGREP_CPP([I cant identify this map.], [
-#include <sys/mman.h>
-#ifdef MAP_ANONYMOUS
- I cant identify this map.
-#endif
-],
- [gl_have_mmap_anonymous=yes])
- if test $gl_have_mmap_anonymous != yes; then
- AC_EGREP_CPP([I cant identify this map.], [
-#include <sys/mman.h>
-#ifdef MAP_ANON
- I cant identify this map.
-#endif
-],
- [AC_DEFINE(MAP_ANONYMOUS, MAP_ANON,
- [Define to a substitute value for mmap()'s MAP_ANONYMOUS flag.])
- gl_have_mmap_anonymous=yes])
- fi
- AC_MSG_RESULT($gl_have_mmap_anonymous)
- if test $gl_have_mmap_anonymous = yes; then
- AC_DEFINE(HAVE_MAP_ANONYMOUS, 1,
- [Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after
including
- config.h and <sys/mman.h>.])
- fi
- fi
-])
Index: m4/pagealign_alloc.m4
===================================================================
RCS file: m4/pagealign_alloc.m4
diff -N m4/pagealign_alloc.m4
--- m4/pagealign_alloc.m4 24 Aug 2006 01:24:14 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-#serial 3
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_PAGEALIGN_ALLOC],
-[
- dnl Persuade glibc <sys/mman.h> to define MAP_ANONYMOUS.
- AC_REQUIRE([AC_GNU_SOURCE])
-
- AC_LIBOBJ([pagealign_alloc])
- gl_PREREQ_PAGEALIGN_ALLOC
-])
-
-# Prerequisites of lib/pagealign_alloc.c.
-AC_DEFUN([gl_PREREQ_PAGEALIGN_ALLOC],
-[
- AC_REQUIRE([gl_FUNC_MMAP_ANON])
- AC_REQUIRE([gl_GETPAGESIZE])
- AC_CHECK_FUNCS_ONCE([posix_memalign])
- AC_CHECK_HEADERS_ONCE([unistd.h])
-])