Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv23789
Modified Files:
xdiskusage.info
Added Files:
xdiskusage.patch
Log Message:
cleanup upstream string portability/security and variable-handling
--- NEW FILE: xdiskusage.patch ---
diff -Nurd -x'*~' xdiskusage-1.48.orig/xdiskusage.C xdiskusage-1.48/xdiskusage.C
--- xdiskusage-1.48.orig/xdiskusage.C 2004-09-21 01:23:14.000000000 -0400
+++ xdiskusage-1.48/xdiskusage.C 2011-05-15 15:10:21.000000000 -0400
@@ -392,16 +392,16 @@
strncpy(pathbuf, path, 1024);
for (int i=0; i<10; i++) {
char *p = (char*)fl_filename_name(pathbuf);
- int i = readlink(pathbuf, p, 1024-(p-pathbuf));
+ int pathlen = readlink(pathbuf, p, 1024-(p-pathbuf));
if (i < 0) {
if (errno != EINVAL) {
strcat(pathbuf, ": no such file");
- fl_alert(pathbuf);
+ fl_alert("%s", pathbuf);
return 0;
}
break;
}
- if (*p == '/') {memmove(pathbuf, p, i); p = pathbuf;}
+ if (*p == '/') {memmove(pathbuf, p, pathlen); p = pathbuf;}
p[i] = 0;
path = pathbuf;
}
@@ -492,7 +492,7 @@
size_t len = strlen (buffer);
if (buffer[len-1] != '\n')
{
- fprintf (stderr, "%s:%d: line too long, skipping it\n", path, line_no);
+ fprintf (stderr, "%s:%lu: line too long, skipping it\n", path, line_no);
// Read until end of line or EOF.
while (1)
{
@@ -510,7 +510,7 @@
ulong size = strtoul(buffer, &p, 10);
if (!isspace(*p) || p == buffer) {
if (!*p || *p=='#') continue; // ignore blank lines or comments (?)
- fl_alert("%s:%d: does not look like du output: %s", path, line_no, p);
+ fl_alert("%s:%lu: does not look like du output: %s", path, line_no, p);
cancelled = 1;
continue;
}
Index: xdiskusage.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xdiskusage.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- xdiskusage.info 15 May 2011 19:01:11 -0000 1.6
+++ xdiskusage.info 15 May 2011 19:13:25 -0000 1.7
@@ -1,6 +1,6 @@
Package: xdiskusage
Version: 1.48
-Revision: 1
+Revision: 2
Architecture: i386, powerpc
Description: Graphical disk usage utility
DescPort: <<
@@ -11,16 +11,29 @@
makeinclude by ./configure; sucked into Makefile).
Makefile is broken (doesn't create target directories).
+
+ Fix some string-handling warnings.
<<
Homepage: http://xdiskusage.sourceforge.net/
License: GPL
Maintainer: Daniel Macks <dma...@netspace.org>
-BuildDepends: fltk-x11 (>= 1.1.6-11.1), x11-dev, xmkmf (>= 1.0.2-3)
-Depends: x11, fltk-x11-shlibs (>= 1.1.6-11.1)
+BuildDepends: <<
+ fink (>= 0.24.12),
+ fltk-x11 (>= 1.1.6-11.1),
+ x11-dev,
+ xmkmf (>= 1.0.2-3)
+<<
+Depends: <<
+ fltk-x11-shlibs (>= 1.1.6-11.1),
+ x11
+<<
GCC: 4.0
Source: http://xdiskusage.sourceforge.net/%n-%v.tgz
Source-MD5: a902aa9d73761ade98256c3cd5c1f533
+PatchFile: %n.patch
+PatchFile-MD5: 001a21c380018d30663098b5a51e65e7
PatchScript: <<
+ %{default_script}
perl -pi.BAK -e 's#(\@CXXFLAGS.*)#$1 -I%p/include -L%p/lib#' makeinclude.in
<<
SetLDFLAGS:
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
