* Removed the built-in memory leak checker. It wasn't threadsafe and

[citadel.git] / citadel / file_ops.c

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index 911138168b57dff34c5fcbcbf634c9adfb6b11f3..cc0fd8ee2926e745a2e2bd11e97518111d6c0dbf 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -16,6 +16,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <errno.h>
+#include <ctype.h>
 #include <string.h>
 #include <sys/stat.h>
 
@@ -33,7 +34,7 @@
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
 #include "config.h"
 #include "file_ops.h"
 #include "sysdep_decls.h"
@@ -64,9 +65,9 @@ int network_talking_to(char *nodename, int operation) {
        switch(operation) {
 
                case NTT_ADD:
-                       if (nttlist == NULL) nttlist = strdoop("");
+                       if (nttlist == NULL) nttlist = strdup("");
                        if (nttlist == NULL) break;
-                       nttlist = (char *)reallok(nttlist,
+                       nttlist = (char *)realloc(nttlist,
                                (strlen(nttlist) + strlen(nodename) + 3) );
                        strcat(nttlist, "|");
                        strcat(nttlist, nodename);
@@ -75,7 +76,7 @@ int network_talking_to(char *nodename, int operation) {
                case NTT_REMOVE:
                        if (nttlist == NULL) break;
                        if (strlen(nttlist) == 0) break;
-                       ptr = mallok(strlen(nttlist));
+                       ptr = malloc(strlen(nttlist));
                        if (ptr == NULL) break;
                        strcpy(ptr, "");
                        for (i = 0; i < num_tokens(nttlist, '|'); ++i) {
@@ -86,7 +87,7 @@ int network_talking_to(char *nodename, int operation) {
                                                strcat(ptr, "|");
                                }
                        }
-                       phree(nttlist);
+                       free(nttlist);
                        nttlist = ptr;
                        break;
 
@@ -100,7 +101,7 @@ int network_talking_to(char *nodename, int operation) {
                        break;
        }
 
-       if (nttlist != NULL) lprintf(9, "nttlist=<%s>\n", nttlist);
+       if (nttlist != NULL) lprintf(CTDL_DEBUG, "nttlist=<%s>\n", nttlist);
        end_critical_section(S_NTTLIST);
        return(retval);
 }
@@ -119,7 +120,7 @@ void cmd_delf(char *filename)
        if (CtdlAccessCheck(ac_room_aide))
                return;
 
-       if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
+       if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
                cprintf("%d No directory in this room.\n",
                        ERROR + NOT_HERE);
                return;
@@ -136,7 +137,7 @@ void cmd_delf(char *filename)
                }
        }
        snprintf(pathname, sizeof pathname, "./files/%s/%s",
-                CC->quickroom.QRdirname, filename);
+                CC->room.QRdirname, filename);
        a = unlink(pathname);
        if (a == 0) {
                cprintf("%d File '%s' deleted.\n", CIT_OK, pathname);
@@ -161,14 +162,14 @@ void cmd_movf(char *cmdbuf)
        char newroom[SIZ];
        char buf[SIZ];
        int a;
-       struct quickroom qrbuf;
+       struct ctdlroom qrbuf;
 
        extract(filename, cmdbuf, 0);
        extract(newroom, cmdbuf, 1);
 
        if (CtdlAccessCheck(ac_room_aide)) return;
 
-       if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
+       if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
                cprintf("%d No directory in this room.\n",
                        ERROR + NOT_HERE);
                return;
@@ -186,7 +187,7 @@ void cmd_movf(char *cmdbuf)
                }
        }
        snprintf(pathname, sizeof pathname, "./files/%s/%s",
-                CC->quickroom.QRdirname, filename);
+                CC->room.QRdirname, filename);
        if (access(pathname, 0) != 0) {
                cprintf("%d File '%s' not found.\n",
                        ERROR + FILE_NOT_FOUND, pathname);
@@ -194,7 +195,7 @@ void cmd_movf(char *cmdbuf)
        }
 
        if (getroom(&qrbuf, newroom) != 0) {
-               cprintf("%d '%s' does not exist.\n", ERROR, newroom);
+               cprintf("%d '%s' does not exist.\n", ERROR + ROOM_NOT_FOUND, newroom);
                return;
        }
        if ((qrbuf.QRflags & QR_DIRECTORY) == 0) {
@@ -205,7 +206,7 @@ void cmd_movf(char *cmdbuf)
        snprintf(newpath, sizeof newpath, "./files/%s/%s", qrbuf.QRdirname,
                 filename);
        if (link(pathname, newpath) != 0) {
-               cprintf("%d Couldn't move file: %s\n", ERROR,
+               cprintf("%d Couldn't move file: %s\n", ERROR + INTERNAL_ERROR,
                        strerror(errno));
                return;
        }
@@ -214,7 +215,7 @@ void cmd_movf(char *cmdbuf)
        /* this is a crude method of copying the file description */
        snprintf(buf, sizeof buf,
                 "cat ./files/%s/filedir |grep %s >>./files/%s/filedir",
-                CC->quickroom.QRdirname, filename, qrbuf.QRdirname);
+                CC->room.QRdirname, filename, qrbuf.QRdirname);
        system(buf);
        cprintf("%d File '%s' has been moved.\n", CIT_OK, filename);
 }
