/*
* Server functions which handle file transfers and room directories.
+ *
+ * Copyright (c) 1987-2018 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
+#include <stdlib.h>
+#include <unistd.h>
#include <stdio.h>
+#include <netdb.h>
#include <libcitadel.h>
#include <dirent.h>
-
+#include <sys/types.h>
+#include <sys/stat.h>
#include "ctdl_module.h"
#include "citserver.h"
#include "support.h"
+#include "config.h"
#include "user_ops.h"
+
/*
* Server command to delete a file from a room's directory
*/
return;
if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
- cprintf("%d No directory in this room.\n",
- ERROR + NOT_HERE);
+ cprintf("%d No directory in this room.\n", ERROR + NOT_HERE);
return;
}
if (IsEmptyStr(filename)) {
- cprintf("%d You must specify a file name.\n",
- ERROR + FILE_NOT_FOUND);
+ cprintf("%d You must specify a file name.\n", ERROR + FILE_NOT_FOUND);
return;
}
for (a = 0; !IsEmptyStr(&filename[a]); ++a) {
}
}
snprintf(pathname, sizeof pathname,
- "%s/%s/%s",
- ctdl_file_dir,
- CC->room.QRdirname, filename);
+ "%s/%s/%s",
+ ctdl_file_dir,
+ CC->room.QRdirname, filename
+ );
a = unlink(pathname);
if (a == 0) {
cprintf("%d File '%s' deleted.\n", CIT_OK, pathname);
}
else {
- cprintf("%d File '%s' not found.\n",
- ERROR + FILE_NOT_FOUND, pathname);
+ cprintf("%d File '%s' not found.\n", ERROR + FILE_NOT_FOUND, pathname);
}
}
-
-
/*
* move a file from one room directory to another
*/
if (CtdlAccessCheck(ac_room_aide)) return;
if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
- cprintf("%d No directory in this room.\n",
- ERROR + NOT_HERE);
+ cprintf("%d No directory in this room.\n", ERROR + NOT_HERE);
return;
}
if (IsEmptyStr(filename)) {
- cprintf("%d You must specify a file name.\n",
- ERROR + FILE_NOT_FOUND);
+ cprintf("%d You must specify a file name.\n", ERROR + FILE_NOT_FOUND);
return;
}
filename[a] = '_';
}
}
- snprintf(pathname, sizeof pathname, "./files/%s/%s",
- CC->room.QRdirname, filename);
+ snprintf(pathname, sizeof pathname, "./files/%s/%s", CC->room.QRdirname, filename);
if (access(pathname, 0) != 0) {
- cprintf("%d File '%s' not found.\n",
- ERROR + FILE_NOT_FOUND, pathname);
+ cprintf("%d File '%s' not found.\n", ERROR + FILE_NOT_FOUND, pathname);
return;
}
return;
}
if ((qrbuf.QRflags & QR_DIRECTORY) == 0) {
- cprintf("%d '%s' is not a directory room.\n",
- ERROR + NOT_HERE, qrbuf.QRname);
+ cprintf("%d '%s' is not a directory room.\n", ERROR + NOT_HERE, qrbuf.QRname);
return;
}
- snprintf(newpath, sizeof 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 + INTERNAL_ERROR,
- strerror(errno));
+ cprintf("%d Couldn't move file: %s\n", ERROR + INTERNAL_ERROR, strerror(errno));
return;
}
unlink(pathname);
/* this is a crude method of copying the file description */
- snprintf(buf, sizeof buf,
- "cat ./files/%s/filedir |grep \"%s\" >>./files/%s/filedir",
- CC->room.QRdirname, filename, qrbuf.QRdirname);
+ snprintf(buf, sizeof buf, "cat ./files/%s/filedir |grep \"%s\" >>./files/%s/filedir", CC->room.QRdirname, filename, qrbuf.QRdirname);
system(buf);
cprintf("%d File '%s' has been moved.\n", CIT_OK, filename);
}
filesize = (long) statbuf.st_size;
modtime = (time_t) statbuf.st_mtime;
- cprintf("%d %ld|%ld|%s|%s\n",
- CIT_OK, filesize, (long)modtime, filename, mime_type);
+ cprintf("%d %ld|%ld|%s|%s\n", CIT_OK, filesize, (long)modtime, filename, mime_type);
}
if (CtdlAccessCheck(ac_logged_in)) return;
if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
- cprintf("%d No directory in this room.\n",
- ERROR + NOT_HERE);
+ cprintf("%d No directory in this room.\n", ERROR + NOT_HERE);
return;
}
if (IsEmptyStr(filename)) {
- cprintf("%d You must specify a file name.\n",
- ERROR + FILE_NOT_FOUND);
+ cprintf("%d You must specify a file name.\n", ERROR + FILE_NOT_FOUND);
return;
}
if (strstr(filename, "../") != NULL)
{
- cprintf("%d syntax error.\n",
- ERROR + ILLEGAL_VALUE);
+ cprintf("%d syntax error.\n", ERROR + ILLEGAL_VALUE);
return;
}
if (CC->download_fp != NULL) {
- cprintf("%d You already have a download file open.\n",
- ERROR + RESOURCE_BUSY);
+ cprintf("%d You already have a download file open.\n", ERROR + RESOURCE_BUSY);
return;
}
}
}
- snprintf(pathname, sizeof pathname,
- "%s/%s/%s",
- ctdl_file_dir,
- CC->room.QRdirname, filename);
+ snprintf(pathname, sizeof pathname, "%s/%s/%s", ctdl_file_dir, CC->room.QRdirname, filename);
CC->download_fp = fopen(pathname, "r");
if (CC->download_fp == NULL) {
- cprintf("%d cannot open %s: %s\n",
- ERROR + INTERNAL_ERROR, pathname, strerror(errno));
+ cprintf("%d cannot open %s: %s\n", ERROR + INTERNAL_ERROR, pathname, strerror(errno));
return;
}
OpenCmdResult(filename, "application/octet-stream");
}
+
/*
* open an image file
*/
void cmd_oimg(char *cmdbuf)
{
- char filename[256];
+ char filename[PATH_MAX];
char pathname[PATH_MAX];
char MimeTestBuf[32];
- struct ctdluser usbuf;
- char which_user[USERNAME_SIZE];
- int which_floor;
- int a;
int rv;
extract_token(filename, cmdbuf, 0, '|', sizeof filename);
if (IsEmptyStr(filename)) {
- cprintf("%d You must specify a file name.\n",
- ERROR + FILE_NOT_FOUND);
+ cprintf("%d You must specify a file name.\n", ERROR + FILE_NOT_FOUND);
return;
}
if (CC->download_fp != NULL) {
- cprintf("%d You already have a download file open.\n",
- ERROR + RESOURCE_BUSY);
+ cprintf("%d You already have a download file open.\n", ERROR + RESOURCE_BUSY);
return;
}
- if (!strcasecmp(filename, "_userpic_")) {
- extract_token(which_user, cmdbuf, 1, '|', sizeof which_user);
- if (CtdlGetUser(&usbuf, which_user) != 0) {
- cprintf("%d No such user.\n",
- ERROR + NO_SUCH_USER);
- return;
- }
- snprintf(pathname, sizeof pathname,
- "%s/%ld",
- ctdl_usrpic_dir,
- usbuf.usernum);
- } else if (!strcasecmp(filename, "_floorpic_")) {
- which_floor = extract_int(cmdbuf, 1);
- snprintf(pathname, sizeof pathname,
- "%s/floor.%d",
- ctdl_image_dir, which_floor);
- } else if (!strcasecmp(filename, "_roompic_")) {
- assoc_file_name(pathname, sizeof pathname, &CC->room, ctdl_image_dir);
- } else {
- for (a = 0; !IsEmptyStr(&filename[a]); ++a) {
- filename[a] = tolower(filename[a]);
- if ( (filename[a] == '/') || (filename[a] == '\\') ) {
- filename[a] = '_';
- }
- }
- if (strstr(filename, "../") != NULL)
- {
- cprintf("%d syntax error.\n",
- ERROR + ILLEGAL_VALUE);
- return;
- }
-
- snprintf(pathname, sizeof pathname,
- "%s/%s",
- ctdl_image_dir,
- filename);
- }
-
CC->download_fp = fopen(pathname, "rb");
if (CC->download_fp == NULL) {
strcat(pathname, ".gif");
CC->download_fp = fopen(pathname, "rb");
}
if (CC->download_fp == NULL) {
- cprintf("%d Cannot open %s: %s\n",
- ERROR + FILE_NOT_FOUND, pathname, strerror(errno));
+ cprintf("%d Cannot open %s: %s\n", ERROR + FILE_NOT_FOUND, pathname, strerror(errno));
return;
}
rv = fread(&MimeTestBuf[0], 1, 32, CC->download_fp);
if (rv == -1) {
- cprintf("%d Cannot access %s: %s\n",
- ERROR + FILE_NOT_FOUND, pathname, strerror(errno));
+ cprintf("%d Cannot access %s: %s\n", ERROR + FILE_NOT_FOUND, pathname, strerror(errno));
return;
}
OpenCmdResult(pathname, GuessMimeType(&MimeTestBuf[0], 32));
}
+
/*
* open a file for uploading
*/
if (CtdlAccessCheck(ac_logged_in)) return;
if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
- cprintf("%d No directory in this room.\n",
- ERROR + NOT_HERE);
+ cprintf("%d No directory in this room.\n", ERROR + NOT_HERE);
return;
}
if (IsEmptyStr(CC->upl_file)) {
- cprintf("%d You must specify a file name.\n",
- ERROR + FILE_NOT_FOUND);
+ cprintf("%d You must specify a file name.\n", ERROR + FILE_NOT_FOUND);
return;
}
if (CC->upload_fp != NULL) {
- cprintf("%d You already have a upload file open.\n",
- ERROR + RESOURCE_BUSY);
+ cprintf("%d You already have a upload file open.\n", ERROR + RESOURCE_BUSY);
return;
}
CC->upl_file[a] = '_';
}
}
- snprintf(CC->upl_path, sizeof CC->upl_path,
- "%s/%s/%s",
- ctdl_file_dir,
- CC->room.QRdirname, CC->upl_file);
- snprintf(CC->upl_filedir, sizeof CC->upl_filedir,
- "%s/%s/filedir",
- ctdl_file_dir,
- CC->room.QRdirname);
+ snprintf(CC->upl_path, sizeof CC->upl_path, "%s/%s/%s", ctdl_file_dir, CC->room.QRdirname, CC->upl_file);
+ snprintf(CC->upl_filedir, sizeof CC->upl_filedir, "%s/%s/filedir", ctdl_file_dir, CC->room.QRdirname);
CC->upload_fp = fopen(CC->upl_path, "r");
if (CC->upload_fp != NULL) {
fclose(CC->upload_fp);
CC->upload_fp = NULL;
- cprintf("%d '%s' already exists\n",
- ERROR + ALREADY_EXISTS, CC->upl_path);
+ cprintf("%d '%s' already exists\n", ERROR + ALREADY_EXISTS, CC->upl_path);
return;
}
CC->upload_fp = fopen(CC->upl_path, "wb");
if (CC->upload_fp == NULL) {
- cprintf("%d Cannot open %s: %s\n",
- ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
+ cprintf("%d Cannot open %s: %s\n", ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
return;
}
cprintf("%d Ok\n", CIT_OK);
}
-
/*
* open an image file for uploading
*/
{
int is_this_for_real;
char basenm[256];
- int which_floor;
int a;
if (num_parms(cmdbuf) < 2) {
extract_token(CC->upl_mimetype, cmdbuf, 1, '|', sizeof CC->upl_mimetype);
extract_token(basenm, cmdbuf, 2, '|', sizeof basenm);
if (CC->upload_fp != NULL) {
- cprintf("%d You already have an upload file open.\n",
- ERROR + RESOURCE_BUSY);
+ cprintf("%d You already have an upload file open.\n", ERROR + RESOURCE_BUSY);
return;
}
}
if (CC->user.axlevel >= AxAideU) {
- snprintf(CC->upl_path, sizeof CC->upl_path,
- "%s/%s",
- ctdl_image_dir,
- basenm);
- }
-
- if (!strcasecmp(basenm, "_userpic_")) {
- snprintf(CC->upl_path, sizeof CC->upl_path,
- "%s/%ld.gif",
- ctdl_usrpic_dir,
- CC->user.usernum);
- }
-
- if ((!strcasecmp(basenm, "_floorpic_"))
- && (CC->user.axlevel >= AxAideU)) {
- which_floor = extract_int(cmdbuf, 2);
- snprintf(CC->upl_path, sizeof CC->upl_path,
- "%s/floor.%d.gif",
- ctdl_image_dir,
- which_floor);
- }
-
- if ((!strcasecmp(basenm, "_roompic_")) && (is_room_aide())) {
- assoc_file_name(CC->upl_path, sizeof CC->upl_path, &CC->room, ctdl_image_dir);
+ snprintf(CC->upl_path, sizeof CC->upl_path, "%s/%s", ctdl_image_dir, basenm);
}
if (IsEmptyStr(CC->upl_path)) {
- cprintf("%d Higher access required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
+ cprintf("%d Higher access required.\n", ERROR + HIGHER_ACCESS_REQUIRED);
return;
}
CC->upload_fp = fopen(CC->upl_path, "wb");
if (CC->upload_fp == NULL) {
- cprintf("%d Cannot open %s: %s\n",
- ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
+ cprintf("%d Cannot open %s: %s\n", ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
return;
}
cprintf("%d Ok\n", CIT_OK);
- CC->upload_type = UPL_IMAGE;
}
*/
void cmd_clos(char *cmdbuf)
{
- char buf[256];
-
if (CC->download_fp == NULL) {
- cprintf("%d You don't have a download file open.\n",
- ERROR + RESOURCE_NOT_OPEN);
+ cprintf("%d You don't have a download file open.\n", ERROR + RESOURCE_NOT_OPEN);
return;
}
fclose(CC->download_fp);
CC->download_fp = NULL;
-
- if (CC->dl_is_net == 1) {
- CC->dl_is_net = 0;
- snprintf(buf, sizeof buf,
- "%s/%s",
- ctdl_netout_dir,
- CC->net_node);
- unlink(buf);
- }
-
cprintf("%d Ok\n", CIT_OK);
}
}
-
/*
* close the upload file
*/
void cmd_ucls(char *cmd)
{
FILE *fp;
- char upload_notice[512];
- static int seq = 0;
+ char upload_notice[SIZ];
if (CC->upload_fp == NULL) {
cprintf("%d You don't have an upload file open.\n", ERROR + RESOURCE_NOT_OPEN);
fclose(CC->upload_fp);
CC->upload_fp = NULL;
- if ((!strcasecmp(cmd, "1")) && (CC->upload_type != UPL_FILE)) {
- cprintf("%d Upload completed.\n", CIT_OK);
-
- 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) {
- syslog(LOG_INFO, "UCLS: updoaded %s\n",
- final_filename);
- unlink(CC->upl_path);
- }
- else {
- syslog(LOG_ALERT, "Cannot link %s to %s: %s\n",
- CC->upl_path, final_filename, strerror(errno)
- );
- }
-
-
- /* FIXME ... here we need to trigger a network run */
- }
-
- CC->upload_type = UPL_FILE;
- return;
- }
-
if (!strcasecmp(cmd, "1")) {
cprintf("%d File '%s' saved.\n", CIT_OK, CC->upl_path);
fp = fopen(CC->upl_filedir, "a");
fp = fopen(CC->upl_filedir, "w");
}
if (fp != NULL) {
- fprintf(fp, "%s %s %s\n", CC->upl_file,
- CC->upl_mimetype,
- CC->upl_comment);
+ fprintf(fp, "%s %s %s\n", CC->upl_file, CC->upl_mimetype, CC->upl_comment);
fclose(fp);
}
- /* put together an upload notice */
- snprintf(upload_notice, sizeof upload_notice,
- "NEW UPLOAD: '%s'\n %s\n%s\n",
- CC->upl_file,
- CC->upl_comment,
- CC->upl_mimetype);
- quickie_message(CC->curr_user, NULL, NULL, CC->room.QRname,
- upload_notice, 0, NULL);
+ if ((CC->room.QRflags2 & QR2_NOUPLMSG) == 0) {
+ /* put together an upload notice */
+ snprintf(upload_notice, sizeof upload_notice,
+ "NEW UPLOAD: '%s'\n %s\n%s\n",
+ CC->upl_file,
+ CC->upl_comment,
+ CC->upl_mimetype
+ );
+ quickie_message(CC->curr_user, NULL, NULL, CC->room.QRname, upload_notice, 0, NULL);
+ }
} else {
abort_upl(CC);
cprintf("%d File '%s' aborted.\n", CIT_OK, CC->upl_path);
}
if (CC->download_fp == NULL) {
- cprintf("%d You don't have a download file open.\n",
- ERROR + RESOURCE_NOT_OPEN);
+ cprintf("%d You don't have a download file open.\n", ERROR + RESOURCE_NOT_OPEN);
return;
}
rc = fseek(CC->download_fp, start_pos, 0);
if (rc < 0) {
- cprintf("%d your file is smaller then %ld.\n", ERROR + ILLEGAL_VALUE, start_pos);
- syslog(LOG_ALERT, "your file %s is smaller then %ld. [%s]\n",
- CC->upl_path,
- start_pos,
- strerror(errno));
+ cprintf("%d your file is smaller than %ld.\n", ERROR + ILLEGAL_VALUE, start_pos);
+ syslog(LOG_ERR, "serv_file: your file %s is smaller than %ld [%s]",
+ CC->upl_path,
+ start_pos,
+ strerror(errno)
+ );
return;
}
*/
void cmd_writ(char *cmdbuf)
{
+ struct CitContext *CCC = CC;
int bytes;
char *buf;
int rv;
bytes = extract_int(cmdbuf, 0);
- if (CC->upload_fp == NULL) {
+ if (CCC->upload_fp == NULL) {
cprintf("%d You don't have an upload file open.\n", ERROR + RESOURCE_NOT_OPEN);
return;
}
cprintf("%d %d\n", SEND_BINARY, bytes);
buf = malloc(bytes + 1);
client_read(buf, bytes);
- rv = fwrite(buf, bytes, 1, CC->upload_fp);
+ rv = fwrite(buf, bytes, 1, CCC->upload_fp);
if (rv == -1) {
- syslog(LOG_EMERG, "Couldn't write: %s\n",
- strerror(errno));
+ syslog(LOG_ERR, "serv_file: %s", strerror(errno));
}
free(buf);
}
-
-
-/*
- * cmd_ndop() - open a network spool file for downloading
- */
-void cmd_ndop(char *cmdbuf)
-{
- char pathname[256];
- struct stat statbuf;
-
- if (IsEmptyStr(CC->net_node)) {
- cprintf("%d Not authenticated as a network node.\n",
- ERROR + NOT_LOGGED_IN);
- return;
- }
-
- if (CC->download_fp != NULL) {
- cprintf("%d You already have a download file open.\n",
- ERROR + RESOURCE_BUSY);
- return;
- }
-
- snprintf(pathname, sizeof pathname,
- "%s/%s",
- ctdl_netout_dir,
- CC->net_node);
-
- /* first open the file in append mode in order to create a
- * zero-length file if it doesn't already exist
- */
- CC->download_fp = fopen(pathname, "a");
- if (CC->download_fp != NULL)
- fclose(CC->download_fp);
-
- /* now open it */
- CC->download_fp = fopen(pathname, "r");
- if (CC->download_fp == NULL) {
- cprintf("%d cannot open %s: %s\n",
- ERROR + INTERNAL_ERROR, pathname, strerror(errno));
- return;
- }
-
-
- /* set this flag so other routines know that the download file
- * currently open is a network spool file
- */
- 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);
-}
-
-/*
- * cmd_nuop() - open a network spool file for uploading
- */
-void cmd_nuop(char *cmdbuf)
-{
- static int seq = 1;
-
- if (IsEmptyStr(CC->net_node)) {
- cprintf("%d Not authenticated as a network node.\n",
- ERROR + NOT_LOGGED_IN);
- return;
- }
-
- if (CC->upload_fp != NULL) {
- cprintf("%d You already have an upload file open.\n",
- ERROR + RESOURCE_BUSY);
- return;
- }
-
- snprintf(CC->upl_path, sizeof CC->upl_path,
- "%s/%s.%04lx.%04x",
- ctdl_nettmp_dir,
- CC->net_node,
- (long)getpid(),
- ++seq);
-
- CC->upload_fp = fopen(CC->upl_path, "r");
- if (CC->upload_fp != NULL) {
- fclose(CC->upload_fp);
- CC->upload_fp = NULL;
- cprintf("%d '%s' already exists\n",
- ERROR + ALREADY_EXISTS, CC->upl_path);
- return;
- }
-
- CC->upload_fp = fopen(CC->upl_path, "w");
- if (CC->upload_fp == NULL) {
- cprintf("%d Cannot open %s: %s\n",
- ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
- return;
- }
-
- CC->upload_type = UPL_NET;
- cprintf("%d Ok\n", CIT_OK);
-}
void files_logout_hook(void)
{
CitContext *CCC = MyContext();
}
+
/*
* help_subst() - support routine for help file viewer
*/
}
}
+
void do_help_subst(char *buffer)
{
char buf2[16];
- help_subst(buffer, "^nodename", config.c_nodename);
- help_subst(buffer, "^humannode", config.c_humannode);
- help_subst(buffer, "^fqdn", config.c_fqdn);
+ help_subst(buffer, "^nodename", CtdlGetConfigStr("c_nodename"));
+ help_subst(buffer, "^humannode", CtdlGetConfigStr("c_humannode"));
+ help_subst(buffer, "^fqdn", CtdlGetConfigStr("c_fqdn"));
help_subst(buffer, "^username", CC->user.fullname);
snprintf(buf2, sizeof buf2, "%ld", CC->user.usernum);
help_subst(buffer, "^usernum", buf2);
- help_subst(buffer, "^sysadm", config.c_sysadm);
+ help_subst(buffer, "^sysadm", CtdlGetConfigStr("c_sysadm"));
help_subst(buffer, "^variantname", CITADEL);
- snprintf(buf2, sizeof buf2, "%d", config.c_maxsessions);
- help_subst(buffer, "^maxsessions", buf2);
+ help_subst(buffer, "^maxsessions", CtdlGetConfigStr("c_maxsessions")); // yes it's numeric but str is ok here
help_subst(buffer, "^bbsdir", ctdl_message_dir);
}
char targ[256];
char buf[256];
char buf2[256];
- char *dirs[2];
DIR *dp;
struct dirent *d;
extract_token(buf, mname, 0, '|', sizeof buf);
- dirs[0] = strdup(ctdl_message_dir);
- dirs[1] = strdup(ctdl_hlp_dir);
-
- snprintf(buf2, sizeof buf2, "%s.%d.%d",
- buf, CC->cs_clientdev, CC->cs_clienttyp);
+ snprintf(buf2, sizeof buf2, "%s.%d.%d", buf, CC->cs_clientdev, CC->cs_clienttyp);
/* If the client requested "?" then produce a listing */
if (!strcmp(buf, "?")) {
cprintf("%d %s\n", LISTING_FOLLOWS, buf);
- dp = opendir(dirs[1]);
+ dp = opendir(ctdl_message_dir);
if (dp != NULL) {
while (d = readdir(dp), d != NULL) {
if (d->d_name[0] != '.') {
closedir(dp);
}
cprintf("000\n");
- free(dirs[0]);
- free(dirs[1]);
return;
}
/* Otherwise, look for the requested file by name. */
- else {
- mesg_locate(targ, sizeof targ, buf2, 2, (const ccharp*)dirs);
- if (IsEmptyStr(targ)) {
- snprintf(buf2, sizeof buf2, "%s.%d",
- buf, CC->cs_clientdev);
- mesg_locate(targ, sizeof targ, buf2, 2,
- (const ccharp*)dirs);
- if (IsEmptyStr(targ)) {
- mesg_locate(targ, sizeof targ, buf, 2,
- (const ccharp*)dirs);
- }
- }
- }
-
- free(dirs[0]);
- free(dirs[1]);
-
- if (IsEmptyStr(targ)) {
- cprintf("%d '%s' not found. (Searching in %s and %s)\n",
- ERROR + FILE_NOT_FOUND,
- mname,
- ctdl_message_dir,
- ctdl_hlp_dir
- );
- return;
- }
-
+ snprintf(targ, sizeof targ, "%s/%s", ctdl_message_dir, buf);
mfp = fopen(targ, "r");
if (mfp==NULL) {
cprintf("%d Cannot open '%s': %s\n",
- ERROR + INTERNAL_ERROR, targ, strerror(errno));
+ ERROR + FILE_NOT_FOUND, targ, strerror(errno));
return;
}
- cprintf("%d %s\n", LISTING_FOLLOWS,buf);
+ cprintf("%d %s\n", LISTING_FOLLOWS, buf);
while (fgets(buf, (sizeof buf - 1), mfp) != NULL) {
buf[strlen(buf)-1] = 0;
FILE *mfp;
char targ[256];
char buf[256];
- char *dirs[2];
int a;
unbuffer_output();
if (buf[a] == '/') buf[a] = '.';
}
- dirs[0] = strdup(ctdl_message_dir);
- dirs[1] = strdup(ctdl_hlp_dir);
-
- mesg_locate(targ, sizeof targ, buf, 2, (const ccharp*)dirs);
- free(dirs[0]);
- free(dirs[1]);
-
if (IsEmptyStr(targ)) {
- snprintf(targ, sizeof targ,
- "%s/%s",
- ctdl_hlp_dir, buf);
+ snprintf(targ, sizeof targ, "%s/%s", ctdl_message_dir, buf);
}
- mfp = fopen(targ,"w");
+ mfp = fopen(targ, "w");
if (mfp==NULL) {
cprintf("%d Cannot open '%s': %s\n",
ERROR + INTERNAL_ERROR, targ, strerror(errno));
{
if (!threading) {
CtdlRegisterSessionHook(files_logout_hook, EVT_LOGOUT, PRIO_LOGOUT + 8);
-
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_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");
-
CtdlRegisterProtoHook(cmd_mesg, "MESG", "fetch system banners");
CtdlRegisterProtoHook(cmd_emsg, "EMSG", "submit system banners");
}