r2025 - in trunk

dslinux_gpf at dslinux.in-berlin.de dslinux_gpf at dslinux.in-berlin.de
Thu Oct 25 20:05:55 CEST 2007


Author: gpf
Date: 2007-10-25 20:05:49 +0200 (Thu, 25 Oct 2007)
New Revision: 2025

Log:
tintin for DSLinux, Patch contributed by Dylan McCall

Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/config/Configure.help	2007-10-25 18:05:49 UTC (rev 2025)
@@ -1434,6 +1434,9 @@
 CONFIG_USER_TINYIRC_TINYIRC
   Very tiny IRC client.
 
+CONFIG_USER_TINTIN_TINTIN
+  A simple and portable MUD client, designed for online text-based RPGs.
+
 CONFIG_USER_TRIPWIRE_TRIPWIRE
   The tripwire file modification detection utility.
 

Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/config/config.in	2007-10-25 18:05:49 UTC (rev 2025)
@@ -617,6 +617,7 @@
 fi
 bool 'thttpd'			CONFIG_USER_THTTPD_THTTPD
 bool 'tinyirc'			CONFIG_USER_TINYIRC_TINYIRC
+bool 'tintin++'			CONFIG_USER_TINTIN_TINTIN
 bool 'traceroute'		CONFIG_USER_TRACEROUTE_TRACEROUTE
 
 bool 'vconfig'			CONFIG_USER_VCONFIG_VCONFIG

Modified: trunk/user/Makefile
===================================================================
--- trunk/user/Makefile	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/user/Makefile	2007-10-25 18:05:49 UTC (rev 2025)
@@ -366,6 +366,7 @@
 dir_$(CONFIG_USER_THREADDEMOS_THREADDEMOS)  += threaddemos
 dir_$(CONFIG_USER_THTTPD_THTTPD)            += thttpd
 dir_$(CONFIG_USER_TINYIRC_TINYIRC)          += tinyirc
+dir_$(CONFIG_USER_TINTIN_TINTIN)            += tintin
 dir_$(CONFIG_USER_TINYLOGIN_CRYPT_CRYPT)    += tinylogin
 dir_$(CONFIG_USER_TINYLOGIN_TINYLOGIN)      += tinylogin
 dir_$(CONFIG_USER_TINYSID_TINYSID)          += tinysid

Copied: trunk/user/tintin (from rev 2024, tags/tintin++/tintin-1.96.8)

Added: trunk/user/tintin/CHANGES.DSLinux

Modified: trunk/user/tintin/src/Makefile.in
===================================================================
--- tags/tintin++/tintin-1.96.8/src/Makefile.in	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/user/tintin/src/Makefile.in	2007-10-25 18:05:49 UTC (rev 2025)
@@ -21,15 +21,8 @@
 
 DEFINES = -D_GNU_SOURCE @DEFS@
 
-CC = @CC@ -Wall
 MAKE = @MAKE@
 
-#this is the standard CFLAGS options, this is what most people should use
-
-CFLAGS = $(DEFINES) @BIG5@
-
-LDFLAGS = @LDFLAGS@
-
 INCS = @MYINCLUDE@
 
 LIBS = @MYLIB@ @LIBS@
@@ -90,8 +83,8 @@
 
 
 clean:
-	rm -f *.o *~ ../*~ ../mods/*~ tt++*
+	rm -f *.o *~ ../*~ ../mods/*~ Makefile tt++ tt++.* core config.h config.cache config.status config.log
 
 
 distclean: clean
-	rm -f *.o *~ ../*~ ../mods/*~ tt++* Makefile config.h config.status config.log config.cache
+	rm -f Makefile config.h config.status config.log config.cache

Modified: trunk/user/tintin/src/chat.c
===================================================================
--- tags/tintin++/tintin-1.96.8/src/chat.c	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/user/tintin/src/chat.c	2007-10-25 18:05:49 UTC (rev 2025)
@@ -36,8 +36,10 @@
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <pthread.h>
 
+#ifdef HAVE_PTHREAD_H
+	#include <pthread.h>
+#endif
 
 #define CALL_TIMEOUT 5
 #define BLOCK_SIZE 500
@@ -559,14 +561,29 @@
 
 #endif
 
+#ifdef HAVE_LIBPTHREAD
+
 void chat_call(char *arg)
 {
+	char buf[BUFFER_SIZE];
+
 	pthread_t thread;
 
-	pthread_create(&thread, NULL, (void *) threaded_chat_call, (void *) arg);
+	strcpy(buf, arg);
+
+	pthread_create(&thread, NULL, (void *) threaded_chat_call, (void *) buf);
 }
 	
+#else
 
+void chat_call(char *arg)
+{
+	threaded_chat_call((void *) arg);
+}
+
+#endif
+	
+
 /*
 	Clean up and close a chat conneciton.
 */

