1 files changed, 29 insertions, 8 deletions

diff --git a/FICS/adminproc.c b/FICS/adminproc.c
index 04331a4..cca1a89 100644
--- a/FICS/adminproc.c
+++ b/FICS/adminproc.c
@@ -19,6 +19,10 @@
 #include <sys/param.h>
 
 #include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <stdint.h>
 
 #include "adminproc.h"
 #include "command.h"
@@ -171,6 +175,7 @@ create_news_file(int p, param_list param, int admin)
 {
 	FILE	*fp;
 	char	 filename[MAX_FILENAME_SIZE] = { '\0' };
+	int	 fd;
 
 	ASSERT(parray[p].adminLevel >= ADMIN_ADMIN);
 
@@ -183,10 +188,14 @@ create_news_file(int p, param_list param, int admin)
 			msnprintf(filename, sizeof filename, "%s/adminnews.%d",
 			    news_dir,
 			    param[0].val.integer);
-			if ((fp = fopen(filename, "w")) != NULL) {
+			fd = open(filename, O_WRONLY|O_CREAT, S_IWUSR|S_IRUSR);
+			if (fd < 0)
+				return COM_FAILED;
+			else if ((fp = fdopen(fd, "w")) != NULL) {
 				fprintf(fp, "%s\n", param[1].val.string);
 				fclose(fp);
-			}
+			} else
+				close(fd);
 		}
 	} else {
 		if (param[0].val.integer > num_news) {
@@ -196,10 +205,14 @@ create_news_file(int p, param_list param, int admin)
 			msnprintf(filename, sizeof filename, "%s/news.%d",
 			    news_dir,
 			    param[0].val.integer);
-			if ((fp = fopen(filename, "w")) != NULL) {
+			fd = open(filename, O_WRONLY|O_CREAT, S_IWUSR|S_IRUSR);
+			if (fd < 0)
+				return COM_FAILED;
+			else if ((fp = fdopen(fd, "w")) != NULL) {
 				fprintf(fp, "%s\n", param[1].val.string);
 				fclose(fp);
-			}
+			} else
+				close(fd);
 		}
 	}
 
@@ -212,11 +225,19 @@ add_item(char *new_item, char *filename)
 	FILE	*new_fp, *old_fp;
 	char	 junk[MAX_LINE_SIZE] = { '\0' };
 	char	 tmp_file[MAX_FILENAME_SIZE] = { '\0' };
+	int	 fd;
 
 	msnprintf(tmp_file, sizeof tmp_file, "%s/.tmp.idx", news_dir);
 
-	if ((new_fp = fopen(tmp_file, "w")) == NULL)
+	fd = open(tmp_file, O_WRONLY|O_CREAT, S_IWUSR|S_IRUSR);
+
+	if (fd < 0)
+		return 0;
+	else if ((new_fp = fdopen(fd, "w")) == NULL) {
+		close(fd);
 		return 0;
+	}
+
 	fprintf(new_fp, "%s", new_item);
 
 	if ((old_fp = fopen(filename, "r")) == NULL)
@@ -367,12 +388,12 @@ PUBLIC int
 com_anews(int p, param_list param)
 {
 	FILE		*fp = NULL;
-	char		*junkp = NULL;
 	char		 count[10] = { '\0' };
 	char		 filename[MAX_FILENAME_SIZE] = { '\0' };
 	char		 junk[MAX_LINE_SIZE] = { '\0' };
+	char		*junkp = NULL;
 	int		 found = 0;
-	long int	 lval = 0;
+	int64_t		 lval = 0;
 	time_t		 crtime = 0;
 
 	msnprintf(filename, sizeof filename, "%s/newadminnews.index", news_dir);
@@ -382,7 +403,7 @@ com_anews(int p, param_list param)
 		return COM_OK;
 	}
 
-#define SCAN_JUNK "%ld %9s"
+#define SCAN_JUNK ("%" SCNd64 " " "%9s")
 	_Static_assert(9 < ARRAY_SIZE(count), "Array too small");
 
 	if (param[0].type == 0) {