diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | csu/Makefile | 2 | ||||
| -rw-r--r-- | debug/pread64_chk.c | 2 | ||||
| -rw-r--r-- | debug/pread_chk.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index ac79e43fd3..c766cb7f4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-02-26 GOTO Masanori <gotom@debian.or.jp> + + * csu/Makefile: Use printf instead of echo for some shells. + 2005-02-28 Roland McGrath <roland@redhat.com> * debug/warning-nop.c (__nop): Rename to nop, make it static. diff --git a/csu/Makefile b/csu/Makefile index 20709c3c8d..bd82641d41 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -241,7 +241,7 @@ $(objpfx)version-info.h: $(common-objpfx)config.make $(all-Banner-files) esac; \ files="$(all-Banner-files)"; \ if test -n "$$files"; then \ - echo "\"Available extensions:\\n\""; \ + printf '"Available extensions:\\n"\n'; \ sed -e '/^#/d' -e 's/^[[:space:]]*/ /' \ -e 's/^\(.*\)$$/\"\1\\n\"/' $$files; \ fi) > $@T diff --git a/debug/pread64_chk.c b/debug/pread64_chk.c index daea1d7091..93e5151ddc 100644 --- a/debug/pread64_chk.c +++ b/debug/pread64_chk.c @@ -26,5 +26,5 @@ __pread64_chk (int fd, void *buf, size_t nbytes, off64_t offset, size_t buflen) if (nbytes > buflen) __chk_fail (); - return __pread64 (fd, buf, offset, MIN (nbytes, buflen + 1)); + return __pread64 (fd, buf, offset, nbytes); } diff --git a/debug/pread_chk.c b/debug/pread_chk.c index 483b5d03ca..24c13103dd 100644 --- a/debug/pread_chk.c +++ b/debug/pread_chk.c @@ -26,5 +26,5 @@ __pread_chk (int fd, void *buf, size_t nbytes, off_t offset, size_t buflen) if (nbytes > buflen) __chk_fail (); - return __pread (fd, buf, offset, MIN (nbytes, buflen + 1)); + return __pread (fd, buf, offset, nbytes); } |