diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | bootstrap.conf | 4 | ||||
| -rw-r--r-- | lib/.cvsignore | 2 | ||||
| -rw-r--r-- | lib/ChangeLog | 4 | ||||
| -rw-r--r-- | src/.cvsignore | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/system.h | 4 |
8 files changed, 38 insertions, 14 deletions
diff --git a/.cvsignore b/.cvsignore index 45cfe2a0e..9e20a2569 100644 --- a/.cvsignore +++ b/.cvsignore @@ -10,4 +10,4 @@ THANKS-to-translators aclocal.m4 config.status configure -stamp-h1 +coreutils-* @@ -1,3 +1,28 @@ +2006-08-25 Paul Eggert <eggert@cs.ucla.edu> + + * .cvsignore: Remove stamp-h1. Add coreutils-*, to ignore + tarballs. + * bootstrap.conf: Add configmake, verify. + * src/.cvsignore: Remove localedir.h. + * src/Makefile.am (localedir, DISTCLEANFILES, localedir.h): Remove; + subsumed by configmake. + * src/system.h: Include configmake.h rather than localedir.h + (LOCALEDIR): New macro. + + Rewrite to avoid some unnecessary casts, macros, literals. + * src/shred.c (DEFAULT_PASSES, VERBOSE_UPDATE): Now constants, + not macros. + (SECTOR_SIZE, SECTOR_MASK): New constants. + (fillpattern, dopass, do_wipefd, main): Remove unnecessary casts, + and use the SECTOR_* constants when applicable. Check for size < + 0 rather than size == -1, since negative-size files are a sign of + trouble anyway. + +2006-08-25 Bruno Haible <bruno@clisp.org> + + * src/shred.c (dopass): Assume a continuable error if EIO even + if the current position is not a multiple of 512. + 2006-08-24 Jim Meyering <jim@meyering.net> * src/stat.c (print_statfs): Fix typo: remove extra "sizeof". diff --git a/bootstrap.conf b/bootstrap.conf index 2e30d4708..edb88b8c6 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -38,7 +38,7 @@ gnulib_modules=" $avoided_gnulib_modules $obsolete_gnulib_modules acl alloca argmatch assert backupfile base64 c-strtod - c-strtold calloc canon-host canonicalize chown cloexec + c-strtold calloc canon-host canonicalize chown cloexec configmake closeout cycle-check d-ino d-type diacrit dirfd dirname dup2 error euidaccess exclude exitfail fcntl-safer fdl file-type fileblocks filemode filenamecat fnmatch-gnu fopen-safer @@ -56,7 +56,7 @@ gnulib_modules=" stat-time stdbool stdint stdlib-safer stpcpy strcase strftime strpbrk strtoimax strtoumax strverscmp timespec tzset unicodeio unistd-safer unlink-busy unlinkdir unlocked-io - uptime userspec utimecmp utimens vasprintf version-etc-fsf + uptime userspec utimecmp utimens vasprintf verify version-etc-fsf wcwidth winsz-ioctl winsz-termios xalloc xgetcwd xgethostname xmemcoll xnanosleep xreadlink xstrtod xstrtoimax xstrtol xstrtold xstrtoumax yesno diff --git a/lib/.cvsignore b/lib/.cvsignore index d943f8606..c20212d3d 100644 --- a/lib/.cvsignore +++ b/lib/.cvsignore @@ -43,6 +43,7 @@ closeout.h config.charset config.h config.hin +configmake.h creat-safer.c cycle-check.c cycle-check.h @@ -264,6 +265,7 @@ sig2str.h snprintf.c snprintf.h socket_.h +stamp-h1 stat-macros.h stat-time.h stat_.h diff --git a/lib/ChangeLog b/lib/ChangeLog index 03d1599cd..9247c4c5b 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-08-25 Paul Eggert <eggert@cs.ucla.edu> + + * .cvsignore: Add configmake.h, stamp-h1. + 2006-08-23 Paul Eggert <eggert@cs.ucla.edu> * .cvsignore: Add config.h, config.hin. diff --git a/src/.cvsignore b/src/.cvsignore index 9090f41bf..0b41f9232 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -42,7 +42,6 @@ join kill link ln -localedir.h logname ls md5sum diff --git a/src/Makefile.am b/src/Makefile.am index 8442b8e63..9b535f1de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,6 +48,7 @@ noinst_HEADERS = \ EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \ groups.sh wheel-gen.pl extract-magic c99-to-c89.diff +BUILT_SOURCES = CLEANFILES = $(SCRIPTS) su AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/lib -I../lib @@ -203,15 +204,6 @@ sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS) editpl = sed -e 's,@''PERL''@,$(PERL),g' -localedir = $(datadir)/locale -BUILT_SOURCES = localedir.h -DISTCLEANFILES = localedir.h -localedir.h: - @rm -f $@ $@-t - echo '#define LOCALEDIR "$(localedir)"' >$@-t - @chmod a-w $@-t - mv $@-t $@ - BUILT_SOURCES += dircolors.h dircolors.h: dcgen dircolors.hin @rm -f $@ $@-t diff --git a/src/system.h b/src/system.h index e395fbeae..29bd1be55 100644 --- a/src/system.h +++ b/src/system.h @@ -55,7 +55,9 @@ you must include <sys/types.h> before including this file #include <limits.h> #include "pathmax.h" -#include "localedir.h" + +#include "configmake.h" +#define LOCALEDIR CONFIGMAKE_LOCALEDIR #if TIME_WITH_SYS_TIME # include <sys/time.h> |