@@ -237,7 +238,7 @@ void cmd_netf(char *cmdbuf)
 
        if (CtdlAccessCheck(ac_room_aide)) return;
 
-       if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
+       if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
                cprintf("%d No directory in this room.\n",
                        ERROR + NOT_HERE);
                return;
@@ -255,7 +256,7 @@ void cmd_netf(char *cmdbuf)
                }
        }
        snprintf(pathname, sizeof pathname, "./files/%s/%s",
-                CC->quickroom.QRdirname, filename);
+                CC->room.QRdirname, filename);
        if (access(pathname, 0) != 0) {
                cprintf("%d File '%s' not found.\n",
                        ERROR + FILE_NOT_FOUND, pathname);
@@ -269,25 +270,25 @@ void cmd_netf(char *cmdbuf)
                return;
        }
        snprintf(outfile, sizeof outfile,
-                "%s/network/spoolin/nsf.%04x.%04x",
-                BBSDIR, getpid(), ++seq);
+                "%s/network/spoolin/nsf.%04lx.%04x",
+                BBSDIR, (long)getpid(), ++seq);
        ofp = fopen(outfile, "a");
        if (ofp == NULL) {
-               cprintf("%d internal error\n", ERROR);
+               cprintf("%d internal error\n", ERROR + INTERNAL_ERROR);
                return;
        }
 
        putc(255, ofp);
        putc(MES_NORMAL, ofp);
        putc(0, ofp);
-       fprintf(ofp, "Pcit%ld", CC->usersupp.usernum);
+       fprintf(ofp, "Pcit%ld", CC->user.usernum);
        putc(0, ofp);
        time(&now);
        fprintf(ofp, "T%ld", (long) now);
        putc(0, ofp);
-       fprintf(ofp, "A%s", CC->usersupp.fullname);
+       fprintf(ofp, "A%s", CC->user.fullname);
        putc(0, ofp);
-       fprintf(ofp, "O%s", CC->quickroom.QRname);
+       fprintf(ofp, "O%s", CC->room.QRname);
        putc(0, ofp);
        fprintf(ofp, "N%s", NODENAME);
        putc(0, ofp);
@@ -300,7 +301,7 @@ void cmd_netf(char *cmdbuf)
 
        snprintf(buf, sizeof buf,
                 "cd ./files/%s; uuencode %s <%s 2>/dev/null >>%s",
-                CC->quickroom.QRdirname, filename, filename, outfile);
+                CC->room.QRdirname, filename, filename, outfile);
        system(buf);
 
        ofp = fopen(outfile, "a");
@@ -348,7 +349,7 @@ void cmd_open(char *cmdbuf)
 
        if (CtdlAccessCheck(ac_logged_in)) return;
 
-       if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
+       if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
                cprintf("%d No directory in this room.\n",
                        ERROR + NOT_HERE);
                return;
@@ -362,7 +363,7 @@ void cmd_open(char *cmdbuf)
 
        if (CC->download_fp != NULL) {
                cprintf("%d You already have a download file open.\n",
-                       ERROR);
+                       ERROR + RESOURCE_BUSY);
                return;
        }
 
@@ -373,12 +374,12 @@ void cmd_open(char *cmdbuf)
        }
 
        snprintf(pathname, sizeof pathname,
-                "./files/%s/%s", CC->quickroom.QRdirname, filename);
+                "./files/%s/%s", CC->room.QRdirname, filename);
        CC->download_fp = fopen(pathname, "r");
 
        if (CC->download_fp == NULL) {
                cprintf("%d cannot open %s: %s\n",
-                       ERROR, pathname, strerror(errno));
+                       ERROR + INTERNAL_ERROR, pathname, strerror(errno));
                return;
        }
 
@@ -392,8 +393,8 @@ void cmd_oimg(char *cmdbuf)
 {
        char filename[SIZ];
        char pathname[SIZ];
-       struct usersupp usbuf;
-       char which_user[32];
+       struct ctdluser usbuf;
+       char which_user[USERNAME_SIZE];
        int which_floor;
        int a;
 
@@ -407,7 +408,7 @@ void cmd_oimg(char *cmdbuf)
 
        if (CC->download_fp != NULL) {
                cprintf("%d You already have a download file open.\n",
-                       ERROR);
+                       ERROR + RESOURCE_BUSY);
                return;
        }
 
@@ -425,7 +426,7 @@ void cmd_oimg(char *cmdbuf)
                snprintf(pathname, sizeof pathname,
                         "./images/floor.%d.gif", which_floor);
        } else if (!strcasecmp(filename, "_roompic_")) {
-               assoc_file_name(pathname, sizeof pathname, &CC->quickroom, "images");
+               assoc_file_name(pathname, sizeof pathname, &CC->room, "images");
        } else {
                for (a = 0; a < strlen(filename); ++a) {
                        filename[a] = tolower(filename[a]);
@@ -459,7 +460,7 @@ void cmd_uopn(char *cmdbuf)
 
        if (CtdlAccessCheck(ac_logged_in)) return;
 
-       if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
+       if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
                cprintf("%d No directory in this room.\n",
                        ERROR + NOT_HERE);
                return;
@@ -473,7 +474,7 @@ void cmd_uopn(char *cmdbuf)
 
        if (CC->upload_fp != NULL) {
                cprintf("%d You already have a upload file open.\n",
-                       ERROR);
+                       ERROR + RESOURCE_BUSY);
                return;
        }
 
@@ -483,9 +484,9 @@ void cmd_uopn(char *cmdbuf)
                }
        }
        snprintf(CC->upl_path, sizeof CC->upl_path, "./files/%s/%s",
-                CC->quickroom.QRdirname, CC->upl_file);
+                CC->room.QRdirname, CC->upl_file);
        snprintf(CC->upl_filedir, sizeof CC->upl_filedir,
-                "./files/%s/filedir", CC->quickroom.QRdirname);
+                "./files/%s/filedir", CC->room.QRdirname);
 
        CC->upload_fp = fopen(CC->upl_path, "r");
        if (CC->upload_fp != NULL) {
@@ -499,7 +500,7 @@ void cmd_uopn(char *cmdbuf)
        CC->upload_fp = fopen(CC->upl_path, "wb");
        if (CC->upload_fp == NULL) {
                cprintf("%d Cannot open %s: %s\n",
-                       ERROR, CC->upl_path, strerror(errno));
+                       ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
                return;
        }
        cprintf("%d Ok\n", CIT_OK);
@@ -518,7 +519,7 @@ void cmd_uimg(char *cmdbuf)
        int a;
 
        if (num_parms(cmdbuf) < 2) {
-               cprintf("%d Usage error.\n", ERROR);
+               cprintf("%d Usage error.\n", ERROR + ILLEGAL_VALUE);
                return;
        }
 
@@ -526,7 +527,7 @@ void cmd_uimg(char *cmdbuf)
        extract(basenm, cmdbuf, 1);
        if (CC->upload_fp != NULL) {
                cprintf("%d You already have an upload file open.\n",
-                       ERROR);
+                       ERROR + RESOURCE_BUSY);
                return;
        }
 
@@ -539,25 +540,25 @@ void cmd_uimg(char *cmdbuf)
                }
        }
 
-       if (CC->usersupp.axlevel >= 6) {
+       if (CC->user.axlevel >= 6) {
                snprintf(CC->upl_path, sizeof CC->upl_path, "./images/%s",
                         basenm);
        }
 
        if (!strcasecmp(basenm, "_userpic_")) {
                snprintf(CC->upl_path, sizeof CC->upl_path,
-                        "./userpics/%ld.gif", CC->usersupp.usernum);
+                        "./userpics/%ld.gif", CC->user.usernum);
        }
 
        if ((!strcasecmp(basenm, "_floorpic_"))
-           && (CC->usersupp.axlevel >= 6)) {
+           && (CC->user.axlevel >= 6)) {
                which_floor = extract_int(cmdbuf, 2);
                snprintf(CC->upl_path, sizeof CC->upl_path,
                         "./images/floor.%d.gif", which_floor);
        }
 
        if ((!strcasecmp(basenm, "_roompic_")) && (is_room_aide())) {
-               assoc_file_name(CC->upl_path, sizeof CC->upl_path, &CC->quickroom, "images");
+               assoc_file_name(CC->upl_path, sizeof CC->upl_path, &CC->room, "images");
        }
 
        if (strlen(CC->upl_path) == 0) {
@@ -574,7 +575,7 @@ void cmd_uimg(char *cmdbuf)
        CC->upload_fp = fopen(CC->upl_path, "wb");
        if (CC->upload_fp == NULL) {
                cprintf("%d Cannot open %s: %s\n",
-                       ERROR, CC->upl_path, strerror(errno));
+                       ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
                return;
        }
        cprintf("%d Ok\n", CIT_OK);
@@ -591,7 +592,7 @@ void cmd_clos(void)
 
        if (CC->download_fp == NULL) {
                cprintf("%d You don't have a download file open.\n",
-                       ERROR);
+                       ERROR + RESOURCE_NOT_OPEN);
                return;
        }
 
