Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / file_ops.c

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index 69e49c45e9625c9a543128ca45fbe87f8d862fd6..460e2a85b462df566385f4211d44f983d8b6d52e 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -81,7 +81,7 @@ int network_talking_to(const char *nodename, long len, int operation) {
                        if ((nttlist == NULL) ||
                            (GetCount(nttlist) == 0))
                                break;
-                       if (!GetHash(nttlist, nodename, len, &vdata))
+                       if (GetHash(nttlist, nodename, len, &vdata))
                                retval ++;
                        syslog(LOG_DEBUG, "nttlist: have [%d] <%s>\n", retval, nodename);
                        break;
@@ -156,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);
@@ -210,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);
 }
 
@@ -690,9 +689,7 @@ void cmd_writ(char *cmdbuf)
        }
 
        if (bytes > 100000) {
-               cprintf("%d You may not write more than 100000 bytes.\n",
-                       ERROR + TOO_BIG);
-               return;
+               bytes = 100000;
        }
 
        cprintf("%d %d\n", SEND_BINARY, bytes);