rpms/eject/devel eject-2.1.5-spaces.patch, 1.1, 1.2 eject.spec, 1.39, 1.40

[Zdenek Prikryl]

Author: zprikryl

Update of /cvs/extras/rpms/eject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15016

Modified Files:
	eject-2.1.5-spaces.patch eject.spec 
Log Message:
Fixed space replacing in mount points (#492524)


eject-2.1.5-spaces.patch:

Index: eject-2.1.5-spaces.patch
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject-2.1.5-spaces.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eject-2.1.5-spaces.patch	30 Oct 2006 14:53:46 -0000	1.1
+++ eject-2.1.5-spaces.patch	31 Mar 2009 09:42:26 -0000	1.2
@@ -1,6 +1,6 @@
---- eject.c	2006/07/15 23:28:28	1.10
-+++ eject.c	2006/10/16 22:58:39	1.11
-@@ -370,6 +370,30 @@
+--- eject/eject.c.spaces	2009-03-31 11:29:17.000000000 +0200
++++ eject/eject.c	2009-03-31 11:32:44.000000000 +0200
+@@ -370,6 +370,30 @@ static int FileExists(const char *name, 
  
  
  /*
@@ -31,25 +31,21 @@
   * Given name, such as foo, see if any of the following exist:
   *
   * foo (if foo starts with '.' or '/')
-@@ -884,8 +908,8 @@
+@@ -882,6 +906,8 @@ static int MountedDevice(const char *nam
+ 		rc = sscanf(line, "%1023s %1023s", s1, s2);
+ 		if (rc >= 2) {
+ 			int mtabmaj, mtabmin;
++			DeMangleMount(s1);
++			DeMangleMount(s2);
+ 			GetMajorMinor(s1, &mtabmaj, &mtabmin);
  			if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) ||
  				((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) {
- 				FCLOSE(fp);
--				*deviceName = strdup(s1);
--				*mountName = strdup(s2);
-+				*deviceName = DeMangleMount(strdup(s1));
-+				*mountName = DeMangleMount(strdup(s2));
- 				return 1;
- 			}
- 		}
-@@ -928,8 +952,8 @@
+@@ -928,6 +954,8 @@ static int MountableDevice(const char *n
+ 
+ 	while (fgets(line, sizeof(line), fp) != 0) {
  		rc = sscanf(line, "%1023s %1023s", s1, s2);
++		DeMangleMount(s1);
++		DeMangleMount(s2);
  		if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) {
  			FCLOSE(fp);
--			*deviceName = strdup(s1);
--			*mountName = strdup(s2);
-+			*deviceName = DeMangleMount(strdup(s1));
-+			*mountName = DeMangleMount(strdup(s2));
- 			return 1;
- 		}
- 	}
+ 			*deviceName = strdup(s1);


Index: eject.spec
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- eject.spec	24 Feb 2009 14:19:07 -0000	1.39
+++ eject.spec	31 Mar 2009 09:42:26 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
 Version: 2.1.5
-Release: 13%{dist}
+Release: 14%{dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
@@ -34,7 +34,7 @@
 %patch1 -p1 -b .versbose
 %patch2 -p1 -b .timeout
 %patch3 -p0 -b .opendevice
-%patch4 -p0 -b .spaces
+%patch4 -p1 -b .spaces
 %patch5 -p0 -b .lock
 %patch6 -p1 -b .umount
 
@@ -76,6 +76,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Mar 31 2009 Zdenek Prikryl <zprikryl at redhat.com> 2.1.5-14
+- Fixed space replacing in mount points (#492524)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.5-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild