sapidlib-dev team mailing list archive

[cody-somerville@xxxxxxxxxx]

Thanks for updating FluffOS. 

However, it seems some files (the ones modified by the new version of fluff I'm guessing) had the executable permission bit enabled. I assume this is a mistake as I can't see why you'd want a file like arch.h or objects.c to be executable. 

When I cleaned up the driver source recently, all the files were like that but I fixed it. Is it something on your end doing it without you realizing it?

Cheers,


Sent from my BlackBerry device on the Rogers Wireless Network

-----Original Message-----
From: noreply@xxxxxxxxxxxxx

Date: Fri, 11 Jul 2008 01:50:21 
To: <cody-somerville@xxxxxxxxxx>
Subject: [Branch ~sapidlib-dev-core/sapidlib/devel] Rev 78: Update.


------------------------------------------------------------
revno: 78
committer: Richard Harrison <harrison.rt@xxxxxxxxx>
branch nick: dev
timestamp: Fri 2008-07-11 02:45:33 +0100
message:
  Update.
  * Cleaned up FluffOS driver source with a 'make distclean'
  * Updated FluffOS driver source to 2.11-ds18
  * Modified master.c::log_file() to archive the log file if the filesize,
    including the message, will go over 200000 bytes.
removed:
  driver/fluffos/1.out
  driver/fluffos/2.out
  driver/fluffos/insttest
modified:
  driver/fluffos/GNUmakefile
  driver/fluffos/GNUmakefile.debug
  driver/fluffos/GNUmakefile.in
  driver/fluffos/GNUmakefile.keep
  driver/fluffos/arch.h*
  driver/fluffos/backend.c*
  driver/fluffos/edit_source.c*
  driver/fluffos/object.c*
  driver/fluffos/object.h*
  driver/fluffos/patchlevel.h*
  etc/README.install
  lib/adm/obj/master.c

=== removed file 'driver/fluffos/1.out'
--- a/driver/fluffos/1.out	2008-06-30 15:10:24 +0000
+++ b/driver/fluffos/1.out	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-# 1 "comptest.c"
-# 1 "<built-in>"
-# 1 "<command-line>"
-# 1 "comptest.c"
-
-Make this fail if we actually get compiled

=== removed file 'driver/fluffos/2.out'
=== modified file 'driver/fluffos/GNUmakefile'
--- a/driver/fluffos/GNUmakefile	2008-06-30 15:10:24 +0000
+++ b/driver/fluffos/GNUmakefile	2008-07-11 01:45:33 +0000
@@ -1,20 +1,3 @@
-MAKE=make
-SHELL=/bin/sh
-OBJDIR=obj
-DRIVER_BIN=driver
-PROOF=
-STRFUNCS=
-INSTALL=install -c
-INSTALL_DIR=../../bin
-OPTIMIZE=-O2 -fstrength-reduce
-CPP=gcc -E
-CFLAGS=-D__USE_FIXED_PROTOTYPES__ -rdynamic
-CC=gcc
-YACC=bison -d -y
-RANLIB=ranlib
-A=a
-O=o
-A_OUT=a.out
 # YOU DO NOT NEED TO CONFIGURE ANYTHING IN THIS FILE.
 #
 # RUN THE SHELL SCRIPT ./build.MudOS to generate the Makefiles, and follow

=== modified file 'driver/fluffos/GNUmakefile.debug'
--- a/driver/fluffos/GNUmakefile.debug	2008-06-30 15:10:24 +0000
+++ b/driver/fluffos/GNUmakefile.debug	2008-07-11 01:45:33 +0000
@@ -250,6 +250,7 @@
 	-find . -name "*.rej" -print | xargs rm
 	-rm -f *.ln tags TAGS
 	-rm -f $(DRIVER_BIN) $(DRIVER_BIN).old addr_server portbind
+	-rm -f *.exe
 	-rm -f Dependencies tmpdepend
 	-touch Dependencies
 

=== modified file 'driver/fluffos/GNUmakefile.in'
--- a/driver/fluffos/GNUmakefile.in	2008-06-30 15:10:24 +0000
+++ b/driver/fluffos/GNUmakefile.in	2008-07-11 01:45:33 +0000
@@ -221,6 +221,7 @@
 	-find . -name "*.rej" -exec rm -f {} \;
 	-rm -f *.ln tags TAGS
 	-rm -f $(DRIVER_BIN) $(DRIVER_BIN).old addr_server portbind
+	-rm -f *.exe
 	-rm -f Dependencies tmpdepend
 	-touch Dependencies
 

=== modified file 'driver/fluffos/GNUmakefile.keep'
--- a/driver/fluffos/GNUmakefile.keep	2008-06-30 15:10:24 +0000
+++ b/driver/fluffos/GNUmakefile.keep	2008-07-11 01:45:33 +0000
@@ -251,6 +251,7 @@
 	-find . -name "*.rej" -print | xargs rm
 	-rm -f *.ln tags TAGS
 	-rm -f $(DRIVER_BIN) $(DRIVER_BIN).old addr_server portbind
+	-rm -f *.exe
 	-rm -f Dependencies tmpdepend
 	-touch Dependencies
 

=== modified file 'driver/fluffos/arch.h' (properties changed: -x to +x)
--- a/driver/fluffos/arch.h	2008-06-30 15:10:24 +0000
+++ b/driver/fluffos/arch.h	2008-07-11 01:45:33 +0000
@@ -12,6 +12,12 @@
  * defines a number of windows related things. These
  * must be undef'd so that the 'normal' windows port code
  * in MudOS is not used.
+ *
+ * Note on FD_SETSIZE: Feel free to change "#if 0" to
+ * "#if 1" in order to enable a larger file descriptor
+ * set size. However, as of Fluffos 2.11-ds16, this causes
+ * very strange things to happen when the limit is reached, 
+ * so that's not what we're defaulting to.
  */
 #ifdef__CYGWIN__
 #undef WINNT
@@ -20,9 +26,11 @@
 #undef WINSOCK
 #undef WIN32
 #define ARCH "Cygwin-32"
+#if 0
 #undef FD_SETSIZE
 #define FD_SETSIZE 256
 #endif
+#endif
 
 #ifdef WINNT
 #define ARCH "Microsoft Windows NT"
@@ -83,7 +91,11 @@
 #endif
 
 #if defined(SunOS_5)
-#define ARCH "Solaris"
+#ifdef sparc 
+#define ARCH "Solaris SPARC"
+#else
+#define ARCH "Solaris x86"
+#endif
 #endif
 
 #ifdef_AUX_SOURCE

=== modified file 'driver/fluffos/backend.c' (properties changed: -x to +x)
--- a/driver/fluffos/backend.c	2008-06-30 15:10:24 +0000
+++ b/driver/fluffos/backend.c	2008-07-11 01:45:33 +0000
@@ -92,7 +92,9 @@
   volatile int first_call = 1;
   int there_is_a_port = 0;
   error_context_t econ;
-
+#if defined(DEBUG) && defined(FD_SETSIZE)
+  debug_message("FD_SETSIZE %d\n",FD_SETSIZE);
+#endif
   debug_message("Initializations complete.\n\n");
   for (i = 0; i < 5; i++) {
     if (external_port[i].port) {

=== modified file 'driver/fluffos/edit_source.c' (properties changed: -x to +x)
--- a/driver/fluffos/edit_source.c	2008-06-30 15:10:24 +0000
+++ b/driver/fluffos/edit_source.c	2008-07-11 01:45:33 +0000
@@ -1639,9 +1639,7 @@
     check_library("-lnsl_s");
     check_library("-lseq");
     check_library("-lm");
-
-    if (lookup_define("__CYGWIN__"))
-        check_library("-liconv");
+    check_library("-liconv");
 
     if (lookup_define("MINGW")){
         check_library("-lwsock32");

=== removed file 'driver/fluffos/insttest'
--- a/driver/fluffos/insttest	2008-06-26 04:14:10 +0000
+++ b/driver/fluffos/insttest	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-whatever

=== modified file 'driver/fluffos/object.c' (properties changed: -x to +x)
--- a/driver/fluffos/object.c	2008-06-30 15:10:24 +0000
+++ b/driver/fluffos/object.c	2008-07-11 01:45:33 +0000
@@ -1793,7 +1793,7 @@
 
     //debug(d_flag, ("free_object: /%s.\n", ob->obname));
 #ifdef DEBUG
-    debug_message("free_object: /%s.\n", ob->obname);
+    //debug_message("free_object: /%s.\n", ob->obname);
 #endif
 
     if (!(ob->flags & O_DESTRUCTED)) {
@@ -1829,7 +1829,7 @@
     if (ob->obname) {
         //debug(d_flag, ("Free object /%s\n", ob->obname));
 #ifdef DEBUG
-        debug_message("Free object /%s\n", ob->obname);
+        //debug_message("Free object /%s\n", ob->obname);
 #endif
         DEBUG_CHECK1(lookup_object_hash(ob->obname) == ob,
                      "Freeing object /%s but name still in name table", ob->obname);

=== modified file 'driver/fluffos/object.h' (properties changed: -x to +x)
--- a/driver/fluffos/object.h	2008-06-30 15:10:24 +0000
+++ b/driver/fluffos/object.h	2008-07-11 01:45:33 +0000
@@ -67,11 +67,20 @@
 } sentence_t;
 
 typedef struct object_s {
+#ifdef sparc
     unsigned short ref;         /* Reference count. */
     unsigned short flags;       /* Bits or'ed together from above */
-#ifdef DEBUG
-    unsigned int extra_ref;     /* Used to check ref count. */
-#endif
+#endif
+#if defined(sparc) && defined(DEBUG)
+    unsigned short extra_ref;     /* Used to check ref count. */
+#endif
+#ifndef sparc
+    unsigned long ref;         /* Reference count. */
+    unsigned long flags;       /* Bits or'ed together from above */ 
+#endif
+#if !defined(sparc) && defined(DEBUG)
+    unsigned long extra_ref;     /* Used to check ref count. */
+#endif 
     const char * const obname;
     struct object_s *next_hash;
     struct object_s *next_ch_hash;

=== modified file 'driver/fluffos/patchlevel.h' (properties changed: -x to +x)
--- a/driver/fluffos/patchlevel.h	2008-06-30 15:10:24 +0000
+++ b/driver/fluffos/patchlevel.h	2008-07-11 01:45:33 +0000
@@ -1,9 +1,9 @@
 #ifdef__CYGWIN__
-#define PATCH_LEVEL "v2.11-ds13c"
+#define PATCH_LEVEL "v2.11-ds18c"
 #else
 #ifndef WIN32
-#define PATCH_LEVEL "v2.11-ds13"
+#define PATCH_LEVEL "v2.11-ds18"
 #else 
-#define PATCH_LEVEL "v2.11-ds13w"
+#define PATCH_LEVEL "v2.11-ds18w"
 #endif
 #endif

=== modified file 'etc/README.install'
--- a/etc/README.install	2008-06-26 04:14:10 +0000
+++ b/etc/README.install	2008-07-11 01:45:33 +0000
@@ -29,7 +29,7 @@
  please see ../bin/ to see if the executable exist.
 
 There are 2 drivers available. MudOS v22.2b14 which is the original
-driver and FluffOS v2.11-ds13 which is a fork of MudOS and is
+driver and FluffOS v2.11-ds18 which is a fork of MudOS and is
 developed by the Discworld team. As development of Sapidlib continues,
 it is more likely that the lib will not work on MudOS. This is true if
 you want to run the MudOS driver on a 64 bit OS (some people have
@@ -85,7 +85,7 @@
 =======
 If your version of LPUniversity does not include the source code
 for FluffOS, you may download it from
-http://lpmuds.net/files/driver/fluffos-2.11-ds13.tgz
+http://lpmuds.net/files/driver/fluffos-2.11-ds18.tgz
 
 To do this from the shell type:
 
@@ -100,13 +100,13 @@
 have the source code for FluffOS already. If you don't have the
 source code, type:
 
-wget http://lpmuds.net/files/driver/fluffos-2.11-ds13.tgz
-tar xzf fluffos-2.11-ds13.tgz
+wget http://lpmuds.net/files/driver/fluffos-2.11-ds18.tgz
+tar xzf fluffos-2.11-ds18.tgz
 
 To make things simpler for you, you might also type the following to
 change the default name to something easier to type:
 
-mv fluffos-2.11-ds13 fluffos
+mv fluffos-2.11-ds18 fluffos
 
 FluffOS might release a new version and the actual foldername might change.
 

=== modified file 'lib/adm/obj/master.c'
--- a/lib/adm/obj/master.c	2008-06-27 19:09:55 +0000
+++ b/lib/adm/obj/master.c	2008-07-11 01:45:33 +0000
@@ -279,20 +279,21 @@
     string fname;
     int size;
 
-    if(query_privs(previous_object()) == "[open]") return;
+    if (query_privs(previous_object()) == "[open]") return;
 
+    msg = ctime(time()) + ":" + msg;
     fname = LOG_DIR + "/" + file;
     size = file_size(fname);
 
-    if(size == -2) return;
-    if(size > 200000)
+    if (size == -2) return;
+    if (size + strlen(msg) >= 200000)
     {
 	mixed array ltime = localtime(time());
 	string t1;
 	string backup;
 	int ret = sscanf(file, "%s.log", t1);
 
-	if(ret == 0)
+	if (ret == 0)
 	    backup =
               sprintf("archive/%s-%04d%02d%02d%02d%02d%02d",
 	        file,
@@ -317,7 +318,6 @@
 	rename(fname, LOG_DIR + "/" + backup);
     }
 
-    msg = ctime(time()) + ":" + msg;
     write_file(fname, msg);
 }
 



--
Sapidlib mainline development branch
https://code.launchpad.net/~sapidlib-dev-core/sapidlib/devel

You are receiving this branch notification because you are subscribed to it.