/*
- * Copyright (c) 1987-2016 by the citadel.org team
+ * 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 as published by
#include "ctdl_module.h"
#include "config.h"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
-
/*
* DownLoad Room Image (see its icon or whatever)
* If this command succeeds, it follows the same protocol as the DLAT command.
struct CtdlMessage *msg = CtdlFetchMessage(CC->room.msgnum_pic, 1, 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);
{
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);
}