rpms/rdist/devel rdist-6.1.5-stat64.patch, NONE, 1.1 rdist.spec, 1.14, 1.15

[fedora-cvs-commits at redhat.com]

Author: pknirsch

Update of /cvs/dist/rpms/rdist/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21738

Modified Files:
	rdist.spec 
Added Files:
	rdist-6.1.5-stat64.patch 
Log Message:
- Fixed incorrect use of statfs return values (#147481)


rdist-6.1.5-stat64.patch:
 filesys.c |    4 ++--
 server.c  |   17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

--- NEW FILE rdist-6.1.5-stat64.patch ---
--- rdist-6.1.5/src/filesys.c.stat64	2005-05-04 14:11:03.000000000 +0200
+++ rdist-6.1.5/src/filesys.c	2005-05-04 14:11:10.000000000 +0200
@@ -430,8 +430,8 @@
  */
 int getfilesysinfo(file, freespace, freefiles)
 	char *file;
-	long *freespace;
-	long *freefiles;
+	fsblkcnt_t *freespace;
+	fsfilcnt_t *freefiles;
 {
 #if	defined(STATFS_TYPE)
 	static statfs_t statfsbuf;
--- rdist-6.1.5/src/server.c.stat64	2005-05-04 14:11:23.000000000 +0200
+++ rdist-6.1.5/src/server.c	2005-05-04 14:20:34.000000000 +0200
@@ -62,8 +62,8 @@
 int	catname = 0;		/* cat name to target name */
 char	*sptarget[32];		/* stack of saved ptarget's for directories */
 char   *fromhost = NULL;	/* Client hostname */
-static long min_freespace = 0;	/* Minimium free space on a filesystem */
-static long min_freefiles = 0;	/* Minimium free # files on a filesystem */
+static fsblkcnt_t min_freespace = 0; /* Minimium free space on a filesystem */
+static fsfilcnt_t min_freefiles = 0; /* Minimium free # files on a filesystem */
 int	oumask;			/* Old umask */
 
 /*
@@ -1326,7 +1326,7 @@
 			fatalerr("Expected digit, got '%s'.", cp);
 			return;
 		}
-		min_freespace = (unsigned long) atoi(cp);
+		min_freespace = (fsblkcnt_t) atoll(cp);
 		break;
 
 	case SC_FREEFILES: 	/* Minimium free files */
@@ -1334,7 +1334,7 @@
 			fatalerr("Expected digit, got '%s'.", cp);
 			return;
 		}
-		min_freefiles = (unsigned long) atoi(cp);
+		min_freefiles = (fsfilcnt_t) atoll(cp);
 		break;
 
 	case SC_LOGGING:	/* Logging options */
@@ -1364,7 +1364,8 @@
 	time_t mtime, atime;
 	char *owner, *group, *file;
 	char new[MAXPATHLEN];
-	long freespace = -1, freefiles = -1;
+	fsfilcnt_t freefiles = -1;
+	fsblkcnt_t freespace = -1;
 	char *cp = cmd;
 
 	/*
@@ -1499,7 +1500,7 @@
 	 */
 	if (min_freespace || min_freefiles) {
 		/* Convert file size to kilobytes */
-		long fsize = (long) (size / 1024);
+		fsblkcnt_t fsize = (fsblkcnt_t) (size / 1024);
 
 		if (getfilesysinfo(target, &freespace, &freefiles) != 0)
 			return;
@@ -1511,14 +1512,14 @@
 		if (min_freespace && (freespace >= 0) && 
 		    (freespace - fsize < min_freespace)) {
 			error(
-		     "%s: Not enough free space on filesystem: min %d free %d",
+		     "%s: Not enough free space on filesystem: min %lld free %lld",
 			      target, min_freespace, freespace);
 			return;
 		}
 		if (min_freefiles && (freefiles >= 0) &&
 		    (freefiles - 1 < min_freefiles)) {
 			error(
-		     "%s: Not enough free files on filesystem: min %d free %d",
+		     "%s: Not enough free files on filesystem: min %lld free %lld",
 			      target, min_freefiles, freefiles);
 			return;
 		}


Index: rdist.spec
===================================================================
RCS file: /cvs/dist/rpms/rdist/devel/rdist.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rdist.spec	2 Mar 2005 16:54:28 -0000	1.14
+++ rdist.spec	4 May 2005 14:08:15 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Maintains identical copies of files on multiple machines.
 Name: rdist
 Version: 6.1.5
-Release: 40
+Release: 41
 Epoch: 1
 License: BSD
 Group: Applications/System
@@ -20,6 +20,7 @@
 Patch9: rdist-6.1.5-svr4.patch
 Patch10: rdist-6.1.5-ssh.patch
 Patch11: rdist-6.1.5-mkstemp.patch
+Patch12: rdist-6.1.5-stat64.patch
 URL: http://www.MagniComp.com/rdist
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: byacc
@@ -50,6 +51,7 @@
 %patch9 -p1 -b .svr4
 %patch10 -p1 -b .ssh
 %patch11 -p1 -b .mkstemp
+%patch12 -p1 -b .stat64
 
 %build
 make
@@ -83,6 +85,9 @@
 %{_mandir}/man8/rdist.8*
 
 %changelog
+* Wed May 04 2005 Phil Knirsch <pknirsch at redhat.com> 6.1.5-41
+- Fixed incorrect use of statfs return values (#147481)
+
 * Wed Mar 02 2005 Phil Knirsch <pknirsch at redhat.com> 6.1.5-40
 - bump release and rebuild with gcc 4