* Did most of the migration from save_message() to CtdlSaveMsg(). The

[citadel.git] / citadel / file_ops.c

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index 866ed0978ea6187a3c1209bf32c56da27fa6d7ee..955228e0b2e0cd05fe02adfce14728ca8c1d10d4 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -1,4 +1,5 @@
 /* $Id$ */
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -9,7 +10,9 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <limits.h>
+#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
 #include "citadel.h"
 #include "server.h"
 #include "config.h"
@@ -19,6 +22,7 @@
 #include "support.h"
 #include "room_ops.h"
 #include "msgbase.h"
+#include "tools.h"
 
 void cmd_delf(char *filename)
 {
@@ -49,7 +53,8 @@ void cmd_delf(char *filename)
                }
        for (a=0; a<strlen(filename); ++a)
                if (filename[a]=='/') filename[a] = '_';
-       sprintf(pathname,"./files/%s/%s",CC->quickroom.QRdirname,filename);
+       snprintf(pathname,sizeof pathname,"./files/%s/%s",
+                CC->quickroom.QRdirname,filename);
        a=unlink(pathname);
        if (a==0) cprintf("%d File '%s' deleted.\n",OK,pathname);
        else cprintf("%d File '%s' not found.\n",ERROR+FILE_NOT_FOUND,pathname);
@@ -98,7 +103,8 @@ void cmd_movf(char *cmdbuf)
 
        for (a=0; a<strlen(filename); ++a)
                if (filename[a]=='/') filename[a] = '_';
-       sprintf(pathname,"./files/%s/%s",CC->quickroom.QRdirname,filename);
+       snprintf(pathname,sizeof pathname,"./files/%s/%s",
+                CC->quickroom.QRdirname,filename);
        if (access(pathname,0)!=0) {
                cprintf("%d File '%s' not found.\n",
                        ERROR+FILE_NOT_FOUND,pathname);
@@ -115,7 +121,8 @@ void cmd_movf(char *cmdbuf)
                        ERROR+NOT_HERE,qrbuf.QRname);
                return;
                }