Modified: trunk/user/tintin/src/help.c
===================================================================
--- tags/tintin++/tintin-1.96.8/src/help.c	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/user/tintin/src/help.c	2007-10-25 18:05:49 UTC (rev 2025)
@@ -238,20 +238,21 @@
 	{
 		"CREDITS",
 		"\n"
-		"<068>      #<068>###################################################################<068>#\n"
-		"<068>      #<078>                                                                   <068>#\n"
-		"<068>      #<078>                           T I N T I N + +                         <068>#\n"
-		"<068>      #<078>                                                                   <068>#\n"
-		"<068>      #<078>            (<068>T<078>)he k(<068>I<078>)cki(<068>N<078>) (<068>T<078>)ickin d(<068>I<078>)kumud clie(<068>N<078>)t           <068>#\n"
-		"<068>      #<078>                                                                   <068>#\n"
-		"<068>      #<078>                 Original TINTIN code by Peter Unold               <068>#\n"
-		"<068>      #<078>       new code by Bill Reiss, David A. Wagner, Rob Ellsworth,     <068>#\n"
-		"<068>      #<078>                 Jeremy C. Jack, Igor van den Hoven                <068>#\n"
-		"<068>      #<078>                             1992, 2007                            <068>#\n"
-		"<068>      #<078>                                                                   <068>#\n"
-		"<068>      #<078>                               "VERSION_NUM"                              <068>#\n"
-		"<068>      #<078>                                                                   <068>#\n"
-		"<068>      #<068>###################################################################<068>#<088>\n\n"
+		"<068>      #<068>###############################################<068>#\n"
+		"<068>      #<078>                                               <068>#\n"
+		"<068>      #<078>                 T I N T I N + +               <068>#\n"
+		"<068>      #<078>                                               <068>#\n"
+		"<068>      #<078>  (<068>T<078>)he k(<068>I<078>)cki(<068>N<078>) (<068>T<078>)ickin d(<068>I<078>)kumud clie(<068>N<078>)t <068>#\n"
+		"<068>      #<078>                                               <068>#\n"
+		"<068>      #<078>       Original TINTIN code by Peter Unold     <068>#\n"
+		"<068>      #<078>    new code by Bill Reiss, David A. Wagner,   <068>#\n"
+		"<068>      #<078>        Rob Ellsworth, Jeremy C. Jack,         <068>#\n"
+		"<068>      #<078>                Igor van den Hoven             <068>#\n"
+		"<068>      #<078>                   1992, 2007                  <068>#\n"
+		"<068>      #<078>                                               <068>#\n"
+		"<068>      #<078>                     "VERSION_NUM"                    <068>#\n"
+		"<068>      #<078>                    DSLinux Version            <068>#\n"
+		"<068>      #<068>###############################################<068>#<088>\n\n"
 	},
 	{
 		"CURSOR",

Modified: trunk/user/tintin/src/main.c
===================================================================
--- tags/tintin++/tintin-1.96.8/src/main.c	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/user/tintin/src/main.c	2007-10-25 18:05:49 UTC (rev 2025)
@@ -151,7 +151,7 @@
 		SOCKSinit(argv[0]);
 	#endif
 
-	push_call("main(%p,%p)",argc,argv);
+	push_call("main(%p,%p)",argc,argv); //TODO: This command line parsing does not like DSLinux...
 
 	init_tintin();
 
@@ -246,7 +246,11 @@
 		{
 			gtd->ses = do_read(gtd->ses, argv[optind]);
 		}
-	} 
+	}
+	/*
+	Little hack for extra functionality in DSLinux. Reads data from /var/tt++
+	*/
+	do_read(gtd->ses,"/var/tt++");
 
 	mainloop();
 
