*
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#endif
#include <limits.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
-#include "serv_extensions.h"
#include "config.h"
#include "file_ops.h"
#include "sysdep_decls.h"
#include "support.h"
#include "room_ops.h"
#include "msgbase.h"
-#include "tools.h"
#include "citserver.h"
+#include "threads.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
switch(operation) {
case NTT_ADD:
- if (nttlist == NULL) nttlist = strdoop("");
+ if (nttlist == NULL) nttlist = strdup("");
if (nttlist == NULL) break;
- nttlist = (char *)reallok(nttlist,
+ nttlist = (char *)realloc(nttlist,
(strlen(nttlist) + strlen(nodename) + 3) );
strcat(nttlist, "|");
strcat(nttlist, nodename);
case NTT_REMOVE:
if (nttlist == NULL) break;
- if (strlen(nttlist) == 0) break;
- ptr = mallok(strlen(nttlist));
+ if (IsEmptyStr(nttlist)) break;
+ ptr = malloc(strlen(nttlist));
if (ptr == NULL) break;
strcpy(ptr, "");
for (i = 0; i < num_tokens(nttlist, '|'); ++i) {
- extract(buf, nttlist, i);
- if ( (strlen(buf) > 0)
+ extract_token(buf, nttlist, i, '|', sizeof buf);
+ if ( (!IsEmptyStr(buf))
&& (strcasecmp(buf, nodename)) ) {
strcat(ptr, buf);
strcat(ptr, "|");
}
}
- phree(nttlist);
+ free(nttlist);
nttlist = ptr;
break;
case NTT_CHECK:
if (nttlist == NULL) break;
- if (strlen(nttlist) == 0) break;
+ if (IsEmptyStr(nttlist)) break;
for (i = 0; i < num_tokens(nttlist, '|'); ++i) {
- extract(buf, nttlist, i);
+ extract_token(buf, nttlist, i, '|', sizeof buf);
if (!strcasecmp(buf, nodename)) ++retval;
}
break;
}
- if (nttlist != NULL) lprintf(9, "nttlist=<%s>\n", nttlist);
+ if (nttlist != NULL) lprintf(CTDL_DEBUG, "nttlist=<%s>\n", nttlist);
end_critical_section(S_NTTLIST);
return(retval);
}
return;
}
- if (strlen(filename) == 0) {
+ if (IsEmptyStr(filename)) {
cprintf("%d You must specify a file name.\n",
ERROR + FILE_NOT_FOUND);
return;
}
- for (a = 0; a < strlen(filename); ++a) {
+ for (a = 0; !IsEmptyStr(&filename[a]); ++a) {
if (filename[a] == '/') {
filename[a] = '_';
}
}
- snprintf(pathname, sizeof pathname, "./files/%s/%s",
- CC->room.QRdirname, filename);
+ snprintf(pathname, sizeof pathname,
+ "%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);
*/
void cmd_movf(char *cmdbuf)
{
- char filename[SIZ];
- char pathname[SIZ];
- char newpath[SIZ];
- char newroom[SIZ];
- char buf[SIZ];
+ char filename[PATH_MAX];
+ char pathname[PATH_MAX];
+ char newpath[PATH_MAX];
+ char newroom[ROOMNAMELEN];
+ char buf[PATH_MAX];
int a;
struct ctdlroom qrbuf;
- extract(filename, cmdbuf, 0);
- extract(newroom, cmdbuf, 1);
+ extract_token(filename, cmdbuf, 0, '|', sizeof filename);
+ extract_token(newroom, cmdbuf, 1, '|', sizeof newroom);
if (CtdlAccessCheck(ac_room_aide)) return;
return;
}
- if (strlen(filename) == 0) {
+ if (IsEmptyStr(filename)) {
cprintf("%d You must specify a file name.\n",
ERROR + FILE_NOT_FOUND);
return;
}
- for (a = 0; a < strlen(filename); ++a) {
+ for (a = 0; !IsEmptyStr(&filename[a]); ++a) {
if (filename[a] == '/') {
filename[a] = '_';
}
}
if (getroom(&qrbuf, newroom) != 0) {
- cprintf("%d '%s' does not exist.\n", ERROR, newroom);
+ cprintf("%d '%s' does not exist.\n", ERROR + ROOM_NOT_FOUND, newroom);
return;
}
if ((qrbuf.QRflags & QR_DIRECTORY) == 0) {
snprintf(newpath, sizeof newpath, "./files/%s/%s", qrbuf.QRdirname,
filename);
if (link(pathname, newpath) != 0) {
- cprintf("%d Couldn't move file: %s\n", ERROR,
+ cprintf("%d Couldn't move file: %s\n", ERROR + INTERNAL_ERROR,
strerror(errno));
return;
}
/* this is a crude method of copying the file description */
snprintf(buf, sizeof buf,
- "cat ./files/%s/filedir |grep %s >>./files/%s/filedir",
+ "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);
*/
void cmd_netf(char *cmdbuf)
{
- char pathname[SIZ], filename[SIZ], destsys[SIZ], buf[SIZ];
- char outfile[SIZ];
+ char pathname[256], filename[256], destsys[256], buf[256];
+ char outfile[256];
int a, e;
time_t now;
FILE *ofp;
static int seq = 1;
- extract(filename, cmdbuf, 0);
- extract(destsys, cmdbuf, 1);
+ extract_token(filename, cmdbuf, 0, '|', sizeof filename);
+ extract_token(destsys, cmdbuf, 1, '|', sizeof destsys);
if (CtdlAccessCheck(ac_room_aide)) return;
return;
}
- if (strlen(filename) == 0) {
+ if (IsEmptyStr(filename)) {
cprintf("%d You must specify a file name.\n",
ERROR + FILE_NOT_FOUND);
return;
}
- for (a = 0; a < strlen(filename); ++a) {
+ for (a = 0; !IsEmptyStr(&filename[a]); ++a) {
if (filename[a] == '/') {
filename[a] = '_';
}
return;
}
snprintf(outfile, sizeof outfile,
- "%s/network/spoolin/nsf.%04lx.%04x",
- BBSDIR, (long)getpid(), ++seq);
+ "%s/nsf.%04lx.%04x",
+ ctdl_netin_dir,
+ (long)getpid(), ++seq);
ofp = fopen(outfile, "a");
if (ofp == NULL) {
- cprintf("%d internal error\n", ERROR);
+ cprintf("%d internal error\n", ERROR + INTERNAL_ERROR);
return;
}
putc(255, ofp);
putc(MES_NORMAL, ofp);
putc(0, ofp);
- fprintf(ofp, "Pcit%ld", CC->user.usernum);
+ fprintf(ofp, "P%s", CC->user.fullname);
putc(0, ofp);
time(&now);
fprintf(ofp, "T%ld", (long) now);
fclose(ofp);
snprintf(buf, sizeof buf,
- "cd ./files/%s; uuencode %s <%s 2>/dev/null >>%s",
- CC->room.QRdirname, filename, filename, outfile);
+ "cd %s/%s; uuencode %s <%s 2>/dev/null >>%s",
+ ctdl_file_dir,
+ /* FIXME: detect uuencode while installation? or inline */
+ CC->room.QRdirname, filename, filename, outfile);
system(buf);
ofp = fopen(outfile, "a");
*/
void cmd_open(char *cmdbuf)
{
- char filename[SIZ];
- char pathname[SIZ];
+ char filename[256];
+ char pathname[PATH_MAX];
int a;
- extract(filename, cmdbuf, 0);
+ extract_token(filename, cmdbuf, 0, '|', sizeof filename);
if (CtdlAccessCheck(ac_logged_in)) return;
return;
}
- if (strlen(filename) == 0) {
+ if (IsEmptyStr(filename)) {
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);
+ ERROR + RESOURCE_BUSY);
return;
}
- for (a = 0; a < strlen(filename); ++a) {
+ for (a = 0; !IsEmptyStr(&filename[a]); ++a) {
if (filename[a] == '/') {
filename[a] = '_';
}
}
snprintf(pathname, sizeof pathname,
- "./files/%s/%s", CC->room.QRdirname, filename);
+ "%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, pathname, strerror(errno));
+ ERROR + INTERNAL_ERROR, pathname, strerror(errno));
return;
}
*/
void cmd_oimg(char *cmdbuf)
{
- char filename[SIZ];
- char pathname[SIZ];
+ char filename[256];
+ char pathname[PATH_MAX];
struct ctdluser usbuf;
char which_user[USERNAME_SIZE];
int which_floor;
int a;
- extract(filename, cmdbuf, 0);
+ extract_token(filename, cmdbuf, 0, '|', sizeof filename);
- if (strlen(filename) == 0) {
+ if (IsEmptyStr(filename)) {
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);
+ ERROR + RESOURCE_BUSY);
return;
}
if (!strcasecmp(filename, "_userpic_")) {
- extract(which_user, cmdbuf, 1);
+ extract_token(which_user, cmdbuf, 1, '|', sizeof which_user);
if (getuser(&usbuf, which_user) != 0) {
cprintf("%d No such user.\n",
ERROR + NO_SUCH_USER);
return;
}
- snprintf(pathname, sizeof pathname, "./userpics/%ld.gif",
- usbuf.usernum);
+ snprintf(pathname, sizeof pathname,
+ "%s/%ld.gif",
+ ctdl_usrpic_dir,
+ usbuf.usernum);
} else if (!strcasecmp(filename, "_floorpic_")) {
which_floor = extract_int(cmdbuf, 1);
snprintf(pathname, sizeof pathname,
- "./images/floor.%d.gif", which_floor);
+ "%s/floor.%d.gif",
+ ctdl_image_dir, which_floor);
} else if (!strcasecmp(filename, "_roompic_")) {
- assoc_file_name(pathname, sizeof pathname, &CC->room, "images");
+ assoc_file_name(pathname, sizeof pathname, &CC->room, ctdl_image_dir);
} else {
- for (a = 0; a < strlen(filename); ++a) {
+ for (a = 0; !IsEmptyStr(&filename[a]); ++a) {
filename[a] = tolower(filename[a]);
if (filename[a] == '/') {
filename[a] = '_';
}
}
- snprintf(pathname, sizeof pathname, "./images/%s.gif",
- filename);
+ snprintf(pathname, sizeof pathname,
+ "%s/%s.gif",
+ ctdl_image_dir,
+ filename);
}
CC->download_fp = fopen(pathname, "rb");
{
int a;
- extract(CC->upl_file, cmdbuf, 0);
- extract(CC->upl_comment, cmdbuf, 1);
+ extract_token(CC->upl_file, cmdbuf, 0, '|', sizeof CC->upl_file);
+ extract_token(CC->upl_comment, cmdbuf, 1, '|', sizeof CC->upl_comment);
if (CtdlAccessCheck(ac_logged_in)) return;
return;
}
- if (strlen(CC->upl_file) == 0) {
+ if (IsEmptyStr(CC->upl_file)) {
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);
+ ERROR + RESOURCE_BUSY);
return;
}
- for (a = 0; a < strlen(CC->upl_file); ++a) {
+ for (a = 0; !IsEmptyStr(&CC->upl_file[a]); ++a) {
if (CC->upl_file[a] == '/') {
CC->upl_file[a] = '_';
}
}
- snprintf(CC->upl_path, sizeof CC->upl_path, "./files/%s/%s",
- CC->room.QRdirname, CC->upl_file);
+ 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,
- "./files/%s/filedir", CC->room.QRdirname);
+ "%s/%s/filedir",
+ ctdl_file_dir,
+ CC->room.QRdirname);
CC->upload_fp = fopen(CC->upl_path, "r");
if (CC->upload_fp != NULL) {
CC->upload_fp = fopen(CC->upl_path, "wb");
if (CC->upload_fp == NULL) {
cprintf("%d Cannot open %s: %s\n",
- ERROR, CC->upl_path, strerror(errno));
+ ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
return;
}
cprintf("%d Ok\n", CIT_OK);
void cmd_uimg(char *cmdbuf)
{
int is_this_for_real;
- char basenm[SIZ];
+ char basenm[256];
int which_floor;
int a;
if (num_parms(cmdbuf) < 2) {
- cprintf("%d Usage error.\n", ERROR);
+ cprintf("%d Usage error.\n", ERROR + ILLEGAL_VALUE);
return;
}
is_this_for_real = extract_int(cmdbuf, 0);
- extract(basenm, cmdbuf, 1);
+ extract_token(basenm, cmdbuf, 1, '|', sizeof basenm);
if (CC->upload_fp != NULL) {
cprintf("%d You already have an upload file open.\n",
- ERROR);
+ ERROR + RESOURCE_BUSY);
return;
}
strcpy(CC->upl_path, "");
- for (a = 0; a < strlen(basenm); ++a) {
+ for (a = 0; !IsEmptyStr(&basenm[a]); ++a) {
basenm[a] = tolower(basenm[a]);
if (basenm[a] == '/') {
basenm[a] = '_';
}
if (CC->user.axlevel >= 6) {
- snprintf(CC->upl_path, sizeof CC->upl_path, "./images/%s",
- basenm);
+ 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,
- "./userpics/%ld.gif", CC->user.usernum);
+ "%s/%ld.gif",
+ ctdl_usrpic_dir,
+ CC->user.usernum);
}
if ((!strcasecmp(basenm, "_floorpic_"))
&& (CC->user.axlevel >= 6)) {
which_floor = extract_int(cmdbuf, 2);
snprintf(CC->upl_path, sizeof CC->upl_path,
- "./images/floor.%d.gif", which_floor);
+ "%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, "images");
+ assoc_file_name(CC->upl_path, sizeof CC->upl_path, &CC->room, ctdl_image_dir);
}
- if (strlen(CC->upl_path) == 0) {
+ if (IsEmptyStr(CC->upl_path)) {
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, CC->upl_path, strerror(errno));
+ ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
return;
}
cprintf("%d Ok\n", CIT_OK);
*/
void cmd_clos(void)
{
- char buf[SIZ];
+ char buf[256];
if (CC->download_fp == NULL) {
cprintf("%d You don't have a download file open.\n",
- ERROR);
+ ERROR + RESOURCE_NOT_OPEN);
return;
}
if (CC->dl_is_net == 1) {
CC->dl_is_net = 0;
- snprintf(buf, sizeof buf, "%s/network/spoolout/%s", BBSDIR,
- CC->net_node);
+ snprintf(buf, sizeof buf,
+ "%s/%s",
+ ctdl_netout_dir,
+ CC->net_node);
unlink(buf);
}
char upload_notice[512];
if (CC->upload_fp == NULL) {
- cprintf("%d You don't have an upload file open.\n", ERROR);
+ cprintf("%d You don't have an upload file open.\n", ERROR + RESOURCE_NOT_OPEN);
return;
}
snprintf(upload_notice, sizeof upload_notice,
"NEW UPLOAD: '%s'\n %s\n",
CC->upl_file, CC->upl_comment);
- quickie_message(CC->curr_user, NULL, CC->room.QRname,
+ quickie_message(CC->curr_user, NULL, NULL, CC->room.QRname,
upload_notice, 0, NULL);
} else {
abort_upl(CC);
long start_pos;
size_t bytes;
size_t actual_bytes;
- char buf[4096];
+ char *buf = NULL;
start_pos = extract_long(cmdbuf, 0);
bytes = extract_int(cmdbuf, 1);
if (CC->download_fp == NULL) {
cprintf("%d You don't have a download file open.\n",
- ERROR);
+ ERROR + RESOURCE_NOT_OPEN);
return;
}
- if (bytes > 4096) bytes = 4096;
+ 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);
}
void cmd_writ(char *cmdbuf)
{
int bytes;
- char buf[4096];
+ char *buf;
+
+ unbuffer_output();
bytes = extract_int(cmdbuf, 0);
if (CC->upload_fp == NULL) {
- cprintf("%d You don't have an upload file open.\n", ERROR);
+ cprintf("%d You don't have an upload file open.\n", ERROR + RESOURCE_NOT_OPEN);
return;
}
- if (bytes > 4096) {
- cprintf("%d You may not write more than 4096 bytes.\n",
- ERROR);
+ if (bytes > 100000) {
+ cprintf("%d You may not write more than 100000 bytes.\n",
+ ERROR + TOO_BIG);
return;
}
cprintf("%d %d\n", SEND_BINARY, bytes);
+ buf = malloc(bytes + 1);
client_read(buf, bytes);
fwrite(buf, bytes, 1, CC->upload_fp);
+ free(buf);
}
*/
void cmd_ndop(char *cmdbuf)
{
- char pathname[SIZ];
+ char pathname[256];
struct stat statbuf;
- if (strlen(CC->net_node) == 0) {
+ 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);
+ ERROR + RESOURCE_BUSY);
return;
}
- snprintf(pathname, sizeof pathname, "%s/network/spoolout/%s",
- BBSDIR, CC->net_node);
+ 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, "r");
if (CC->download_fp == NULL) {
cprintf("%d cannot open %s: %s\n",
- ERROR, pathname, strerror(errno));
+ ERROR + INTERNAL_ERROR, pathname, strerror(errno));
return;
}
{
static int seq = 1;
- if (strlen(CC->net_node) == 0) {
+ 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);
+ ERROR + RESOURCE_BUSY);
return;
}
snprintf(CC->upl_path, sizeof CC->upl_path,
- "%s/network/spoolin/%s.%04lx.%04x",
- BBSDIR, CC->net_node, (long)getpid(), ++seq);
+ "%s/%s.%04lx.%04x",
+ ctdl_netin_dir,
+ CC->net_node,
+ (long)getpid(),
+ ++seq);
CC->upload_fp = fopen(CC->upl_path, "r");
if (CC->upload_fp != NULL) {
CC->upload_fp = fopen(CC->upl_path, "w");
if (CC->upload_fp == NULL) {
cprintf("%d Cannot open %s: %s\n",
- ERROR, CC->upl_path, strerror(errno));
+ ERROR + INTERNAL_ERROR, CC->upl_path, strerror(errno));
return;
}
projects / citadel.git / blobdiff