* Changed the comments at the beginning of each file to a consistent format

[citadel.git] / citadel / file_ops.c

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index e808766696e6f1eca7bcb63a37854b72cffd60e9..e2db9eb56396bf8e9bcf393f0f39bba79f3c8dfc 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -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"
@@ -20,23 +26,14 @@
 #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);
@@ -150,16 +138,7 @@ void cmd_netf(char *cmdbuf)
        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,7 +162,7 @@ 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;
@@ -201,7 +180,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);
@@ -231,11 +210,16 @@ void cmd_netf(char *cmdbuf)
  */
 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|%s|%s\n", OK, statbuf.st_size, statbuf.st_mtime,
-                                       filename, mime_type);
-       }
+       filesize = (long) statbuf.st_size;
+       modtime = (time_t) statbuf.st_mtime;
+
+       cprintf("%d %ld|%ld|%s|%s\n",
+               OK, filesize, modtime, filename, mime_type);
+}
 
 
 /*
@@ -249,10 +233,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);
@@ -356,10 +337,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);
@@ -520,12 +498,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;
@@ -533,9 +511,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");
@@ -543,30 +529,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
@@ -667,7 +645,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");