Began setting up a second server socket that will be used exclusively for admin utilities

[citadel.git] / citadel / file_ops.c

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index 9040c4c746b4d009ba5cad19ebc91644be48c1b3..207a4b19010bb254845a280e3632d22fe7897842 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -70,9 +70,8 @@ int network_talking_to(const char *nodename, long len, int operation) {
                            (GetCount(nttlist) == 0))
                                break;
                        Pos = GetNewHashPos(nttlist, 1);
-                       GetHashPosFromKey (nttlist, nodename, len, Pos);
-
-                       DeleteEntryFromHash(nttlist, Pos);
+                       if (GetHashPosFromKey (nttlist, nodename, len, Pos))
+                               DeleteEntryFromHash(nttlist, Pos);
                        DeleteHashPos(&Pos);
                        syslog(LOG_DEBUG, "nttlist: removed <%s>\n", nodename);
 
@@ -157,7 +156,6 @@ void cmd_movf(char *cmdbuf)
        char buf[PATH_MAX];
        int a;
        struct ctdlroom qrbuf;
-       int rv = 0;
 
        extract_token(filename, cmdbuf, 0, '|', sizeof filename);
        extract_token(newroom, cmdbuf, 1, '|', sizeof newroom);
@@ -211,7 +209,7 @@ void cmd_movf(char *cmdbuf)
        snprintf(buf, sizeof buf,
                 "cat ./files/%s/filedir |grep \"%s\" >>./files/%s/filedir",
                 CC->room.QRdirname, filename, qrbuf.QRdirname);
-       rv = system(buf);
+       system(buf);
        cprintf("%d File '%s' has been moved.\n", CIT_OK, filename);
 }