X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfig.c;h=303e06d4bd7346311a4e40520911e740bcc9ec75;hb=3eaca09e0fa7dd68275da9ac948e03e52715baa8;hp=fb9df692df1f2443df30043fa774ec53bee70b23;hpb=38b3aec67e67dfaff67670494e6e570bff2246aa;p=citadel.git

diff --git a/citadel/config.c b/citadel/config.c
index fb9df692d..303e06d4b 100644
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -1,23 +1,15 @@
 /*
- * $Id$
- *
  * Read and write the citadel.config file
  *
- * Copyright (c) 1987-2009 by the citadel.org team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -47,6 +39,7 @@ struct config config;
 void get_config(void) {
 	FILE *cfp;
 	struct stat st;
+	int rv;
 
 	if (chdir(ctdl_bbsbase_dir) != 0) {
 		fprintf(stderr,
@@ -66,7 +59,14 @@ void get_config(void) {
 				strerror(errno));
 		exit(CTDLEXIT_CONFIG);
 	}
-	fread((char *) &config, sizeof(struct config), 1, cfp);
+	memset(&config, 0, sizeof(struct config));
+	rv = fread((char *) &config, sizeof(struct config), 1, cfp);
+	if (rv != 1)
+	{
+		fprintf(stderr, 
+			"Warning: The config file %s has unexpected size. \n",
+			file_citadel_config);
+	}
 	if (fstat(fileno(cfp), &st)) {
 		perror(file_citadel_config);
 		exit(CTDLEXIT_CONFIG);
@@ -167,11 +167,15 @@ void get_config(void) {
 void put_config(void)
 {
 	FILE *cfp;
+	int rv;
 
 	if ((cfp = fopen(file_citadel_config, "rb+")) == NULL)
 		perror(file_citadel_config);
 	else {
-		fwrite((char *) &config, sizeof(struct config), 1, cfp);
+		rv = fwrite((char *) &config, sizeof(struct config), 1, cfp);
+		if (rv == -1)
+			syslog(LOG_EMERG, "Failed to write: %s [%s]\n", 
+			       file_citadel_config, strerror(errno));
 		fclose(cfp);
 	}
 }