* Began (but did not finish) applying GPL3+ declarations to each source file. This...

[citadel.git] / citadel / citadel.c

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 8e5c4901063114032b375f46b12d9f50d51b95dc..7e5ef874a2351bf2233c80e1a4b657bdce81c01f 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -2,6 +2,22 @@
  * $Id$
  *
  * Main source module for the client program.
+ *
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -368,6 +384,7 @@ void dotgoto(CtdlIPC *ipc, char *towhere, int display_name, int fromungoto)
        int ugpos = uglistsize;
        int r;                          /* IPC result code */
        struct ctdlipcroom *room = NULL;
+       int rv = 0;
 
        /* store ungoto information */
        if (fromungoto == 0) {
@@ -502,7 +519,7 @@ void dotgoto(CtdlIPC *ipc, char *towhere, int display_name, int fromungoto)
                }
                color(DIM_WHITE);
                if (!IsEmptyStr(rc_gotmail_cmd)) {
-                       system(rc_gotmail_cmd);
+                       rv = system(rc_gotmail_cmd);
                }
        }
        status_line(ipc->ServInfo.humannode, ipc->ServInfo.site_location,
@@ -768,16 +785,6 @@ void  gotoroomstep(CtdlIPC *ipc, int direction, int mode)
        char rmname[ROOMNAMELEN];
        int rmslot = 0;
        int rmtotal;
-       struct ctdlroom *attr = NULL;
-
-       /* Fetch the existing room config */
-       r = CtdlIPCGetRoomAttributes(ipc, &attr, buf);
-       if (r / 100 != 2) {
-               scr_printf("%s\n", buf);
-               return;
-       }
-       strcpy (room_name , attr->QRname); 
-       free(attr);
 
        /* Ask the server for a room list */
        r = CtdlIPCKnownRooms(ipc, SubscribedRooms, (-1), &listing, buf);
@@ -1408,6 +1415,7 @@ int main(int argc, char **argv)
        struct ctdluser *myself = NULL;
        CtdlIPC* ipc;                   /* Our server connection */
        int r;                          /* IPC result code */
+       int rv = 0;                     /* fetch but ignore syscall return value to suppress warnings */
 
        int relh=0;
        int home=0;
@@ -1744,7 +1752,7 @@ NEWUSR:   if (IsEmptyStr(rc_password)) {
                                scr_printf("*** You have %d new private messages in Mail>\n", b);
                        color(DIM_WHITE);
                        if (!IsEmptyStr(rc_gotmail_cmd)) {
-                               system(rc_gotmail_cmd);
+                               rv = system(rc_gotmail_cmd);
                        }
                }
                if ((axlevel >= 6) && (chek.needvalid > 0)) {
@@ -2214,10 +2222,6 @@ NEWUSR:  if (IsEmptyStr(rc_password)) {
                                deletefile(ipc);
                                break;
 
-                       case 53:
-                               netsendfile(ipc);
-                               break;
-
                        case 54:
                                movefile(ipc);
                                break;