* commands.c: alternate_semantics might have been getting set where it

  should not.  Fixed.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index cd356e131646fe9341058bb994e96ca702da9058..7224a9ade4729fd28bdb9ca8e6079a10d87161e5 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 605.6  2003/03/01 18:18:03  ajc
+ * commands.c: alternate_semantics might have been getting set where it
+   should not.  Fixed.
+
  Revision 605.5  2003/03/01 17:25:33  ajc
  * citadel.rc default for alternate_semantics = no
 
@@ -4498,4 +4502,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.c b/citadel/citadel.c
index bc55bca1a3bb8afca8342f118f276ad47f7e18d7..ce114f505c0ddbaf8bf2b5c5aed9d3b885ccd61b 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -499,7 +499,9 @@ void gotonext(CtdlIPC *ipc)
         * If it is, pop the first room off the list and go there.
         */
        if (march == NULL) {
-               r = CtdlIPCKnownRooms(ipc, SubscribedRoomsWithNewMessages, AllFloors, &march, buf);
+               r = CtdlIPCKnownRooms(ipc, SubscribedRoomsWithNewMessages,
+                                       AllFloors, &march, buf);
+
 /* add _BASEROOM_ to the end of the march list, so the user will end up
  * in the system base room (usually the Lobby>) at the end of the loop
  */
@@ -1261,7 +1263,6 @@ NEWUSR:   if (strlen(rc_password) == 0) {
 
        set_floor_mode();
 
-
        /* Enter the lobby */
        dotgoto(ipc, "_BASEROOM_", 1, 0);
 
@@ -1305,21 +1306,22 @@ NEWUSR: if (strlen(rc_password) == 0) {
                                else
                                        entmsg(ipc, 0, 0);
                                break;
-                       case 5:
+                       case 5:                         /* <G>oto */
                                updatels(ipc);
                                gotonext(ipc);
                                break;
-                       case 47:
-                               if (!rc_alt_semantics)
+                       case 47:                        /* <A>bandon */
+                               if (!rc_alt_semantics) {
                                        updatelsa(ipc);
+                               }
                                gotonext(ipc);
                                break;
-                       case 90:
+                       case 90:                        /* <.A>bandon */
                                if (!rc_alt_semantics)
                                        updatelsa(ipc);
                                dotgoto(ipc, argbuf, 0, 0);
                                break;
-                       case 58:
+                       case 58:                        /* <M>ail */
                                updatelsa(ipc);
                                dotgoto(ipc, "_MAIL_", 1, 0);
                                break;
@@ -1556,8 +1558,9 @@ NEWUSR:   if (strlen(rc_password) == 0) {
                                break;
 
                        case 6:
-                               if (rc_alt_semantics)
+                               if (rc_alt_semantics) {
                                        updatelsa(ipc);
+                               }
                                gotonext(ipc);
                                break;
 

diff --git a/citadel/citadel_ipc.c b/citadel/citadel_ipc.c
index 8b1eff7226bd49f79a52c278a204f01b717d8720..5d6d58969b00d6bef93f30bea5d3e9848cb27040 100644 (file)
--- a/citadel/citadel_ipc.c
+++ b/citadel/citadel_ipc.c
@@ -681,10 +681,12 @@ int CtdlIPCSetLastRead(CtdlIPC *ipc, long msgnum, char *cret)
 
        if (!cret) return -2;
 
-       if (msgnum)
+       if (msgnum) {
                sprintf(aaa, "SLRP %ld", msgnum);
-       else
+       }
+       else {
                sprintf(aaa, "SLRP HIGHEST");
+       }
        ret = CtdlIPCGenericCommand(ipc, aaa, NULL, 0, NULL, NULL, cret);
        return ret;
 }

diff --git a/citadel/commands.c b/citadel/commands.c
index 5a0580527f28700305c692873070f40aac99db4b..f7a9a36b32dc7921b01c8d287f51b58a9e985449 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -882,10 +882,12 @@ void load_command_set(void)
                        strcpy(rc_gotmail_cmd, &buf[11]);
 
                if (!strncasecmp(buf, "alternate_semantics=", 20)) {
-                       if (!strncasecmp(&buf[11], "yes", 3))
+                       if (!strncasecmp(&buf[20], "yes", 3)) {
                                rc_alt_semantics = 1;
-                       if (!strncasecmp(&buf[11], "no", 2))
+                       }
+                       else {
                                rc_alt_semantics = 0;
+                       }
                }
                if (!strncasecmp(buf, "cmd=", 4)) {
                        strcpy(buf, &buf[4]);

diff --git a/citadel/routines2.c b/citadel/routines2.c
index 56982df02ca7fd1ffa4a4b44e585db12bfa6ebb4..9e5e420e60925fef161b71fbfa66adcd86c53c9c 100644 (file)
--- a/citadel/routines2.c
+++ b/citadel/routines2.c
@@ -190,7 +190,6 @@ void updatels(CtdlIPC *ipc)
 
        if (rc_alt_semantics) {
                if (maxmsgnum == highest_msg_read == 0) {
-                       /* err_printf("maxmsgnum == highest_msg_read == 0\n"); */
                        return;
                }
                r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?