* 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 d38d4f27294f06672d074f245162b6ad7ede812a..955228e0b2e0cd05fe02adfce14728ca8c1d10d4 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -186,7 +186,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;
@@ -204,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);
@@ -523,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);
@@ -549,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, "", "", 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);
@@ -670,7 +660,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");