@@ -632,7 +633,7 @@ void cmd_ucls(char *cmd)
        char upload_notice[512];
 
        if (CC->upload_fp == NULL) {
-               cprintf("%d You don't have an upload file open.\n", ERROR);
+               cprintf("%d You don't have an upload file open.\n", ERROR + RESOURCE_NOT_OPEN);
                return;
        }
 
@@ -664,8 +665,8 @@ void cmd_ucls(char *cmd)
                snprintf(upload_notice, sizeof upload_notice,
                        "NEW UPLOAD: '%s'\n %s\n",
                        CC->upl_file, CC->upl_comment);
-               quickie_message(CC->curr_user, NULL, CC->quickroom.QRname,
-                               upload_notice, 0);
+               quickie_message(CC->curr_user, NULL, CC->room.QRname,
+                               upload_notice, 0, NULL);
        } else {
                abort_upl(CC);
                cprintf("%d File '%s' aborted.\n", CIT_OK, CC->upl_path);
@@ -680,7 +681,8 @@ void cmd_ucls(char *cmd)
 void cmd_read(char *cmdbuf)
 {
        long start_pos;
-       int bytes;
+       size_t bytes;
+       size_t actual_bytes;
        char buf[4096];
 
        start_pos = extract_long(cmdbuf, 0);
@@ -688,20 +690,16 @@ void cmd_read(char *cmdbuf)
 
        if (CC->download_fp == NULL) {
                cprintf("%d You don't have a download file open.\n",
-                       ERROR);
+                       ERROR + RESOURCE_NOT_OPEN);
                return;
        }
 
-       if (bytes > 4096) {
-               cprintf("%d You may not read more than 4096 bytes.\n",
-                       ERROR);
-               return;
-       }
+       if (bytes > 4096) bytes = 4096;
 
        fseek(CC->download_fp, start_pos, 0);
-       fread(buf, bytes, 1, CC->download_fp);
-       cprintf("%d %d\n", BINARY_FOLLOWS, bytes);
-       client_write(buf, bytes);
+       actual_bytes = fread(buf, 1, bytes, CC->download_fp);
+       cprintf("%d %d\n", BINARY_FOLLOWS, (int)actual_bytes);
+       client_write(buf, actual_bytes);
 }
 
 
@@ -717,13 +715,13 @@ void cmd_writ(char *cmdbuf)
        bytes = extract_int(cmdbuf, 0);
 
        if (CC->upload_fp == NULL) {
-               cprintf("%d You don't have an upload file open.\n", ERROR);
+               cprintf("%d You don't have an upload file open.\n", ERROR + RESOURCE_NOT_OPEN);
                return;
        }
 
        if (bytes > 4096) {
                cprintf("%d You may not write more than 4096 bytes.\n",
-                       ERROR);
+                       ERROR + TOO_BIG);
                return;
        }
 
@@ -751,7 +749,7 @@ void cmd_ndop(char *cmdbuf)
 
        if (CC->download_fp != NULL) {
                cprintf("%d You already have a download file open.\n",
-                       ERROR);
+                       ERROR + RESOURCE_BUSY);
                return;
        }
 
@@ -769,7 +767,7 @@ void cmd_ndop(char *cmdbuf)
        CC->download_fp = fopen(pathname, "r");
        if (CC->download_fp == NULL) {
                cprintf("%d cannot open %s: %s\n",
-                       ERROR, pathname, strerror(errno));
+                       ERROR + INTERNAL_ERROR, pathname, strerror(errno));
                return;
        }
 
@@ -798,13 +796,13 @@ void cmd_nuop(char *cmdbuf)
 
        if (CC->upload_fp != NULL) {
                cprintf("%d You already have an upload file open.\n",
-                       ERROR);
+                       ERROR + RESOURCE_BUSY);
                return;
        }
 
        snprintf(CC->upl_path, sizeof CC->upl_path,
-                "%s/network/spoolin/%s.%04x.%04x",
-                BBSDIR, CC->net_node, getpid(), ++seq);
+                "%s/network/spoolin/%s.%04lx.%04x",
+                BBSDIR, CC->net_node, (long)getpid(), ++seq);
 
        CC->upload_fp = fopen(CC->upl_path, "r");
        if (CC->upload_fp != NULL) {
@@ -818,7 +816,7 @@ void cmd_nuop(char *cmdbuf)
        CC->upload_fp = fopen(CC->upl_path, "w");
        if (CC->upload_fp == NULL) {
                cprintf("%d Cannot open %s: %s\n",
-                       ERROR, CC->upl_path, strerror(errno));
+                       ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
                return;
        }