* csu/Makefile: Use printf instead of echo for some shells.

diff --git a/ChangeLog b/ChangeLog
index ac79e43..c766cb7 100644 (file)
--- 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 20709c3..bd82641 100644 (file)
--- 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 daea1d7..93e5151 100644 (file)
--- 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 483b5d0..24c1310 100644 (file)
--- 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);
 }