#include <limits.h>
#include "citadel.h"
#include "server.h"
-#include "serv_extensions.h"
#include "config.h"
#include "file_ops.h"
#include "sysdep_decls.h"
case NTT_REMOVE:
if (nttlist == NULL) break;
- if (strlen(nttlist) == 0) break;
+ if (IsEmptyStr(nttlist)) break;
ptr = malloc(strlen(nttlist));
if (ptr == NULL) break;
strcpy(ptr, "");
for (i = 0; i < num_tokens(nttlist, '|'); ++i) {
extract_token(buf, nttlist, i, '|', sizeof buf);
- if ( (strlen(buf) > 0)
+ if ( (!IsEmptyStr(buf))
&& (strcasecmp(buf, nodename)) ) {
strcat(ptr, buf);
strcat(ptr, "|");
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_token(buf, nttlist, i, '|', sizeof buf);
if (!strcasecmp(buf, nodename)) ++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] = '_';
}
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;
}
- 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] = '_';
}
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);
return;
}
- if (strlen(filename) == 0) {
+ if (IsEmptyStr(filename)) {
cprintf("%d You must specify a file name.\n",
ERROR + FILE_NOT_FOUND);
return;
return;
}
- for (a = 0; a < strlen(filename); ++a) {
+ for (a = 0; !IsEmptyStr(&filename[a]); ++a) {
if (filename[a] == '/') {
filename[a] = '_';
}
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;
"%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] = '_';
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;
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] = '_';
}
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 ((!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;
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);
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;
{
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;