]> code.citadel.org Git - citadel.git/blobdiff - citadel/file_ops.c
* Fixed generation of unique file names for network uploads etc.
[citadel.git] / citadel / file_ops.c
index 40d8289e33d2c79d04a13e8ff4dbe63795bb9d3d..fed2c0d890c4532137fa095958d8af768d1e0b3a 100644 (file)
@@ -1,4 +1,11 @@
-/* $Id$ */
+/* 
+ * $Id$
+ *
+ * Server functions which handle file transfers and room directories.
+ *
+ */
+
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -9,7 +16,6 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <limits.h>
-#include <pthread.h>
 #include "citadel.h"
 #include "server.h"
 #include "config.h"
 #include "room_ops.h"
 #include "msgbase.h"
 #include "tools.h"
+#include "citserver.h"
 
 void cmd_delf(char *filename)
 {
        char pathname[64];
        int a;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
-               return;
-               }
-
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR+HIGHER_ACCESS_REQUIRED);
-               return;
-               }
-
+       if (CtdlAccessCheck(ac_room_aide)) return;
 
        if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
                cprintf("%d No directory in this room.\n",ERROR+NOT_HERE);
@@ -76,16 +73,7 @@ void cmd_movf(char *cmdbuf)
        extract(filename,cmdbuf,0);
        extract(newroom,cmdbuf,1);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
-               return;
-               }
-
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR+HIGHER_ACCESS_REQUIRED);
-               return;
-               }
+       if (CtdlAccessCheck(ac_room_aide)) return;
 
        if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
                cprintf("%d No directory in this room.\n",ERROR+NOT_HERE);
@@ -146,20 +134,12 @@ void cmd_netf(char *cmdbuf)
        int a,e;
        time_t now;
        FILE *ofp;
+       static int seq = 1;
 
        extract(filename,cmdbuf,0);
        extract(destsys,cmdbuf,1);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
-               return;
-               }
-
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR+HIGHER_ACCESS_REQUIRED);
-               return;
-               }
+       if (CtdlAccessCheck(ac_room_aide)) return;
 
        if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
                cprintf("%d No directory in this room.\n",ERROR+NOT_HERE);
@@ -183,13 +163,14 @@ void cmd_netf(char *cmdbuf)
                }
        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;
                }
-       snprintf(outfile,sizeof outfile,"%s/network/spoolin/nsf.%d",BBSDIR,
-                getpid());
+       snprintf(outfile, sizeof outfile,
+               "%s/network/spoolin/nsf.%04x.%04x",
+               BBSDIR, getpid(), ++seq);
        ofp=fopen(outfile,"a");
        if (ofp==NULL) {
                cprintf("%d internal error\n",ERROR);
@@ -201,7 +182,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);
@@ -229,12 +210,18 @@ 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;
+       time_t modtime;
+       long filesize;
 
        fstat(fileno(CC->download_fp), &statbuf);
-       cprintf("%d %ld|%ld\n", OK, statbuf.st_size, statbuf.st_mtime);
-       }
+       filesize = (long) statbuf.st_size;
+       modtime = (time_t) statbuf.st_mtime;
+
+       cprintf("%d %ld|%ld|%s|%s\n",
+               OK, filesize, modtime, filename, mime_type);
+}
 
 
 /*
@@ -248,10 +235,7 @@ void cmd_open(char *cmdbuf)
 
        extract(filename,cmdbuf,0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
-               return;
-               }
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
                cprintf("%d No directory in this room.\n",ERROR+NOT_HERE);
@@ -282,7 +266,7 @@ void cmd_open(char *cmdbuf)
                return;
                }
 
-       OpenCmdResult();
+       OpenCmdResult(filename, "application/octet-stream");
        }
 
 /*
@@ -342,7 +326,7 @@ void cmd_oimg(char *cmdbuf)
                return;
                }
        
-       OpenCmdResult();
+       OpenCmdResult(pathname, "image/gif");
        }
 
 /*
@@ -355,10 +339,7 @@ void cmd_uopn(char *cmdbuf)
        extract(CC->upl_file,cmdbuf,0);
        extract(CC->upl_comment,cmdbuf,1);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
-               return;
-               }
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
                cprintf("%d No directory in this room.\n",ERROR+NOT_HERE);
@@ -519,12 +500,12 @@ 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);
                return;
-               }
+       }
 
        fclose(CC->upload_fp);
        CC->upload_fp = NULL;
@@ -532,9 +513,17 @@ void cmd_ucls(char *cmd)
        if ((!strcasecmp(cmd,"1")) && (CC->upload_type != UPL_FILE)) {
                CC->upload_type = UPL_FILE;
                cprintf("%d Upload completed.\n", OK);
-               return;
+
+               if (CC->upload_type == UPL_NET) {
+                       if (fork()==0) {
+                               execlp("./netproc", "netproc", "-i", NULL);
+                               exit(errno);
+                       }
                }
 
+               return;
+       }
+
        if (!strcasecmp(cmd,"1")) {
                cprintf("%d File '%s' saved.\n",OK,CC->upl_path);
                fp = fopen(CC->upl_filedir,"a");
@@ -542,30 +531,22 @@ void cmd_ucls(char *cmd)
                if (fp!=NULL) {
                        fprintf(fp,"%s %s\n",CC->upl_file,CC->upl_comment);
                        fclose(fp);
-                       }
+               }
 
                /* 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, "", "", M_LOCAL, 1);
-
-               }
+               sprintf(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);
+       }
        else {
                abort_upl(CC);
                cprintf("%d File '%s' aborted.\n",OK,CC->upl_path);
-               }
        }
+}
+
+
 
 /*
  * read from the download file
@@ -666,7 +647,7 @@ void cmd_ndop(char *cmdbuf)
         * 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");
@@ -691,6 +672,8 @@ void cmd_ndop(char *cmdbuf)
  */
 void cmd_nuop(char *cmdbuf)
 {
+       static int seq = 1;
+
        if (strlen(CC->net_node)==0) {
                cprintf("%d Not authenticated as a network node.\n",
                        ERROR+NOT_LOGGED_IN);
@@ -702,8 +685,9 @@ void cmd_nuop(char *cmdbuf)
                return;
                }
 
-       snprintf(CC->upl_path,sizeof CC->upl_path,"%s/network/spoolin/%s.%d",
-               BBSDIR,CC->net_node,getpid());
+       snprintf(CC->upl_path, sizeof CC->upl_path,
+               "%s/network/spoolin/%s.%04x.%04x",
+               BBSDIR, CC->net_node, getpid(), ++seq);
 
        CC->upload_fp = fopen(CC->upl_path,"r");
        if (CC->upload_fp != NULL) {