* Replaced the DEFAULT_ENTRY definition in sysconfig.h with a new option

[citadel.git] / citadel / messages.c

diff --git a/citadel/messages.c b/citadel/messages.c
index b125bea2a45c4752a828768d43e7a674cf2e5cc7..24b051464c9802cee62ff94a425544d4840d7df8 100644 (file)
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -65,6 +65,7 @@ unsigned long *msg_arr = NULL;
 int msg_arr_size = 0;
 int num_msgs;
 char rc_alt_semantics;
+char rc_reply_extedit;
 extern char room_name[];
 extern unsigned room_flags;
 extern long highest_msg_read;
@@ -598,7 +599,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]));
@@ -1619,7 +1620,7 @@ RMSGREAD: scr_flush();
                        goto RMSGREAD;
                case 'r':
                        savedpos = num_msgs;
-                       entmsg(ipc, 1, (DEFAULT_ENTRY == 46 ? 2 : 0));
+                       entmsg(ipc, 1, (rc_reply_extedit ? 2 : 0));
                        num_msgs = savedpos;
                        goto RMSGREAD;
                case 'u':