-       sprintf(newpath,"./files/%s/%s",qrbuf.QRdirname,filename);
+       snprintf(newpath,sizeof newpath,"./files/%s/%s",qrbuf.QRdirname,
+                filename);
        if (link(pathname,newpath)!=0) {
                cprintf("%d Couldn't move file: %s\n",ERROR,strerror(errno));
                return;
@@ -123,7 +130,8 @@ void cmd_movf(char *cmdbuf)
        unlink(pathname);
 
        /* this is a crude method of copying the file description */
-       sprintf(buf,"cat ./files/%s/filedir |grep %s >>./files/%s/filedir",
+       snprintf(buf, sizeof buf,
+               "cat ./files/%s/filedir |grep %s >>./files/%s/filedir",
                CC->quickroom.QRdirname,
                filename,
                qrbuf.QRdirname);
@@ -169,20 +177,22 @@ void cmd_netf(char *cmdbuf)
 
        for (a=0; a<strlen(filename); ++a)
                if (filename[a]=='/') filename[a] = '_';
-       sprintf(pathname,"./files/%s/%s",CC->quickroom.QRdirname,filename);
+       snprintf(pathname,sizeof pathname,"./files/%s/%s",
+                CC->quickroom.QRdirname,filename);
        if (access(pathname,0)!=0) {
                cprintf("%d File '%s' not found.\n",
                        ERROR+FILE_NOT_FOUND,pathname);
                return;
                }
-       sprintf(buf,"sysop@%s",destsys);
+       snprintf(buf,sizeof buf,"sysop@%s",destsys);
        e=alias(buf);
-       if (e!=M_BINARY) {
+       if (e!=MES_BINARY) {
                cprintf("%d No such system: '%s'\n",
                        ERROR+NO_SUCH_SYSTEM,destsys);
                return;
                }
-       sprintf(outfile,"%s/network/spoolin/nsf.%d",BBSDIR,getpid());
+       snprintf(outfile,sizeof outfile,"%s/network/spoolin/nsf.%d",BBSDIR,
+                getpid());
        ofp=fopen(outfile,"a");
        if (ofp==NULL) {
                cprintf("%d internal error\n",ERROR);
@@ -194,7 +204,7 @@ void cmd_netf(char *cmdbuf)
        putc(0,ofp);
        fprintf(ofp,"Pcit%ld",CC->usersupp.usernum); putc(0,ofp);
        time(&now);
-       fprintf(ofp,"T%ld",now); putc(0,ofp);
+       fprintf(ofp,"T%ld",(long)now); putc(0,ofp);
        fprintf(ofp,"A%s",CC->usersupp.fullname); putc(0,ofp);
        fprintf(ofp,"O%s",CC->quickroom.QRname); putc(0,ofp);
        fprintf(ofp,"N%s",NODENAME); putc(0,ofp);
@@ -203,7 +213,8 @@ void cmd_netf(char *cmdbuf)
        putc('M',ofp);
        fclose(ofp);
 
-       sprintf(buf,"cd ./files/%s; uuencode %s <%s 2>/dev/null >>%s",
+       snprintf(buf,sizeof buf,
+               "cd ./files/%s; uuencode %s <%s 2>/dev/null >>%s",
                CC->quickroom.QRdirname,filename,filename,outfile);
        system(buf);
 
@@ -212,7 +223,7 @@ void cmd_netf(char *cmdbuf)
        fclose(ofp);
 
        cprintf("%d File '%s' has been sent to %s.\n",OK,filename,destsys);
-       system("nohup ./netproc >/dev/null 2>&1 &");
+       system("nohup ./netproc -i >/dev/null 2>&1 &");
        return;
        }
 
@@ -221,11 +232,12 @@ void cmd_netf(char *cmdbuf)
  * It examines the file and displays the OK result code and some information
  * about the file.  NOTE: this stuff is Unix dependent.
  */
-void OpenCmdResult(void) {
+void OpenCmdResult(char *filename, char *mime_type) {
        struct stat statbuf;
 
        fstat(fileno(CC->download_fp), &statbuf);
-       cprintf("%d %ld|%ld\n", OK, statbuf.st_size, statbuf.st_mtime);
+       cprintf("%d %ld|%ld|%s|%s\n", OK, statbuf.st_size, statbuf.st_mtime,
+                                       filename, mime_type);
        }
 
 
@@ -274,7 +286,7 @@ void cmd_open(char *cmdbuf)
                return;
                }
 
-       OpenCmdResult();
+       OpenCmdResult(filename, "application/octet-stream");
        }
 
 /*
@@ -308,11 +320,13 @@ void cmd_oimg(char *cmdbuf)
                        cprintf("%d No such user.\n", ERROR+NO_SUCH_USER);
                        return;
                        }
-               sprintf(pathname, "./userpics/%ld.gif", usbuf.usernum);
+               snprintf(pathname, sizeof pathname, "./userpics/%ld.gif",
+                        usbuf.usernum);
                }
        else if (!strcasecmp(filename, "_floorpic_")) {
                which_floor = extract_int(cmdbuf, 1);
-               sprintf(pathname, "./images/floor.%d.gif", which_floor);
+               snprintf(pathname, sizeof pathname, "./images/floor.%d.gif",
+                        which_floor);
                }
        else if (!strcasecmp(filename, "_roompic_")) {
                assoc_file_name(pathname, &CC->quickroom, "images");
@@ -322,7 +336,7 @@ void cmd_oimg(char *cmdbuf)
                        filename[a] = tolower(filename[a]);
                        if (filename[a]=='/') filename[a] = '_';
                        }
-               sprintf(pathname,"./images/%s.gif",filename);
+               snprintf(pathname,sizeof pathname,"./images/%s.gif",filename);
                }
        
        CC->download_fp = fopen(pathname,"r");
@@ -332,7 +346,7 @@ void cmd_oimg(char *cmdbuf)
                return;
                }
        
-       OpenCmdResult();
+       OpenCmdResult(pathname, "image/gif");
        }
 
 /*
@@ -368,8 +382,10 @@ void cmd_uopn(char *cmdbuf)
 
        for (a=0; a<strlen(CC->upl_file); ++a)
                if (CC->upl_file[a]=='/') CC->upl_file[a] = '_';
-       sprintf(CC->upl_path,"./files/%s/%s",CC->quickroom.QRdirname,CC->upl_file);
-       sprintf(CC->upl_filedir,"./files/%s/filedir",CC->quickroom.QRdirname);
+       snprintf(CC->upl_path,sizeof CC->upl_path,"./files/%s/%s",
+                CC->quickroom.QRdirname,CC->upl_file);
+       snprintf(CC->upl_filedir,sizeof CC->upl_filedir,"./files/%s/filedir",
+                CC->quickroom.QRdirname);
        
        CC->upload_fp = fopen(CC->upl_path,"r");
        if (CC->upload_fp != NULL) {
@@ -421,17 +437,19 @@ void cmd_uimg(char *cmdbuf)
                }
 
        if (CC->usersupp.axlevel >= 6) {
-               sprintf(CC->upl_path, "./images/%s", basenm);
+               snprintf(CC->upl_path, sizeof CC->upl_path, "./images/%s",
+                        basenm);
                }
 
        if (!strcasecmp(basenm, "_userpic_")) {
-               sprintf(CC->upl_path, "./userpics/%ld.gif",
-                       CC->usersupp.usernum);
+               snprintf(CC->upl_path, sizeof CC->upl_path,
+                        "./userpics/%ld.gif", CC->usersupp.usernum);
                }
 
        if ( (!strcasecmp(basenm, "_floorpic_")) && (CC->usersupp.axlevel >= 6) ) {
                which_floor = extract_int(cmdbuf, 2);
-               sprintf(CC->upl_path, "./images/floor.%d.gif", which_floor);
+               snprintf(CC->upl_path, sizeof CC->upl_path,
+                        "./images/floor.%d.gif", which_floor);
                }
 
        if ( (!strcasecmp(basenm, "_roompic_")) && (is_room_aide()) ) {
@@ -476,7 +494,8 @@ void cmd_clos(void) {
 
        if (CC->dl_is_net == 1) {
                CC->dl_is_net = 0;
-               sprintf(buf,"%s/network/spoolout/%s",BBSDIR,CC->net_node);
+               snprintf(buf,sizeof buf,"%s/network/spoolout/%s",BBSDIR,
+                        CC->net_node);
                unlink(buf);
                }
 
@@ -504,7 +523,7 @@ void abort_upl(struct CitContext *who)
 void cmd_ucls(char *cmd)
 {
        FILE *fp;
-       time_t now;
+       char upload_notice[512];
        
        if (CC->upload_fp == NULL) {
                cprintf("%d You don't have an upload file open.\n",ERROR);
@@ -530,21 +549,11 @@ void cmd_ucls(char *cmd)
                        }
 
                /* put together an upload notice */
-               time(&now);
-               fp=fopen(CC->temp,"wb");
-               putc(255,fp);
-               putc(MES_NORMAL,fp);
-               putc(0,fp);
-               fprintf(fp,"Pcit%ld",CC->usersupp.usernum); putc(0,fp);
-               fprintf(fp,"T%ld",now); putc(0,fp);
-               fprintf(fp,"A%s",CC->curr_user); putc(0,fp);
-               fprintf(fp,"O%s",CC->quickroom.QRname); putc(0,fp);
-               fprintf(fp,"N%s",NODENAME); putc(0,fp); putc('M',fp);
-               fprintf(fp,"NEW UPLOAD: '%s'\n %s\n",CC->upl_file,CC->upl_comment);
-               putc(0,fp);
-               fclose(fp);
-               save_message(CC->temp, "", 0, M_LOCAL, 1);
-
+               sprintf(upload_notice,
+                       "NEW UPLOAD: '%s'\n %s\n",
+                       CC->upl_file,CC->upl_comment);
+               quickie_message(CC->curr_user, CC->quickroom.QRname,
+                               upload_notice);
                }
        else {
                abort_upl(CC);
@@ -644,13 +653,14 @@ void cmd_ndop(char *cmdbuf)
                return;
                }
 
-       sprintf(pathname,"%s/network/spoolout/%s",BBSDIR,CC->net_node);
+       snprintf(pathname,sizeof pathname,"%s/network/spoolout/%s",BBSDIR,
+                CC->net_node);
 
        /* first open the file in append mode in order to create a
         * zero-length file if it doesn't already exist 
         */
        CC->download_fp = fopen(pathname,"a");
-       fclose(CC->download_fp);
+       if (CC->download_fp != NULL) fclose(CC->download_fp);
 
        /* now open it */
        CC->download_fp = fopen(pathname,"r");
@@ -686,7 +696,7 @@ void cmd_nuop(char *cmdbuf)
                return;
                }
 
-       sprintf(CC->upl_path,"%s/network/spoolin/%s.%d",
+       snprintf(CC->upl_path,sizeof CC->upl_path,"%s/network/spoolin/%s.%d",
                BBSDIR,CC->net_node,getpid());
 
        CC->upload_fp = fopen(CC->upl_path,"r");