Added the OPNA command for downloading attachments

[citadel.git] / citadel / file_ops.c

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index db36ffd005b3e454fcc1c33c4cbf0908d68ffbca..e808766696e6f1eca7bcb63a37854b72cffd60e9 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -1,3 +1,4 @@
+/* $Id$ */
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -18,6 +19,7 @@
 #include "support.h"
 #include "room_ops.h"
 #include "msgbase.h"
+#include "tools.h"
 
 void cmd_delf(char *filename)
 {
@@ -48,7 +50,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);
@@ -97,7 +100,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);
@@ -114,7 +118,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;
@@ -122,7 +127,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);
@@ -168,20 +174,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) {
                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);
@@ -202,7 +210,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);
 
@@ -211,7 +220,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;
        }
 
@@ -220,11 +229,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);
        }
 
 
@@ -263,7 +273,8 @@ void cmd_open(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);
        CC->download_fp = fopen(pathname,"r");
 
        if (CC->download_fp==NULL) {
@@ -272,7 +283,7 @@ void cmd_open(char *cmdbuf)
                return;
                }
 
-       OpenCmdResult();
+       OpenCmdResult(filename, "application/octet-stream");
        }
 
 /*
@@ -306,11 +317,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");
@@ -320,7 +333,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");
@@ -330,7 +343,7 @@ void cmd_oimg(char *cmdbuf)
                return;
                }
        
-       OpenCmdResult();
+       OpenCmdResult(pathname, "image/gif");
        }
 
 /*
@@ -366,8 +379,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) {
@@ -419,17 +434,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()) ) {
@@ -474,7 +491,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);
                }
 
@@ -541,7 +559,7 @@ void cmd_ucls(char *cmd)
                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);
+               save_message(CC->temp, "", "", M_LOCAL, 1);
 
                }
        else {
@@ -572,8 +590,6 @@ void cmd_read(char *cmdbuf)
                return;
                }
 
-       if (CC->dl_is_net) if (bytes>64) bytes = 64; /**** FIX ****/
-
        fseek(CC->download_fp,start_pos,0);
        fread(buf,bytes,1,CC->download_fp);
        cprintf("%d %d\n",BINARY_FOLLOWS,bytes);
@@ -602,8 +618,6 @@ void cmd_writ(char *cmdbuf)
                return;
                }
 
-       if (CC->upload_type==UPL_NET) if (bytes > 64) bytes = 64; /*** FIX ***/
-
        cprintf("%d %d\n",SEND_BINARY,bytes);
        client_read(buf, bytes);
        fwrite(buf,bytes,1,CC->upload_fp);
@@ -646,7 +660,8 @@ 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 
@@ -688,7 +703,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");