/*
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2021 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 as published by
* DownLoad Room Image (see its icon or whatever)
* If this command succeeds, it follows the same protocol as the DLAT command.
*/
-void cmd_dlri(char *cmdbuf)
-{
+void cmd_dlri(char *cmdbuf) {
if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
if (CC->room.msgnum_pic < 1) {
cprintf("%d No image found.\n", ERROR + FILE_NOT_FOUND);
return;
}
- struct CtdlMessage *msg = CtdlFetchMessage(CC->room.msgnum_pic, 1, 1);
+ struct CtdlMessage *msg = CtdlFetchMessage(CC->room.msgnum_pic, 1);
if (msg != NULL) {
- // The call to CtdlOutputPreLoadedMsg() with MT_SPEW_SECTION will cause the DLUI command
+ // The call to CtdlOutputPreLoadedMsg() with MT_SPEW_SECTION will cause the DLRI command
// to have the same output format as the DLAT command, because it calls the same code.
// For example: 600 402132|-1||image/gif|
safestrncpy(CC->download_desired_section, "1", sizeof CC->download_desired_section);
/*
* UpLoad Room Image (avatar or photo or whatever)
*/
-void cmd_ulri(char *cmdbuf)
-{
+void cmd_ulri(char *cmdbuf) {
long data_length;
char mimetype[SIZ];
* DownLoad User Image (see their avatar or photo or whatever)
* If this command succeeds, it follows the same protocol as the DLAT command.
*/
-void cmd_dlui(char *cmdbuf)
-{
+void cmd_dlui(char *cmdbuf) {
struct ctdluser ruser;
char buf[SIZ];
return;
}
- struct CtdlMessage *msg = CtdlFetchMessage(ruser.msgnum_pic, 1, 1);
+ struct CtdlMessage *msg = CtdlFetchMessage(ruser.msgnum_pic, 1);
if (msg != NULL) {
// The call to CtdlOutputPreLoadedMsg() with MT_SPEW_SECTION will cause the DLUI command
// to have the same output format as the DLAT command, because it calls the same code.
/*
* UpLoad User Image (avatar or photo or whatever)
*/
-void cmd_ului(char *cmdbuf)
-{
+void cmd_ului(char *cmdbuf) {
long data_length;
char mimetype[SIZ];
char username[USERNAME_SIZE];
if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
- if (num_parms(cmdbuf) < 2)
- {
+ if (num_parms(cmdbuf) < 2) {
cprintf("%d Usage error\n", ERROR + ILLEGAL_VALUE);
return;
}
/*
* Import function called by import_old_userpic_files() for a single user
*/
-void import_one_userpic_file(char *username, long usernum, char *path)
-{
+void import_one_userpic_file(char *username, long usernum, char *path) {
syslog(LOG_DEBUG, "Import legacy userpic for %s, usernum=%ld, filename=%s", username, usernum, path);
FILE *fp = fopen(path, "r");
/*
* Look for old-format "userpic" files and import them into the message base
*/
-void import_old_userpic_files(void)
-{
+void import_old_userpic_files(void) {
DIR *filedir = NULL;
struct dirent *filedir_entry;
- struct dirent *d;
size_t d_namelen;
struct ctdluser usbuf;
long usernum = 0;
syslog(LOG_DEBUG, "Importing old style userpic files into the message base");
- d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 2);
- if (d == NULL) {
- return;
- }
-
filedir = opendir (ctdl_usrpic_dir);
if (filedir == NULL) {
- free(d);
return;
}
- while ((readdir_r(filedir, d, &filedir_entry) == 0) &&
- (filedir_entry != NULL))
+ while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL))
{
#ifdef _DIRENT_HAVE_D_NAMLEN
d_namelen = filedir_entry->d_namlen;
}
}
}
- free(d);
closedir(filedir);
rmdir(ctdl_usrpic_dir);
}