[gentoo-commits] gentoo-x86 commit in sys-block/eject/files: eject-2.1.5-man-typo.patch eject-2.1.4-scsi-rdwr.patch eject-2.1.5-toggle.patch eject-2.0.13-xmalloc.patch eject-2.1.5-handle-spaces.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/03/31 15:31:52

  Added:                eject-2.1.5-man-typo.patch
                        eject-2.1.4-scsi-rdwr.patch
                        eject-2.1.5-toggle.patch eject-2.0.13-xmalloc.patch
                        eject-2.1.5-handle-spaces.patch
  Log:
  Move from sys-apps/eject.
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.1                  sys-block/eject/files/eject-2.1.5-man-typo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/eject/files/eject-2.1.5-man-typo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/eject/files/eject-2.1.5-man-typo.patch?rev=1.1&content-type=text/plain

Index: eject-2.1.5-man-typo.patch
===================================================================
http://bugs.gentoo.org/165248

Index: eject.1
===================================================================
RCS file: /cvsroot/eject/eject/eject/eject.1,v
retrieving revision 1.5
diff -u -p -r1.5 eject.1
--- eject.1	11 Dec 2005 00:21:06 -0000	1.5
+++ eject.1	4 Feb 2007 23:11:15 -0000
@@ -145,7 +145,7 @@ also passes the \-n option to umount(1).
 .TP 0.5i
 .B \-m
 This option allows eject to work with device drivers which automatically
-mount removable media and therefore must be always mount()ed.
+mount removable media and therefore must be always mount(1)ed.
 The option tells eject to not try to unmount the given device,
 even if it is mounted according to /etc/mtab or /proc/mounts.
 



1.1                  sys-block/eject/files/eject-2.1.4-scsi-rdwr.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/eject/files/eject-2.1.4-scsi-rdwr.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/eject/files/eject-2.1.4-scsi-rdwr.patch?rev=1.1&content-type=text/plain

Index: eject-2.1.4-scsi-rdwr.patch
===================================================================
http://bugs.gentoo.org/116731

--- eject-2.0.13/eject.c
+++ eject-2.0.13/eject.c
@@ -657,7 +657,15 @@
 /* Open a device file. */
 static int OpenDevice(const char *fullName)
 {
-	int fd = open(fullName, O_RDONLY|O_NONBLOCK);
+	int flags = O_NONBLOCK;
+	int fd;
+
+ 	if (s_option)
+		flags |= O_RDWR;
+	else
+		flags |= O_RDONLY;
+
+	fd = open(fullName, flags);
 	if (fd == -1) {
 		fprintf(stderr, _("%s: unable to open `%s'\n"), programName, fullName);
 		exit(1);



1.1                  sys-block/eject/files/eject-2.1.5-toggle.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/eject/files/eject-2.1.5-toggle.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/eject/files/eject-2.1.5-toggle.patch?rev=1.1&content-type=text/plain

Index: eject-2.1.5-toggle.patch
===================================================================
idea take from opensuse
http://bugs.gentoo.org/261880

--- a/eject.c
+++ b/eject.c
@@ -576,6 +576,21 @@ static void ToggleTray(int fd)
 
 #ifdef CDROMCLOSETRAY
 
+	/* Ask the CDROM for info, otherwise fall back to manual */
+	switch (ioctl(fd, CDROM_DRIVE_STATUS)) {
+		case CDS_TRAY_OPEN:
+			CloseTray(fd);
+			return;
+
+		case CDS_NO_DISC:
+		case CDS_DISC_OK:
+			if (ioctl(fd, CDROMEJECT, 0) < 0) {
+				perror("ioctl");
+				exit(1);
+			}
+			return;
+	}
+
 	/* Try to open the CDROM tray and measure the time therefor
 	 * needed.  In my experience the function needs less than 0.05
 	 * seconds if the tray was already open, and at least 1.5 seconds



1.1                  sys-block/eject/files/eject-2.0.13-xmalloc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/eject/files/eject-2.0.13-xmalloc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/eject/files/eject-2.0.13-xmalloc.patch?rev=1.1&content-type=text/plain

Index: eject-2.0.13-xmalloc.patch
===================================================================
Make sure the malloc's work.

http://bugs.gentoo.org/91977

--- eject.c
+++ eject.c
@@ -304,2 +304,11 @@
 
+void *xmalloc(size_t size)
+{
+	void *ret = malloc(size);
+	if (!ret) {
+		fprintf(stderr, _("%s: could not allocate memory\n"), programName);
+		exit(1);
+	}
+	return ret;
+}
 
@@ -324,3 +333,3 @@
 
-	buf = (char *) malloc(strlen(name)+14); /* to allow for "/dev/cdroms/ + "0" + null */
+	buf = (char *) xmalloc(strlen(name)+14); /* to allow for "/dev/cdroms/ + "0" + null */
 
@@ -794,3 +803,3 @@
 		if (status == 0) {
-			result = (char *) malloc(strlen(name) + 25);
+			result = (char *) xmalloc(strlen(name) + 25);
 			strcpy(result, name);



1.1                  sys-block/eject/files/eject-2.1.5-handle-spaces.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/eject/files/eject-2.1.5-handle-spaces.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/eject/files/eject-2.1.5-handle-spaces.patch?rev=1.1&content-type=text/plain

Index: eject-2.1.5-handle-spaces.patch
===================================================================
http://bugs.gentoo.org/151257

--- eject.c
+++ eject.c
@@ -370,6 +370,30 @@ static int FileExists(const char *name, 
 
 
 /*
+ * Linux mangles spaces in mount points by changing them to an octal string
+ * of '\040'.  So lets scan the mount point and fix it up by replacing all
+ * occurrences off '\0##' with the ASCII value of 0##.  Requires a writable
+ * string as input as we mangle in place.  Some of this was taken from the
+ * util-linux package.
+ */
+#define octalify(a) ((a) & 7)
+#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3]))
+#define isoctal(a) (((a) & ~7) == '0')
+static char *DeMangleMount(char *s)
+{
+	char *tmp = s;
+	while ((tmp = strchr(tmp, '\\')) != NULL) {
+		if (isoctal(tmp[1]) && isoctal(tmp[2]) && isoctal(tmp[3])) {
+			tmp[0] = tooctal(tmp);
+			memmove(tmp+1, tmp+4, strlen(tmp)-3);
+		}
+		++tmp;
+	}
+	return s;
+}
+
+
+/*
  * Given name, such as foo, see if any of the following exist:
  *
  * foo (if foo starts with '.' or '/')
@@ -884,8 +908,8 @@ static int MountedDevice(const char *nam
 			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 @@ static int MountableDevice(const char *n
 		rc = sscanf(line, "%1023s %1023s", s1, 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;
 		}
 	}