X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fimage%2Fserv_image.c;h=cec7206779dd2a52238820f424ce76dae9eef0f3;hp=a33143f574b3ad2c69afb35bad3dcfe6e9478eed;hb=b5c457f32fc0d890d24f334d9dcce7987e09885c;hpb=cc59e39d5b6a470861fb49ca0a494bad31c4911b

diff --git a/citadel/modules/image/serv_image.c b/citadel/modules/image/serv_image.c
index a33143f57..cec720677 100644
--- a/citadel/modules/image/serv_image.c
+++ b/citadel/modules/image/serv_image.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -14,13 +14,11 @@
 
 #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.
@@ -35,7 +33,7 @@ void cmd_dlri(char *cmdbuf)
 
 	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);
@@ -279,7 +277,6 @@ 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;
@@ -289,18 +286,11 @@ void import_old_userpic_files(void)
 
 
 	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;
@@ -351,7 +341,6 @@ void import_old_userpic_files(void)
 			}
 		}
 	}
-	free(d);
 	closedir(filedir);
 	rmdir(ctdl_usrpic_dir);
 }