@@ -340,6 +344,11 @@
 void quitmsg(char *message)
 {
 	struct session *ses;
+	/*
+	Saves data to /var/tt++
+	TODO: Do not do this if the user has executed a certain command, perhaps #quitnosave?
+	*/
+	do_write (gtd->ses, "/var/tt++");
 
 	while ((ses = gts->next) != NULL)
 	{

Modified: trunk/user/tintin/src/tintin.h
===================================================================
--- tags/tintin++/tintin-1.96.8/src/tintin.h	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/user/tintin/src/tintin.h	2007-10-25 18:05:49 UTC (rev 2025)
@@ -99,8 +99,8 @@
 #define TRUE                             1
 #define FALSE                            0
 
-#define SCREEN_WIDTH                    80
-#define SCREEN_HEIGHT                   24
+#define SCREEN_WIDTH                    64
+#define SCREEN_HEIGHT                   31
 
 #define PRIORITY                         0
 #define ALPHA                            1

Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/vendors/Nintendo/DLDI/config.vendor	2007-10-25 18:05:49 UTC (rev 2025)
@@ -312,6 +312,7 @@
 # CONFIG_USER_TFTPD_TFTPD is not set
 # CONFIG_USER_THTTPD_THTTPD is not set
 CONFIG_USER_TINYIRC_TINYIRC=y
+CONFIG_USER_TINTIN_TINTIN=y
 CONFIG_USER_TRACEROUTE_TRACEROUTE=y
 # CONFIG_USER_VCONFIG_VCONFIG is not set
 # CONFIG_USER_VPNLED_VPNLED is not set

Modified: trunk/vendors/Nintendo/DSGBA/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DSGBA/config.vendor	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/vendors/Nintendo/DSGBA/config.vendor	2007-10-25 18:05:49 UTC (rev 2025)
@@ -302,6 +302,7 @@
 # CONFIG_USER_TFTPD_TFTPD is not set
 # CONFIG_USER_THTTPD_THTTPD is not set
 CONFIG_USER_TINYIRC_TINYIRC=y
+# CONFIG_USER_TINTIN_TINTIN is not set
 # CONFIG_USER_TRACEROUTE_TRACEROUTE is not set
 # CONFIG_USER_VCONFIG_VCONFIG is not set
 # CONFIG_USER_VPNLED_VPNLED is not set

Modified: trunk/vendors/Nintendo/DSMEM/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DSMEM/config.vendor	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/vendors/Nintendo/DSMEM/config.vendor	2007-10-25 18:05:49 UTC (rev 2025)
@@ -301,6 +301,7 @@
 # CONFIG_USER_TFTPD_TFTPD is not set
 # CONFIG_USER_THTTPD_THTTPD is not set
 CONFIG_USER_TINYIRC_TINYIRC=y
+# CONFIG_USER_TINTIN_TINTIN is not set
 # CONFIG_USER_TRACEROUTE_TRACEROUTE is not set
 # CONFIG_USER_VCONFIG_VCONFIG is not set
 # CONFIG_USER_VPNLED_VPNLED is not set

Modified: trunk/vendors/Nintendo/GBAMP/config.vendor
===================================================================
--- trunk/vendors/Nintendo/GBAMP/config.vendor	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/vendors/Nintendo/GBAMP/config.vendor	2007-10-25 18:05:49 UTC (rev 2025)
@@ -301,6 +301,7 @@
 # CONFIG_USER_TFTPD_TFTPD is not set
 # CONFIG_USER_THTTPD_THTTPD is not set
 CONFIG_USER_TINYIRC_TINYIRC=y
+# CONFIG_USER_TINTIN_TINTIN is not set
 # CONFIG_USER_TRACEROUTE_TRACEROUTE is not set
 # CONFIG_USER_VCONFIG_VCONFIG is not set
 # CONFIG_USER_VPNLED_VPNLED is not set

Modified: trunk/vendors/Nintendo/GBAMP-EXT2/config.vendor
===================================================================
--- trunk/vendors/Nintendo/GBAMP-EXT2/config.vendor	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/vendors/Nintendo/GBAMP-EXT2/config.vendor	2007-10-25 18:05:49 UTC (rev 2025)
@@ -301,6 +301,7 @@
 # CONFIG_USER_TFTPD_TFTPD is not set
 # CONFIG_USER_THTTPD_THTTPD is not set
 CONFIG_USER_TINYIRC_TINYIRC=y
+# CONFIG_USER_TINTIN_TINTIN is not set
 # CONFIG_USER_TRACEROUTE_TRACEROUTE is not set
 # CONFIG_USER_VCONFIG_VCONFIG is not set
 # CONFIG_USER_VPNLED_VPNLED is not set

Modified: trunk/vendors/Nintendo/NDS/config.vendor
===================================================================
--- trunk/vendors/Nintendo/NDS/config.vendor	2007-10-25 16:19:52 UTC (rev 2024)
+++ trunk/vendors/Nintendo/NDS/config.vendor	2007-10-25 18:05:49 UTC (rev 2025)
@@ -301,6 +301,7 @@
 # CONFIG_USER_TFTPD_TFTPD is not set
 # CONFIG_USER_THTTPD_THTTPD is not set
 # CONFIG_USER_TINYIRC_TINYIRC is not set
+# CONFIG_USER_TINTIN_TINTIN is not set
 # CONFIG_USER_TRACEROUTE_TRACEROUTE is not set
 # CONFIG_USER_VCONFIG_VCONFIG is not set
 # CONFIG_USER_VPNLED_VPNLED is not set




More information about the dslinux-commit mailing list