#include <ctype.h>
#include <string.h>
#include <sys/stat.h>
+#include <sys/mman.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
#include "config.h"
#include "file_ops.h"
#include "sysdep_decls.h"
-#include "user_ops.h"
#include "support.h"
#include "room_ops.h"
#include "msgbase.h"
#include "snprintf.h"
#endif
+#include "ctdl_module.h"
+#include "user_ops.h"
+
/*
* network_talking_to() -- concurrency checker
*/
char buf[PATH_MAX];
int a;
struct ctdlroom qrbuf;
+ int rv = 0;
extract_token(filename, cmdbuf, 0, '|', sizeof filename);
extract_token(newroom, cmdbuf, 1, '|', sizeof newroom);
return;
}
- if (getroom(&qrbuf, newroom) != 0) {
+ if (CtdlGetRoom(&qrbuf, newroom) != 0) {
cprintf("%d '%s' does not exist.\n", ERROR + ROOM_NOT_FOUND, newroom);
return;
}
snprintf(buf, sizeof buf,
"cat ./files/%s/filedir |grep \"%s\" >>./files/%s/filedir",
CC->room.QRdirname, filename, qrbuf.QRdirname);
- system(buf);
+ rv = system(buf);
cprintf("%d File '%s' has been moved.\n", CIT_OK, filename);
}
long filesize;
fstat(fileno(CC->download_fp), &statbuf);
+ CC->download_fp_total = statbuf.st_size;
filesize = (long) statbuf.st_size;
modtime = (time_t) statbuf.st_mtime;
char which_user[USERNAME_SIZE];
int which_floor;
int a;
+ int rv;
extract_token(filename, cmdbuf, 0, '|', sizeof filename);
if (!strcasecmp(filename, "_userpic_")) {
extract_token(which_user, cmdbuf, 1, '|', sizeof which_user);
- if (getuser(&usbuf, which_user) != 0) {
+ if (CtdlGetUser(&usbuf, which_user) != 0) {
cprintf("%d No such user.\n",
ERROR + NO_SUCH_USER);
return;
ERROR + FILE_NOT_FOUND, pathname, strerror(errno));
return;
}
- fread(&MimeTestBuf[0], 1, 32, CC->download_fp);
+ rv = fread(&MimeTestBuf[0], 1, 32, CC->download_fp);
rewind (CC->download_fp);
OpenCmdResult(pathname, GuessMimeType(&MimeTestBuf[0], 32));
}
}
}
- if (CC->user.axlevel >= 6) {
+ if (CC->user.axlevel >= AxAideU) {
snprintf(CC->upl_path, sizeof CC->upl_path,
"%s/%s",
ctdl_image_dir,
}
if ((!strcasecmp(basenm, "_floorpic_"))
- && (CC->user.axlevel >= 6)) {
+ && (CC->user.axlevel >= AxAideU)) {
which_floor = extract_int(cmdbuf, 2);
snprintf(CC->upl_path, sizeof CC->upl_path,
"%s/floor.%d.gif",
/*
* close the download file
*/
-void cmd_clos(void)
+void cmd_clos(char *cmdbuf)
{
char buf[256];
/*
* abort an upload
*/
-void abort_upl(struct CitContext *who)
+void abort_upl(CitContext *who)
{
if (who->upload_fp != NULL) {
fclose(who->upload_fp);
{
FILE *fp;
char upload_notice[512];
+ static int seq = 0;
if (CC->upload_fp == NULL) {
cprintf("%d You don't have an upload file open.\n", ERROR + RESOURCE_NOT_OPEN);
CC->upload_type = UPL_FILE;
cprintf("%d Upload completed.\n", CIT_OK);
- /* FIXME ... here we need to trigger a network run */
+ if (CC->upload_type == UPL_NET) {
+ char final_filename[PATH_MAX];
+ snprintf(final_filename, sizeof final_filename,
+ "%s/%s.%04lx.%04x",
+ ctdl_netin_dir,
+ CC->net_node,
+ (long)getpid(),
+ ++seq
+ );
+
+ if (link(CC->upl_path, final_filename) == 0) {
+ unlink(CC->upl_path);
+ }
+ else {
+ CtdlLogPrintf(CTDL_ALERT, "Cannot link %d to %d: %s\n",
+ CC->upl_path, final_filename, strerror(errno)
+ );
+ }
+
+ /* FIXME ... here we need to trigger a network run */
+ }
return;
}
return;
}
- if (bytes > 100000) bytes = 100000;
- buf = malloc(bytes + 1);
-
- fseek(CC->download_fp, start_pos, 0);
- actual_bytes = fread(buf, 1, bytes, CC->download_fp);
- cprintf("%d %d\n", BINARY_FOLLOWS, (int)actual_bytes);
- client_write(buf, actual_bytes);
- free(buf);
+ buf = mmap(NULL,
+ CC->download_fp_total,
+ PROT_READ,
+ MAP_PRIVATE,
+ fileno(CC->download_fp),
+ 0);
+
+ actual_bytes = CC->download_fp_total - start_pos;
+ if ((actual_bytes > 0) && (buf != NULL)) {
+ cprintf("%d %d\n", BINARY_FOLLOWS, (int)actual_bytes);
+ client_write(buf + start_pos, actual_bytes);
+ }
+ else {
+ cprintf("%d %s\n", ERROR, strerror(errno));
+ }
+ munmap(buf, CC->download_fp_total);
}
{
int bytes;
char *buf;
+ int rv;
unbuffer_output();
cprintf("%d %d\n", SEND_BINARY, bytes);
buf = malloc(bytes + 1);
client_read(buf, bytes);
- fwrite(buf, bytes, 1, CC->upload_fp);
+ rv = fwrite(buf, bytes, 1, CC->upload_fp);
free(buf);
}
CC->dl_is_net = 1;
stat(pathname, &statbuf);
+ CC->download_fp_total = statbuf.st_size;
cprintf("%d %ld\n", CIT_OK, (long)statbuf.st_size);
}
snprintf(CC->upl_path, sizeof CC->upl_path,
"%s/%s.%04lx.%04x",
- ctdl_netin_dir,
+ ctdl_nettmp_dir,
CC->net_node,
(long)getpid(),
++seq);
CC->upload_type = UPL_NET;
cprintf("%d Ok\n", CIT_OK);
}
+
+
+/*****************************************************************************/
+/* MODULE INITIALIZATION STUFF */
+/*****************************************************************************/
+
+CTDL_MODULE_INIT(file_ops)
+{
+ if (!threading) {
+ CtdlRegisterProtoHook(cmd_delf, "DELF", "Delete a file");
+ CtdlRegisterProtoHook(cmd_movf, "MOVF", "Move a file");
+ CtdlRegisterProtoHook(cmd_open, "OPEN", "Open a download file transfer");
+ CtdlRegisterProtoHook(cmd_clos, "CLOS", "Close a download file transfer");
+ CtdlRegisterProtoHook(cmd_uopn, "UOPN", "Open an upload file transfer");
+ CtdlRegisterProtoHook(cmd_ucls, "UCLS", "Close an upload file transfer");
+ CtdlRegisterProtoHook(cmd_read, "READ", "File transfer read operation");
+ CtdlRegisterProtoHook(cmd_writ, "WRIT", "File transfer write operation");
+ CtdlRegisterProtoHook(cmd_ndop, "NDOP", "Open a network spool file for download");
+ CtdlRegisterProtoHook(cmd_nuop, "NUOP", "Open a network spool file for upload");
+ CtdlRegisterProtoHook(cmd_oimg, "OIMG", "Open an image file for download");
+ CtdlRegisterProtoHook(cmd_uimg, "UIMG", "Upload an image file");
+ }
+ /* return our Subversion id for the Log */
+ return "$Id$";
+}
projects / citadel.git / blobdiff