[pacman-dev] [PATCH] Do not dereference symlinks when calculating size
Passing the "-L" flag to stat means we get the size of the file being pointed to for symlinks instead of the size of the symlink. Signed-off-by: Allan McRae <allan@archlinux.org> --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index cfd3340..12a6e65 100644 --- a/configure.ac +++ b/configure.ac @@ -256,14 +256,14 @@ GCC_VISIBILITY_CC GCC_GNU89_INLINE_CC # Host-dependant definitions -SIZECMD="stat -L -c %s" +SIZECMD="stat -c %s" SEDINPLACE="sed -i" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) - SIZECMD="stat -L -f %z" + SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" ;; cygwin*) @@ -272,7 +272,7 @@ case "${host_os}" in ;; darwin*) host_os_darwin=yes - SIZECMD="/usr/bin/stat -L -f %z" + SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" STRIP_BINARIES="" STRIP_SHARED="-S" -- 1.7.9.2
On Fri, Feb 24, 2012 at 6:04 AM, Allan McRae <allan@archlinux.org> wrote:
Passing the "-L" flag to stat means we get the size of the file being pointed to for symlinks instead of the size of the symlink.
Signed-off-by: Allan McRae <allan@archlinux.org>
NACK. You're reverting this commit. This is what we get for trying to repurpose SIZECMD for use in makepkg, it looks like you need a second command. commit 20aa17c276c35e08c7a8e2aa20410b99a20f8129 Author: Dan McGee <dan@archlinux.org> Date: Wed Sep 23 19:11:34 2009 -0500 repo-add: make sure we get size of target file If the package we were adding was a symlink, we stuck the symlink size in the database rather than the size of the file it referred to. Whoops! Signed-off-by: Dan McGee <dan@archlinux.org>
--- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac index cfd3340..12a6e65 100644 --- a/configure.ac +++ b/configure.ac @@ -256,14 +256,14 @@ GCC_VISIBILITY_CC GCC_GNU89_INLINE_CC
# Host-dependant definitions -SIZECMD="stat -L -c %s" +SIZECMD="stat -c %s" SEDINPLACE="sed -i" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) - SIZECMD="stat -L -f %z" + SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" ;; cygwin*) @@ -272,7 +272,7 @@ case "${host_os}" in ;; darwin*) host_os_darwin=yes - SIZECMD="/usr/bin/stat -L -f %z" + SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" STRIP_BINARIES="" STRIP_SHARED="-S" -- 1.7.9.2
On 25/02/12 01:59, Dan McGee wrote:
On Fri, Feb 24, 2012 at 6:04 AM, Allan McRae <allan@archlinux.org> wrote:
Passing the "-L" flag to stat means we get the size of the file being pointed to for symlinks instead of the size of the symlink.
Signed-off-by: Allan McRae <allan@archlinux.org>
NACK. You're reverting this commit. This is what we get for trying to repurpose SIZECMD for use in makepkg, it looks like you need a second command.
commit 20aa17c276c35e08c7a8e2aa20410b99a20f8129 Author: Dan McGee <dan@archlinux.org> Date: Wed Sep 23 19:11:34 2009 -0500
repo-add: make sure we get size of target file
If the package we were adding was a symlink, we stuck the symlink size in the database rather than the size of the file it referred to. Whoops!
Signed-off-by: Dan McGee <dan@archlinux.org>
OK, did not seed this.... Will send a fixed on later. Allan
participants (2)
-
Allan McRae
-
Dan McGee