* messages.c: don't crash when a message contains more than MAXURLS of

  embedded URL's.  Omit them instead.
* citadel.rc: updated the sample browser remoting command for Macintosh
  based on a Mr.T suggestion
* techdoc/session.txt: redid the writeup for the MOVE command (fixed a
  mistake and made the writeup clearer)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index c53eb56e54a58022e46f2fdfc74846cfe0e78250..56396150dbc6c2febdd1fd66e4780189570f1449 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,12 @@
  $Log$
+ Revision 610.18  2003/09/21 04:10:56  ajc
+ * messages.c: don't crash when a message contains more than MAXURLS of
+   embedded URL's.  Omit them instead.
+ * citadel.rc: updated the sample browser remoting command for Macintosh
+   based on a Mr.T suggestion
+ * techdoc/session.txt: redid the writeup for the MOVE command (fixed a
+   mistake and made the writeup clearer)
+
  Revision 610.17  2003/09/17 21:40:13  ajc
  * html.c: don't truncate messages when wacky characters are
    encountered.  Substitute '?' characters instead.  Now the Citadel
@@ -5029,4 +5037,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/citadel.rc b/citadel/citadel.rc
index 5bef7a3d61f58637627927546ec988c08ad6009e..510c97fe3edddc2878aa4f667ea3316444b9a47f 100644 (file)
--- a/citadel/citadel.rc
+++ b/citadel/citadel.rc
@@ -125,12 +125,12 @@ remember_passwords=0
 # for 'safe' public clients.)
 #
 # This one works on Linux and most other X11-based Unices.  Specify the full
-# path to Netscape (or a Netscape-compatible like Mozilla) if necessary.
-#urlcmd=netscape -remote "openURL(%s)"
+# path to Mozilla (or a Mozilla derivative like Netscape) if necessary.
+#urlcmd=mozilla -remote "openURL(%s)"
 #
 # This one works really well on a Macintosh -- it opens URL's in whatever
 # browser you have configured as the system default.
-#urlcmd=open %s
+#urlcmd=open "%s"
 
 # If GOTMAILCMD is defined, the specified command will be executed.  This
 # might be nice for playing sounds or providing any other type of notification.

diff --git a/citadel/messages.c b/citadel/messages.c
index b125bea2a45c4752a828768d43e7a674cf2e5cc7..50ca0ccb5c2bd0244d74d9cde21656fb54ff56ed 100644 (file)
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -598,7 +598,7 @@ int read_message(CtdlIPC *ipc,
        /* Extract URL's */
        num_urls = 0;   /* Start with a clean slate */
        searchptr = message->text;
-       while (searchptr != NULL) {
+       while ( (searchptr != NULL) && (num_urls < MAXURLS) ) {
                searchptr = strstr(searchptr, "http://");
                if (searchptr != NULL) {
                        safestrncpy(urls[num_urls], searchptr, sizeof(urls[num_urls]));

diff --git a/citadel/techdoc/session.txt b/citadel/techdoc/session.txt
index 842f3d92951ef06dfde368c47ae104cc1704c5f1..928caf3a18c486092c927b254350754fe7afab5e 100644 (file)
--- a/citadel/techdoc/session.txt
+++ b/citadel/techdoc/session.txt
@@ -823,19 +823,16 @@ base.
 
  MOVE   (MOVE or copy a message to a different room)
 
- Move a message to a different room.  The two arguments that should be passed
-to this command are the message number of the message to be deleted, and the
-name of the target room.  If the operation succeeds, the message will be
-deleted from the current room and moved to the target room.  An ERROR code
-usually means that either the user does not have permission to perform this
-operation, or that the target room does not exist.
-
- In Citadel/UX 5.55 and above, a third argument may be specified: 0 or 1 to
-designate whether the message should be moved (0) or copied (1) to the target
-room.  In the case of a "copy" operation, the message's reference count is
-incremented, and a pointer to the message will exist in both the source *and*
-target rooms.  In the case of a "move" operation, the message pointer is
-deleted from the source room and the reference count remains the same.
+ Move or copy a message to a different room.  This command expects to be
+passed three arguments:
+ 0: the message number of the message to be moved or copied.
+ 1: the name of the target room.
+ 2: flag: 0 to move the message, 1 to copy it without deleting from the
+    source room.
+ 
+ This command never creates or deletes copies of a message; it merely moves
+around links.  When a message is moved, its reference count remains the same.
+When a message is copied, its reference count is incremented.
 
 
  KILL   (KILL current room)