rpms/e2tools/F-8 e2tools-printf-lld-64bit.patch, 1.1, 1.2 e2tools.spec, 1.4, 1.5
Hans Ulrich Niedermann (ndim)
fedora-extras-commits at redhat.com
Sat Dec 8 23:15:06 UTC 2007
Author: ndim
Update of /cvs/pkgs/rpms/e2tools/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29052
Modified Files:
e2tools-printf-lld-64bit.patch e2tools.spec
Log Message:
* Sat Dec 8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-8.fc8.2
- Improving __u64 formatstring magic: Test ULONG_MAX now.
e2tools-printf-lld-64bit.patch:
Index: e2tools-printf-lld-64bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2tools/F-8/e2tools-printf-lld-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- e2tools-printf-lld-64bit.patch 8 Dec 2007 21:41:50 -0000 1.1
+++ e2tools-printf-lld-64bit.patch 8 Dec 2007 23:14:57 -0000 1.2
@@ -1,16 +1,26 @@
-diff -ru e2tools-0.0.16/ls.c e2tools-0.0.16-lld/ls.c
---- e2tools-0.0.16/ls.c 2007-12-08 22:14:50.000000000 +0100
-+++ e2tools-0.0.16-lld/ls.c 2007-12-08 22:15:25.000000000 +0100
-@@ -657,8 +657,13 @@
+diff -ru e2tools-0.0.16-orig/ls.c e2tools-0.0.16-lld/ls.c
+--- e2tools-0.0.16-orig/ls.c 2007-12-08 23:57:40.000000000 +0100
++++ e2tools-0.0.16-lld/ls.c 2007-12-09 00:02:57.000000000 +0100
+@@ -44,6 +44,7 @@
+ #include "e2tools.h"
+ #include "elist.h"
+ #include <regex.h>
++#include <limits.h>
+
+ /*
+ * list directory
+@@ -657,8 +658,13 @@
if (LINUX_S_ISDIR(info->inode.i_mode))
printf("%7d", info->inode.i_size);
else
-+#if __WORDSIZE == 64
-+ printf("%7ld", info->inode.i_size |
-+ ((__u64)info->inode.i_size_high << 32));
+- printf("%7lld", info->inode.i_size |
+- ((__u64)info->inode.i_size_high << 32));
++#if ULONG_MAX == 4294967295UL
++ printf("%7llu", (__u64)(info->inode.i_size |
++ ((__u64)info->inode.i_size_high << 32)));
+#else
- printf("%7lld", info->inode.i_size |
- ((__u64)info->inode.i_size_high << 32));
++ printf("%7lu", (__u64)(info->inode.i_size |
++ ((__u64)info->inode.i_size_high << 32)));
+#endif
printf(" %s %s\n", datestr, info->name);
Index: e2tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2tools/F-8/e2tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- e2tools.spec 8 Dec 2007 22:25:42 -0000 1.4
+++ e2tools.spec 8 Dec 2007 23:14:57 -0000 1.5
@@ -1,6 +1,6 @@
Name: e2tools
Version: 0.0.16
-Release: 8%{?dist}
+Release: 8%{?dist}.2
Summary: Manipulate files in unmounted ext2/ext3 filesystems
Group: Applications/System
@@ -100,6 +100,9 @@
%changelog
+* Sat Dec 8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-8.fc8.2
+- Improving __u64 formatstring magic: Test ULONG_MAX now.
+
* Sat Dec 8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-8
- Special __u64 formatstring on 64bit platforms (#349851).
- Reintroduce -Werror for all platforms.
More information about the scm-commits
mailing list