[gentoo-commits] gentoo-x86 commit in gnustep-apps/terminal/files: terminal-0.9.5_pre20060324-size_t.patch terminal-0.9.5_pre20060324-solaris.patch digest-terminal-0.9.5_pre20060324-r1 digest-terminal-0.9.5_pre20060324 digest-terminal-0.9.5_pre20050315

[Bernard Cafarelli (voyageur)]

voyageur    07/09/10 18:31:29

  Added:                terminal-0.9.5_pre20060324-size_t.patch
                        terminal-0.9.5_pre20060324-solaris.patch
                        digest-terminal-0.9.5_pre20060324-r1
  Removed:              digest-terminal-0.9.5_pre20060324
                        digest-terminal-0.9.5_pre20050315
  Log:
  Version bump from the GNUstep overlay
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.1                  gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-size_t.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-size_t.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-size_t.patch?rev=1.1&content-type=text/plain

Index: terminal-0.9.5_pre20060324-size_t.patch
===================================================================
--- Terminal/TerminalParser_Linux.h
+++ Terminal/TerminalParser_Linux.h
@@ -31,7 +31,7 @@
 	int utf_count;
 
 	unsigned char input_buf[16];
-	int input_buf_len;
+	size_t input_buf_len;
 
 #define TITLE_BUF_SIZE 255
 	char title_buf[TITLE_BUF_SIZE+1];
--- Terminal/TerminalParser_Linux.m
+++ Terminal/TerminalParser_Linux.m
@@ -1118,9 +1118,9 @@
 			screen_char_t ch;
 
 			char *inp;
-			int in_size;
+			size_t in_size;
 			char *outp;
-			int out_size;
+			size_t out_size;
 			int char_width;
 
 			int ret;
@@ -1211,10 +1211,10 @@
 	if (iconv_input_state)
 	{
 		unsigned int *inp;
-		int insize;
+		size_t insize;
 		char *outp;
 		char buf[16+1];
-		int outsize;
+		size_t outsize;
 		int ret;
 	
 		for (i=0;i<l;i++)



1.1                  gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-solaris.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-solaris.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-solaris.patch?rev=1.1&content-type=text/plain

Index: terminal-0.9.5_pre20060324-solaris.patch
===================================================================
--- GNUmakefile
+++ GNUmakefile
@@ -44,7 +44,10 @@
 	\
 	Label.m
 
-Terminal_LDFLAGS = -lutil
+ifeq ($(findstring gnu, $(GNUSTEP_TARGET_OS)), gnu)
+	# for forkpty on Linux
+	Terminal_LDFLAGS = -lutil
+endif
 
 Terminal_LOCALIZED_RESOURCE_FILES = Localizable.strings
 Terminal_LANGUAGES = English Swedish German French Spanish Hungarian Turkish \
--- TerminalView.m
+++ TerminalView.m
@@ -38,9 +38,11 @@
 #include <fcntl.h>
 #ifndef freebsd
 #ifndef __NetBSD__
+#if !defined(solaris2)
 #  include <pty.h>
 #endif
 #endif
+#endif
 
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSDebug.h>
@@ -1692,6 +1692,91 @@
 	master_fd=-1;
 }
 
+#if defined(solaris2)
+#include <stdlib.h> 
+#include <unistd.h> 
+#include <fcntl.h> 
+#include <sys/ioctl.h> 
+#include <sys/stream.h> 
+#include <sys/stropts.h> 
+#include <sys/syscall.h>
+#include <stdio.h>
+#include <errno.h>
+
+#define forkpty my_forkpty
+
+/**
+ * fork_pty() remplacement for Solaris, it ignores the last two
+ * arguments for the moment.
+ * http://bugs.mysql.com/bug.php?id=22429
+ */ 
+static int my_forkpty (int *amaster, 
+		char *name, 
+		void *unused1, 
+		void *unused2) 
+{ 
+	int master, slave; 
+	char *slave_name; 
+	pid_t pid; 
+
+	master = open("/dev/ptmx", O_RDWR); 
+	if (master < 0) 
+		return -1; 
+
+	if (grantpt(master) < 0) { 
+		close (master); 
+		return -1; 
+	} 
+
+	if (unlockpt(master) < 0) { 
+		close (master); 
+		return -1; 
+	} 
+
+	slave_name = ptsname(master); 
+	if (slave_name == NULL) { 
+		close (master); 
+		return -1; 
+	} 
+
+	slave = open(slave_name, O_RDWR); 
+	if (slave < 0) { 
+		close (master); 
+		return -1; 
+	} 
+
+	if (ioctl(slave, I_PUSH, "ptem") < 0 ||
+			ioctl(slave, I_PUSH, "ldterm") < 0) 
+	{ 
+		close (slave); 
+		close (master); 
+		return -1; 
+	} 
+
+	if (amaster) 
+		*amaster = master; 
+
+	if (name) 
+		strcpy (name, slave_name); 
+
+	pid = fork(); 
+	switch (pid) { 
+		case -1: /* Error */ 
+			return -1; 
+		case 0: /* Child */ 
+			close(master); 
+			dup2(slave, STDIN_FILENO); 
+			dup2(slave, STDOUT_FILENO); 
+			dup2(slave, STDERR_FILENO); 
+			return 0; 
+		default: /* Parent */ 
+			close (slave); 
+			return pid; 
+	} 
+
+	return -1; 
+}
+#endif
 
 -(void) runProgram: (NSString *)path
 	withArguments: (NSArray *)args



1.1                  gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20060324-r1

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20060324-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20060324-r1?rev=1.1&content-type=text/plain

Index: digest-terminal-0.9.5_pre20060324-r1
===================================================================
MD5 306072aee8ffaa4eb496181a82cbf981 terminal-0.9.5_pre20060324.tar.bz2 64141
RMD160 c38df5e80b705c349370165db7ff49398894e167 terminal-0.9.5_pre20060324.tar.bz2 64141
SHA256 7a893eaefcfa80b89fbf083899d7b6ebc85ce6e3559d62b946a7b8ca685680e4 terminal-0.9.5_pre20060324.tar.bz2 64141



-- 
gentoo-commits@g.o mailing list